aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/bif.c
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2018-10-24 12:55:12 +0200
committerBjörn Gustavsson <[email protected]>2018-10-24 12:55:12 +0200
commit58bea75b67754f1aeee2bccb537b50c0430ba08b (patch)
tree84cea5e436f453ecc378d6e4eec3571edc470131 /erts/emulator/beam/bif.c
parent8d34db5c230660f42bd146b6db23096c015c221d (diff)
parentc37f7a2215646c85c1ae12303f07bc9bc27b75ae (diff)
downloadotp-58bea75b67754f1aeee2bccb537b50c0430ba08b.tar.gz
otp-58bea75b67754f1aeee2bccb537b50c0430ba08b.tar.bz2
otp-58bea75b67754f1aeee2bccb537b50c0430ba08b.zip
Merge branch 'maint'
* maint: beam_lib: Remove obsolete module() from the beam() type hipe: Don't use beam_lib:info/1 with an atom as filename Honor the max heap size when copying literals after purging
Diffstat (limited to 'erts/emulator/beam/bif.c')
-rw-r--r--erts/emulator/beam/bif.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 3b45f968cf..4741d7451d 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -3624,6 +3624,10 @@ erts_internal_garbage_collect_1(BIF_ALIST_1)
default: BIF_ERROR(BIF_P, BADARG);
}
erts_garbage_collect(BIF_P, 0, NULL, 0);
+ if (ERTS_PROC_IS_EXITING(BIF_P)) {
+ /* The max heap size limit was reached. */
+ return THE_NON_VALUE;
+ }
return am_true;
}