diff options
| author | Sverker Eriksson <[email protected]> | 2015-08-31 15:46:26 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-08-31 15:46:26 +0200 |
| commit | 484365775a8c780af8e77864ec8a0f4335a5ae38 (patch) | |
| tree | 6f13fd76458188f5c8933c029dd2f318abae6676 /erts/emulator/beam | |
| parent | fa859b04e560744a5982fce0bdce1e1d71b1a81f (diff) | |
| parent | bf9b55d9341ca6e1bbb8c1d2c2763b17538426b6 (diff) | |
| download | otp-484365775a8c780af8e77864ec8a0f4335a5ae38.tar.gz otp-484365775a8c780af8e77864ec8a0f4335a5ae38.tar.bz2 otp-484365775a8c780af8e77864ec8a0f4335a5ae38.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_map.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_map.c b/erts/emulator/beam/erl_map.c index 8f376fe595..29b3024644 100644 --- a/erts/emulator/beam/erl_map.c +++ b/erts/emulator/beam/erl_map.c @@ -32,7 +32,9 @@ #include "global.h" #include "erl_process.h" #include "error.h" +#define ERL_WANT_HIPE_BIF_WRAPPER__ #include "bif.h" +#undef ERL_WANT_HIPE_BIF_WRAPPER__ #include "erl_binary.h" #include "erl_map.h" @@ -948,8 +950,11 @@ BIF_RETTYPE maps_keys_1(BIF_ALIST_1) { BIF_P->fvalue = BIF_ARG_1; BIF_ERROR(BIF_P, BADMAP); } + /* maps:merge/2 */ +HIPE_WRAPPER_BIF_DISABLE_GC(maps_merge, 2) + BIF_RETTYPE maps_merge_2(BIF_ALIST_2) { if (is_flatmap(BIF_ARG_1)) { if (is_flatmap(BIF_ARG_2)) { |