diff options
| author | Sverker Eriksson <[email protected]> | 2015-08-28 18:08:04 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-08-28 19:02:38 +0200 |
| commit | 90e0bad70affc23228e3d11d1131aba615895dd5 (patch) | |
| tree | 22c738ff90cab95ff02d1753f6d21fbef4761df0 /erts/emulator/beam | |
| parent | c0694699e20ba9985d842c0efaeefbc457bc518c (diff) | |
| download | otp-90e0bad70affc23228e3d11d1131aba615895dd5.tar.gz otp-90e0bad70affc23228e3d11d1131aba615895dd5.tar.bz2 otp-90e0bad70affc23228e3d11d1131aba615895dd5.zip | |
erts: Fix hipe bug for maps:merge/2
Add forgotten HIPE_WRAPPER_BIF_DISABLE_GC which
could lead to stack-heap overrun if unlucky with the
yielding during maps:merge when called by native hipe code.
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 a91e36e3c5..ff2a355309 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" @@ -952,8 +954,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)) { |