diff options
| author | Björn Gustavsson <[email protected]> | 2016-09-15 10:16:28 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-09-15 10:16:28 +0200 |
| commit | fde238fb52133a6c7a2a3f2a2e16f1c1bef62394 (patch) | |
| tree | 0e553f298c23f508975635a121fbf8356c58ab8a /lib/kernel/src | |
| parent | cebef1207eca1cdc8c601b172988a74fd0858efa (diff) | |
| parent | 359e05121dab023585715b0e42506afd94f2e1f1 (diff) | |
| download | otp-fde238fb52133a6c7a2a3f2a2e16f1c1bef62394.tar.gz otp-fde238fb52133a6c7a2a3f2a2e16f1c1bef62394.tar.bz2 otp-fde238fb52133a6c7a2a3f2a2e16f1c1bef62394.zip | |
Merge branch 'bjorn/erts/on_load/ERL-240/OTP-13893' into maint
* bjorn/erts/on_load/ERL-240/OTP-13893:
erts: Add nif_SUITE:t_on_load
erts: Improve nif_SUITE:upgrade test
Don't leak old code when loading a modules with an on_load function
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/code_server.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl index 29307bc696..59b26176bf 100644 --- a/lib/kernel/src/code_server.erl +++ b/lib/kernel/src/code_server.erl @@ -1392,11 +1392,10 @@ finish_on_load(PidRef, OnLoadRes, #state{on_load=OnLoad0}=St0) -> finish_on_load_1(Mod, OnLoadRes, Waiting, St) -> Keep = OnLoadRes =:= ok, - erlang:finish_after_on_load(Mod, Keep), + erts_code_purger:finish_after_on_load(Mod, Keep), Res = case Keep of false -> _ = finish_on_load_report(Mod, OnLoadRes), - _ = erts_code_purger:purge(Mod), {error,on_load_failure}; true -> {module,Mod} |