diff options
| author | Sverker Eriksson <[email protected]> | 2017-01-17 15:53:18 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-01-17 15:53:18 +0100 |
| commit | b8c29d61253ee75515a11da6fc349fb9933d03c3 (patch) | |
| tree | c2a4d1325c5695d2870e4feb987ed5ffca14dd75 /erts/emulator/beam/erl_gc.c | |
| parent | 919d35b4d17e9a896aca02cf22d6514d38a8b205 (diff) | |
| parent | 9b6643e4c573e4a5536a48f8115f12d0b99f9d41 (diff) | |
| download | otp-b8c29d61253ee75515a11da6fc349fb9933d03c3.tar.gz otp-b8c29d61253ee75515a11da6fc349fb9933d03c3.tar.bz2 otp-b8c29d61253ee75515a11da6fc349fb9933d03c3.zip | |
Merge branch 'maint'
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 c4f75a887f..6815d76776 100644 --- a/erts/emulator/beam/erl_gc.c +++ b/erts/emulator/beam/erl_gc.c @@ -648,7 +648,7 @@ garbage_collect(Process* p, ErlHeapFragment *live_hf_end, Uint ygen_usage; Eterm gc_trace_end_tag; int reds; - ErtsMonotonicTime start_time = 0; /* Shut up faulty warning... */ + ErtsMonotonicTime start_time; ErtsSchedulerData *esdp = erts_proc_sched_data(p); erts_aint32_t state; ERTS_MSACC_PUSH_STATE_M(); @@ -656,6 +656,7 @@ garbage_collect(Process* p, ErlHeapFragment *live_hf_end, DTRACE_CHARBUF(pidbuf, DTRACE_TERM_BUF_SIZE); #endif + ERTS_UNDEF(start_time, 0); ERTS_CHK_MBUF_SZ(p); ASSERT(CONTEXT_REDS - ERTS_REDS_LEFT(p, fcalls) >= esdp->virtual_reds); @@ -850,6 +851,7 @@ do_major_collection: ASSERT(!p->mbuf); ASSERT(!ERTS_IS_GC_DESIRED(p)); + ASSERT(need <= HEAP_LIMIT(p) - HEAP_TOP(p)); return reds; } |