From a7f2dce69aa22627709eef104231a7abc69d8d09 Mon Sep 17 00:00:00 2001 From: fw Date: Thu, 11 Aug 2022 22:36:12 -0400 Subject: [PATCH] update remaining references to old atomic intrinsics these were missed in the last round of changes --- c2rust-transpile/src/translator/builtins.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/c2rust-transpile/src/translator/builtins.rs b/c2rust-transpile/src/translator/builtins.rs index 938a2f64b..244ccfc7d 100644 --- a/c2rust-transpile/src/translator/builtins.rs +++ b/c2rust-transpile/src/translator/builtins.rs @@ -422,7 +422,7 @@ impl<'c> Translation<'c> { let returns_val = builtin_name.starts_with("__sync_val"); self.convert_atomic_cxchg( ctx, - "atomic_cxchg", + "atomic_cxchg_seqcst_seqcst", arg0, arg1, arg2, @@ -537,8 +537,9 @@ impl<'c> Translation<'c> { | "__sync_lock_test_and_set_16" => { self.use_feature("core_intrinsics"); - // Emit `atomic_xchg_acq(arg0, arg1)` - let atomic_func = mk().abs_path_expr(vec!["core", "intrinsics", "atomic_xchg_acq"]); + // Emit `atomic_xchg_acquire(arg0, arg1)` + let atomic_func = + mk().abs_path_expr(vec!["core", "intrinsics", "atomic_xchg_acquire"]); let arg0 = self.convert_expr(ctx.used(), args[0])?; let arg1 = self.convert_expr(ctx.used(), args[1])?; arg0.and_then(|arg0| { @@ -560,9 +561,9 @@ impl<'c> Translation<'c> { | "__sync_lock_release_16" => { self.use_feature("core_intrinsics"); - // Emit `atomic_store_rel(arg0, 0)` + // Emit `atomic_store_release(arg0, 0)` let atomic_func = - mk().abs_path_expr(vec!["core", "intrinsics", "atomic_store_rel"]); + mk().abs_path_expr(vec!["core", "intrinsics", "atomic_store_release"]); let arg0 = self.convert_expr(ctx.used(), args[0])?; arg0.and_then(|arg0| { let zero = mk().lit_expr(mk().int_lit(0, ""));