diff options
| author | Sverker Eriksson <[email protected]> | 2017-02-14 18:27:17 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-02-14 18:27:17 +0100 |
| commit | e725221bcf085c1cd19f6340acb477da8aec1705 (patch) | |
| tree | c0450b7280090ec417fcc12f8cd5d3f4cc915de9 /erts/emulator/beam/erl_map.c | |
| parent | 70d5b560dc4894606ca7a09f3afd9a105b5a5d54 (diff) | |
| parent | 118de47d703e303aea7f4575849a37c11416ba14 (diff) | |
| download | otp-e725221bcf085c1cd19f6340acb477da8aec1705.tar.gz otp-e725221bcf085c1cd19f6340acb477da8aec1705.tar.bz2 otp-e725221bcf085c1cd19f6340acb477da8aec1705.zip | |
Merge branch 'sverker/magic-destructor-veto'
* sverker/magic-destructor-veto:
erts: Add deallocation veto for magic destructors
Diffstat (limited to 'erts/emulator/beam/erl_map.c')
| -rw-r--r-- | erts/emulator/beam/erl_map.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_map.c b/erts/emulator/beam/erl_map.c index 990be8efb2..9062e44b10 100644 --- a/erts/emulator/beam/erl_map.c +++ b/erts/emulator/beam/erl_map.c @@ -1188,12 +1188,13 @@ typedef struct HashmapMergeContext_ { #endif } HashmapMergeContext; -static void hashmap_merge_ctx_destructor(Binary* ctx_bin) +static int hashmap_merge_ctx_destructor(Binary* ctx_bin) { HashmapMergeContext* ctx = (HashmapMergeContext*) ERTS_MAGIC_BIN_DATA(ctx_bin); ASSERT(ERTS_MAGIC_BIN_DESTRUCTOR(ctx_bin) == hashmap_merge_ctx_destructor); PSTACK_DESTROY_SAVED(&ctx->pstack); + return 1; } BIF_RETTYPE maps_merge_trap_1(BIF_ALIST_1) { |