diff options
| author | Sverker Eriksson <[email protected]> | 2018-01-24 15:00:05 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-01-24 15:00:05 +0100 |
| commit | 27da13e1e94961e68b049aab4a14a14d69b4ce16 (patch) | |
| tree | 773e8c2115efba9d1f73ad33fc14bdd5311d591f | |
| parent | 50ecc771a493c3ae7bb75a392e50dfb3c05c0ffc (diff) | |
| parent | d57d91427e1ddb09cbf55cac2014a368fe717b46 (diff) | |
| download | otp-27da13e1e94961e68b049aab4a14a14d69b4ce16.tar.gz otp-27da13e1e94961e68b049aab4a14a14d69b4ce16.tar.bz2 otp-27da13e1e94961e68b049aab4a14a14d69b4ce16.zip | |
Merge branch 'sverker/hipe-load-fixing/OTP-14891' into maint
| -rw-r--r-- | erts/emulator/beam/beam_load.c | 2 | ||||
| -rw-r--r-- | erts/emulator/hipe/hipe_bif0.c | 3 | ||||
| -rw-r--r-- | lib/kernel/src/hipe_unified_loader.erl | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c index 494b7543ec..a4e226d459 100644 --- a/erts/emulator/beam/beam_load.c +++ b/erts/emulator/beam/beam_load.c @@ -6621,6 +6621,8 @@ int erts_commit_hipe_patch_load(Eterm hipe_magic_bin) hipe_stp->new_hipe_refs = NULL; hipe_stp->new_hipe_sdesc = NULL; + hipe_redirect_to_module(modp); + return 1; } diff --git a/erts/emulator/hipe/hipe_bif0.c b/erts/emulator/hipe/hipe_bif0.c index 94bc563fda..d8427a4c36 100644 --- a/erts/emulator/hipe/hipe_bif0.c +++ b/erts/emulator/hipe/hipe_bif0.c @@ -1773,7 +1773,8 @@ void hipe_redirect_to_module(Module* modp) struct hipe_mfa_info *p; struct hipe_ref_head* refh; - ERTS_SMP_LC_ASSERT(erts_smp_thr_progress_is_blocking()); + ERTS_SMP_LC_ASSERT(erts_smp_thr_progress_is_blocking() || + erts_is_multi_scheduling_blocked()); for (p = mod2mfa_get(modp); p; p = p->next_in_mod) { if (p->new_address) { diff --git a/lib/kernel/src/hipe_unified_loader.erl b/lib/kernel/src/hipe_unified_loader.erl index f4c7c277ed..f8199fcf71 100644 --- a/lib/kernel/src/hipe_unified_loader.erl +++ b/lib/kernel/src/hipe_unified_loader.erl @@ -236,9 +236,10 @@ load_common(Mod, Bin, Beam, Architecture) -> lists:foreach(fun({FE, DestAddress}) -> hipe_bifs:set_native_address_in_fe(FE, DestAddress) end, erase(closures_to_patch)), - ok = hipe_bifs:commit_patch_load(LoaderState), set_beam_call_traps(FunDefs), - ok; + export_funs(FunDefs), + ok = hipe_bifs:commit_patch_load(LoaderState), + ok; BeamBinary when is_binary(BeamBinary) -> %% Find all closures in the code. [] = erase(closures_to_patch), %Clean up, assertion. |