diff options
| author | Sverker Eriksson <[email protected]> | 2017-09-13 16:03:07 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-09-13 16:03:07 +0200 |
| commit | b794bbd8794d623e1cedb6de505e0a3356ae73d1 (patch) | |
| tree | e68c47ee689bd80d1ddad3c5a0097996f5f04c38 /erts | |
| parent | dcb66b30a2115e2a57436d800ed41880e5be633e (diff) | |
| parent | e90609f5e3e08cfcb88baa01189889fad302bbf7 (diff) | |
| download | otp-b794bbd8794d623e1cedb6de505e0a3356ae73d1.tar.gz otp-b794bbd8794d623e1cedb6de505e0a3356ae73d1.tar.bz2 otp-b794bbd8794d623e1cedb6de505e0a3356ae73d1.zip | |
Merge branch 'sverker/19/on_load-on_load-bug/OTP-14612' into sverker/on_load-on_load-bug/OTP-14612
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/beam_bif_load.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/erts/emulator/beam/beam_bif_load.c b/erts/emulator/beam/beam_bif_load.c index 14ddb74324..023ee3ef4b 100644 --- a/erts/emulator/beam/beam_bif_load.c +++ b/erts/emulator/beam/beam_bif_load.c @@ -261,7 +261,7 @@ struct m { Binary* code; Eterm module; Module* modp; - Uint exception; + Eterm exception; }; static Eterm staging_epilogue(Process* c_p, int, Eterm res, int, struct m*, int, int); @@ -282,7 +282,7 @@ exception_list(Process* p, Eterm tag, struct m* mp, Sint exceptions) Eterm res = NIL; while (exceptions > 0) { - if (mp->exception) { + if (is_value(mp->exception)) { res = CONS(hp, mp->module, res); hp += 2; exceptions--; @@ -383,9 +383,9 @@ finish_loading_1(BIF_ALIST_1) exceptions = 0; for (i = 0; i < n; i++) { - p[i].exception = 0; + p[i].exception = THE_NON_VALUE; if (p[i].modp->seen) { - p[i].exception = 1; + p[i].exception = am_duplicated; exceptions++; } p[i].modp->seen = 1; @@ -419,9 +419,9 @@ finish_loading_1(BIF_ALIST_1) exceptions = 0; for (i = 0; i < n; i++) { - p[i].exception = 0; + p[i].exception = THE_NON_VALUE; if (p[i].modp->curr.code_hdr && p[i].modp->old.code_hdr) { - p[i].exception = 1; + p[i].exception = am_not_purged; exceptions++; } } @@ -442,7 +442,7 @@ finish_loading_1(BIF_ALIST_1) retval = erts_finish_loading(p[i].code, BIF_P, 0, &mod); ASSERT(retval == NIL || retval == am_on_load); if (retval == am_on_load) { - p[i].exception = 1; + p[i].exception = am_on_load; exceptions++; } } @@ -475,7 +475,8 @@ staging_epilogue(Process* c_p, int commit, Eterm res, int is_blocking, erts_commit_staging_code_ix(); for (i=0; i < nmods; i++) { - if (mods[i].modp->curr.code_hdr) { + if (mods[i].modp->curr.code_hdr + && mods[i].exception != am_on_load) { set_default_trace_pattern(mods[i].module); } #ifdef HIPE @@ -700,6 +701,7 @@ BIF_RETTYPE delete_module_1(BIF_ALIST_1) Eterm retval; mod.module = BIF_ARG_1; mod.modp = modp; + mod.exception = THE_NON_VALUE; retval = staging_epilogue(BIF_P, success, res, is_blocking, &mod, 1, 0); return retval; } |