diff options
| author | Sverker Eriksson <[email protected]> | 2014-02-25 15:27:59 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-02-25 15:27:59 +0100 |
| commit | b9440a0529bea5ccc3f4341db29ddda6f4b7c536 (patch) | |
| tree | fbd7e7c946eb9621fe1f923d04f857b921bd8378 /erts/emulator/hipe/hipe_mode_switch.h | |
| parent | 98776a40609d1fa80292d2959708a8697f8cb756 (diff) | |
| parent | eb53a3f0b7a7d6c4d0a877fe71bc0b0ca11d1597 (diff) | |
| download | otp-b9440a0529bea5ccc3f4341db29ddda6f4b7c536.tar.gz otp-b9440a0529bea5ccc3f4341db29ddda6f4b7c536.tar.bz2 otp-b9440a0529bea5ccc3f4341db29ddda6f4b7c536.zip | |
Merge branch 'sverk/hipe-disable-gc-bug'
* sverk/hipe-disable-gc-bug:
erts: Fix heap overwrite by hipe "trap frames" when GC is disabled
ASSERT that GC is not tried with "need" when GC is disabled
Diffstat (limited to 'erts/emulator/hipe/hipe_mode_switch.h')
| -rw-r--r-- | erts/emulator/hipe/hipe_mode_switch.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/emulator/hipe/hipe_mode_switch.h b/erts/emulator/hipe/hipe_mode_switch.h index a3e908a3b3..06721e3c04 100644 --- a/erts/emulator/hipe/hipe_mode_switch.h +++ b/erts/emulator/hipe/hipe_mode_switch.h @@ -59,6 +59,9 @@ void hipe_empty_nstack(Process *p); void hipe_set_closure_stub(ErlFunEntry *fe, unsigned num_free); Eterm hipe_build_stacktrace(Process *p, struct StackTrace *s); +void hipe_reserve_beam_trap_frame(Process*, Eterm reg[], unsigned arity); +void hipe_unreserve_beam_trap_frame(Process*); + extern Uint hipe_beam_pc_return[]; extern Uint hipe_beam_pc_throw[]; extern Uint hipe_beam_pc_resume[]; |