Skip to content

Commit 321fc34

Browse files
authored
Revert caml_atomic_cas primitive name (ocaml-flambda#3518)
1 parent cead593 commit 321fc34

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

backend/cmm_helpers.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4238,7 +4238,7 @@ let atomic_lxor ~dbg atomic i =
42384238
let atomic_compare_and_set_extcall ~dbg atomic ~old_value ~new_value =
42394239
Cop
42404240
( Cextcall
4241-
{ func = "caml_atomic_compare_set";
4241+
{ func = "caml_atomic_cas";
42424242
builtin = false;
42434243
returns = true;
42444244
effects = Arbitrary_effects;

bytecomp/bytegen.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ let comp_primitive stack_info p sz args =
660660
| Patomic_set _
661661
| Patomic_exchange _ -> Kccall("caml_atomic_exchange", 2)
662662
| Patomic_compare_exchange _ -> Kccall("caml_atomic_compare_exchange", 3)
663-
| Patomic_compare_set _ -> Kccall("caml_atomic_compare_set", 3)
663+
| Patomic_compare_set _ -> Kccall("caml_atomic_cas", 3)
664664
| Patomic_fetch_add -> Kccall("caml_atomic_fetch_add", 2)
665665
| Patomic_add -> Kccall("caml_atomic_add", 2)
666666
| Patomic_sub -> Kccall("caml_atomic_sub", 2)

runtime/memory.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ CAMLprim value caml_atomic_compare_exchange (value ref, value oldv, value newv)
393393
}
394394
}
395395

396-
CAMLprim value caml_atomic_compare_set (value ref, value oldv, value newv)
396+
CAMLprim value caml_atomic_cas (value ref, value oldv, value newv)
397397
{
398398
if (caml_atomic_compare_exchange(ref, oldv, newv) == oldv) {
399399
return Val_true;

runtime4/misc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ CAMLprim value caml_atomic_compare_exchange(value ref, value oldv, value newv)
263263
}
264264
}
265265

266-
CAMLprim value caml_atomic_compare_set(value ref, value oldv, value newv)
266+
CAMLprim value caml_atomic_cas(value ref, value oldv, value newv)
267267
{
268268
if (caml_atomic_compare_exchange(ref, oldv, newv) == oldv) {
269269
return Val_true;

0 commit comments

Comments
 (0)