diff options
| author | Sverker Eriksson <[email protected]> | 2018-01-03 17:11:49 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-01-03 17:11:49 +0100 |
| commit | f9a0bac8f708a5cf769860ef2ee8af0591c5dbaf (patch) | |
| tree | 4622350b2a0ca74ff72f78e31a02a0fb6954935e /erts/emulator/hipe/hipe_native_bif.c | |
| parent | 3d124b9ea557fd26ca7a33276b84c72d9e72044e (diff) | |
| parent | 93042b54da6a576b187bfb7b2222fc8a5a4d4f12 (diff) | |
| download | otp-f9a0bac8f708a5cf769860ef2ee8af0591c5dbaf.tar.gz otp-f9a0bac8f708a5cf769860ef2ee8af0591c5dbaf.tar.bz2 otp-f9a0bac8f708a5cf769860ef2ee8af0591c5dbaf.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/hipe/hipe_native_bif.c')
| -rw-r--r-- | erts/emulator/hipe/hipe_native_bif.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/erts/emulator/hipe/hipe_native_bif.c b/erts/emulator/hipe/hipe_native_bif.c index d6358eabf4..ac1480d2ed 100644 --- a/erts/emulator/hipe/hipe_native_bif.c +++ b/erts/emulator/hipe/hipe_native_bif.c @@ -396,12 +396,8 @@ Eterm hipe_bs_utf8_size(Eterm arg) return make_small(4); } -BIF_RETTYPE nbif_impl_hipe_bs_put_utf8(NBIF_ALIST_3) +Eterm hipe_bs_put_utf8(Process* p, Eterm arg, byte* base, Uint offset) { - Process* p = BIF_P; - Eterm arg = BIF_ARG_1; - byte* base = (byte*) BIF_ARG_2; - Uint offset = (Uint) BIF_ARG_3; byte *save_bin_buf; Uint save_bin_offset; int res; @@ -417,7 +413,8 @@ BIF_RETTYPE nbif_impl_hipe_bs_put_utf8(NBIF_ALIST_3) erts_current_bin = save_bin_buf; erts_bin_offset = save_bin_offset; if (res == 0) - BIF_ERROR(p, BADARG); + return 0; + ASSERT(new_offset != 0); return new_offset; } |