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_nif.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_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 d946844f15..b860759fa2 100644 --- a/erts/emulator/beam/erl_nif.c +++ b/erts/emulator/beam/erl_nif.c @@ -3323,8 +3323,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 |