diff options
| author | Lukas Larsson <[email protected]> | 2016-05-11 09:22:53 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-05-11 09:22:53 +0200 |
| commit | 76378f21242b8036bac1b187e895bcafa28201da (patch) | |
| tree | 7b4f7927292cb193854b3012573d17e371e4ed6a /erts/emulator/hipe | |
| parent | 8bc9c88cd98bbbcc18265a7aed830b73f5133cf6 (diff) | |
| parent | 36dd5c3dd86c91d04a7fc13fd2a89b10af64db5a (diff) | |
| download | otp-76378f21242b8036bac1b187e895bcafa28201da.tar.gz otp-76378f21242b8036bac1b187e895bcafa28201da.tar.bz2 otp-76378f21242b8036bac1b187e895bcafa28201da.zip | |
Merge branch 'lukas/erts/max_heap_size/OTP-13174'
* lukas/erts/max_heap_size/OTP-13174:
erts: Fix max heap size exit when in hipe mode
Update preloaded modules
erts: Fix pre-bif yield current_function
erts: Implement max_heap_size process flag
Diffstat (limited to 'erts/emulator/hipe')
| -rw-r--r-- | erts/emulator/hipe/hipe_mode_switch.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/erts/emulator/hipe/hipe_mode_switch.c b/erts/emulator/hipe/hipe_mode_switch.c index 9ad44b25ac..f532d3151f 100644 --- a/erts/emulator/hipe/hipe_mode_switch.c +++ b/erts/emulator/hipe/hipe_mode_switch.c @@ -59,6 +59,7 @@ * TODO: check PCB consistency at native BIF calls */ int hipe_modeswitch_debug = 0; +extern BeamInstr beam_exit[]; #define HIPE_DEBUG 0 @@ -509,6 +510,10 @@ Process *hipe_mode_switch(Process *p, unsigned cmd, Eterm reg[]) if (scb) ERTS_PROC_SET_SAVED_CALLS_BUF(p, scb); + /* The process may have died while it was executing, + if so we return out from native code to the interpreter */ + if (erts_smp_atomic32_read_nob(&p->state) & ERTS_PSFLG_EXITING) + p->i = beam_exit; #ifdef DEBUG ASSERT(p->debug_reds_in == reds_in); #endif |