diff options
| author | Sverker Eriksson <[email protected]> | 2015-05-06 14:59:13 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-05-06 14:59:13 +0200 |
| commit | d4ad455c16a85ee6103d5916ff91cdda31247ca9 (patch) | |
| tree | 9672b84e0654b5d73f2eb573f7a8fd352a643664 /erts/emulator/hipe/hipe_bif_list.m4 | |
| parent | 0440e0e45835de5adbe790f9437492d734c6c4e1 (diff) | |
| parent | 2a3349420d33a298aa02b176100f385c0ab31c99 (diff) | |
| download | otp-d4ad455c16a85ee6103d5916ff91cdda31247ca9.tar.gz otp-d4ad455c16a85ee6103d5916ff91cdda31247ca9.tar.bz2 otp-d4ad455c16a85ee6103d5916ff91cdda31247ca9.zip | |
Merge branch 'sverk/hipe_match_wbin/OTP-12667'
* sverk/hipe_match_wbin/OTP-12667:
erts: Add debug assertions for match state sanity
hipe: Add test for matching of writable binary
erts,hipe: Optimize away calls to emasculate_binary
erts,hipe: Fix bug in binary matching of writable binary
Conflicts:
erts/emulator/hipe/hipe_bif0.c
Diffstat (limited to 'erts/emulator/hipe/hipe_bif_list.m4')
| -rw-r--r-- | erts/emulator/hipe/hipe_bif_list.m4 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/hipe/hipe_bif_list.m4 b/erts/emulator/hipe/hipe_bif_list.m4 index 96a849621f..370061bca1 100644 --- a/erts/emulator/hipe/hipe_bif_list.m4 +++ b/erts/emulator/hipe/hipe_bif_list.m4 @@ -250,6 +250,8 @@ gc_bif_interface_0(nbif_check_get_msg, hipe_check_get_msg) nocons_nofail_primop_interface_0(nbif_emulate_fpe, hipe_emulate_fpe) #endif +noproc_primop_interface_1(nbif_emasculate_binary, hipe_emasculate_binary) + /* * SMP-specific stuff */ |