diff options
| author | Rickard Green <[email protected]> | 2014-06-06 01:47:49 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-06-06 01:47:49 +0200 |
| commit | fd9ded54a9d1d3c1df3c44c0f5eed0be25f85a82 (patch) | |
| tree | 7238e0341da395b7b1ea45788697de764bdbc009 /erts/emulator/hipe/hipe_bif_list.m4 | |
| parent | cb252aecf7da924e2959dadd390f1bbd320b2eb8 (diff) | |
| parent | 82c048745efcb5d811ec0489858b821ef39ea387 (diff) | |
| download | otp-fd9ded54a9d1d3c1df3c44c0f5eed0be25f85a82.tar.gz otp-fd9ded54a9d1d3c1df3c44c0f5eed0be25f85a82.tar.bz2 otp-fd9ded54a9d1d3c1df3c44c0f5eed0be25f85a82.zip | |
Merge branch 'rickard/binary_to_term_error/OTP-11931' into maint
* rickard/binary_to_term_error/OTP-11931:
Replace erlang:binary_to_term() Erlang wrappers
Conflicts:
erts/preloaded/ebin/erts_internal.beam
Diffstat (limited to 'erts/emulator/hipe/hipe_bif_list.m4')
| -rw-r--r-- | erts/emulator/hipe/hipe_bif_list.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/hipe/hipe_bif_list.m4 b/erts/emulator/hipe/hipe_bif_list.m4 index 16765fdb99..5f92b6bac4 100644 --- a/erts/emulator/hipe/hipe_bif_list.m4 +++ b/erts/emulator/hipe/hipe_bif_list.m4 @@ -268,8 +268,8 @@ noproc_primop_interface_1(nbif_atomic_inc, hipe_atomic_inc) */ define(CFUN,`ifelse($1,term_to_binary_1,hipe_wrapper_term_to_binary_1, ifelse($1,term_to_binary_2,hipe_wrapper_term_to_binary_2, -ifelse($1,erts_internal_binary_to_term_1,hipe_wrapper_erts_internal_binary_to_term_1, -ifelse($1,erts_internal_binary_to_term_2,hipe_wrapper_erts_internal_binary_to_term_2, +ifelse($1,binary_to_term_1,hipe_wrapper_binary_to_term_1, +ifelse($1,binary_to_term_2,hipe_wrapper_binary_to_term_2, ifelse($1,binary_to_list_1,hipe_wrapper_binary_to_list_1, ifelse($1,binary_to_list_3,hipe_wrapper_binary_to_list_3, ifelse($1,bitstring_to_list_1,hipe_wrapper_bitstring_to_list_1, |