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/hipe/hipe_load.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/hipe/hipe_load.c')
| -rw-r--r-- | erts/emulator/hipe/hipe_load.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/hipe/hipe_load.c b/erts/emulator/hipe/hipe_load.c index 2998ed87a2..87c5004d2b 100644 --- a/erts/emulator/hipe/hipe_load.c +++ b/erts/emulator/hipe/hipe_load.c @@ -61,7 +61,7 @@ void hipe_free_loader_state(HipeLoaderState *stp) stp->module = NIL; } -static void +static int hipe_loader_state_dtor(Binary* magic) { HipeLoaderState* stp = ERTS_MAGIC_BIN_DATA(magic); @@ -69,6 +69,7 @@ hipe_loader_state_dtor(Binary* magic) ASSERT(ERTS_MAGIC_BIN_DESTRUCTOR(magic) == hipe_loader_state_dtor); hipe_free_loader_state(stp); + return 1; } Binary *hipe_alloc_loader_state(Eterm module) |