diff options
| author | Sverker Eriksson <[email protected]> | 2017-01-17 15:50:27 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-01-17 15:50:27 +0100 |
| commit | 9b6643e4c573e4a5536a48f8115f12d0b99f9d41 (patch) | |
| tree | d5948a5a507c10b3699c79bc3b1fd4f003d274f7 /erts/emulator/beam/erl_nif.c | |
| parent | ec2e03ad47d38400ac39dbc34911705fd50315aa (diff) | |
| parent | 287edce0090a14fdd88a9e10d13327e74e52831a (diff) | |
| download | otp-9b6643e4c573e4a5536a48f8115f12d0b99f9d41.tar.gz otp-9b6643e4c573e4a5536a48f8115f12d0b99f9d41.tar.bz2 otp-9b6643e4c573e4a5536a48f8115f12d0b99f9d41.zip | |
Merge branch 'sverker/trace_gc-bug/OTP-14154' into maint
* sverker/trace_gc-bug:
erts: Fix GC tracing to use temp heap
erts: Assert sufficient space need after GC
Diffstat (limited to 'erts/emulator/beam/erl_nif.c')
| -rw-r--r-- | erts/emulator/beam/erl_nif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c index 6b265a8b80..19ce0f6965 100644 --- a/erts/emulator/beam/erl_nif.c +++ b/erts/emulator/beam/erl_nif.c @@ -3561,8 +3561,8 @@ Eterm erts_nif_call_function(Process *p, Process *tracee, #endif if (p) { /* This is almost a normal nif call like in beam_emu, - except that any heap fragment created in the nif will be - discarded without checking if anything in it is live. + except that any heap consumed by the nif will be + released without checking if anything in it is live. This is because we cannot do a GC here as we don't know the number of live registers that have to be preserved. This means that any heap part of the returned term may |