diff options
| author | Rickard Green <[email protected]> | 2017-02-06 18:16:20 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-02-06 18:16:20 +0100 |
| commit | 83292f7263c29e6cb55ec7bad1c1fdc864cd6bcb (patch) | |
| tree | cbc6710e516e7883313ed1c122e4896a17746611 /erts/emulator/hipe | |
| parent | 047e3bebbe1639e3f2c82431269c0f7100af55af (diff) | |
| parent | fc0477a67641b9ba344de595b7fec2431208f8e6 (diff) | |
| download | otp-83292f7263c29e6cb55ec7bad1c1fdc864cd6bcb.tar.gz otp-83292f7263c29e6cb55ec7bad1c1fdc864cd6bcb.tar.bz2 otp-83292f7263c29e6cb55ec7bad1c1fdc864cd6bcb.zip | |
Merge branch 'rickard/binary-refc' into maint
OTP-14202
* rickard/binary-refc:
Atomic reference count of binaries also in non-SMP
Conflicts:
erts/emulator/beam/beam_bp.c
Diffstat (limited to 'erts/emulator/hipe')
| -rw-r--r-- | erts/emulator/hipe/hipe_bif0.c | 2 | ||||
| -rw-r--r-- | erts/emulator/hipe/hipe_native_bif.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/hipe/hipe_bif0.c b/erts/emulator/hipe/hipe_bif0.c index dcb6c35bfa..165f33eecd 100644 --- a/erts/emulator/hipe/hipe_bif0.c +++ b/erts/emulator/hipe/hipe_bif0.c @@ -992,7 +992,7 @@ BIF_RETTYPE hipe_bifs_set_native_address_in_fe_2(BIF_ALIST_2) BIF_ERROR(BIF_P, BADARG); fe->native_address = native_address; - if (erts_refc_dectest(&fe->refc, 0) == 0) + if (erts_smp_refc_dectest(&fe->refc, 0) == 0) erts_erase_fun_entry(fe); BIF_RET(am_true); } diff --git a/erts/emulator/hipe/hipe_native_bif.c b/erts/emulator/hipe/hipe_native_bif.c index 801cef2e56..a2165958a9 100644 --- a/erts/emulator/hipe/hipe_native_bif.c +++ b/erts/emulator/hipe/hipe_native_bif.c @@ -321,7 +321,7 @@ char *hipe_bs_allocate(int len) Binary *bptr; bptr = erts_bin_nrml_alloc(len); - erts_smp_atomic_init_nob(&bptr->refc, 1); + erts_refc_init(&bptr->refc, 1); return bptr->orig_bytes; } |