diff options
| author | Sverker Eriksson <[email protected]> | 2018-01-24 15:01:57 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-01-24 15:01:57 +0100 |
| commit | eb93dfeebdeb48a644a9804e2d4a9d0cb557cbce (patch) | |
| tree | 75a019bb00a3a04c4318bd77b86d71626352bf29 /erts | |
| parent | ec9af70ef85da3467913ec3adbce15ac122dcb60 (diff) | |
| parent | 27da13e1e94961e68b049aab4a14a14d69b4ce16 (diff) | |
| download | otp-eb93dfeebdeb48a644a9804e2d4a9d0cb557cbce.tar.gz otp-eb93dfeebdeb48a644a9804e2d4a9d0cb557cbce.tar.bz2 otp-eb93dfeebdeb48a644a9804e2d4a9d0cb557cbce.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/beam_load.c | 2 | ||||
| -rw-r--r-- | erts/emulator/hipe/hipe_bif0.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c index beaef0951e..e242fe9140 100644 --- a/erts/emulator/beam/beam_load.c +++ b/erts/emulator/beam/beam_load.c @@ -6984,6 +6984,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 380031bf13..e477c4cdea 100644 --- a/erts/emulator/hipe/hipe_bif0.c +++ b/erts/emulator/hipe/hipe_bif0.c @@ -1771,7 +1771,8 @@ void hipe_redirect_to_module(Module* modp) struct hipe_mfa_info *p; struct hipe_ref_head* refh; - ERTS_LC_ASSERT(erts_thr_progress_is_blocking()); + ERTS_LC_ASSERT(erts_thr_progress_is_blocking() || + erts_is_multi_scheduling_blocked()); for (p = mod2mfa_get(modp); p; p = p->next_in_mod) { if (p->new_address) { |