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/beam/erl_gc.c | |
| 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/beam/erl_gc.c')
| -rw-r--r-- | erts/emulator/beam/erl_gc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c index 2022f70cbb..aa15d2cc57 100644 --- a/erts/emulator/beam/erl_gc.c +++ b/erts/emulator/beam/erl_gc.c @@ -406,8 +406,10 @@ erts_garbage_collect(Process* p, int need, Eterm* objv, int nobj) DTRACE_CHARBUF(pidbuf, DTRACE_TERM_BUF_SIZE); #endif - if (p->flags & F_DISABLE_GC) + if (p->flags & F_DISABLE_GC) { + ASSERT(need == 0); return 1; + } esdp = erts_get_scheduler_data(); |