aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2018-01-24 15:00:05 +0100
committerSverker Eriksson <[email protected]>2018-01-24 15:00:05 +0100
commit27da13e1e94961e68b049aab4a14a14d69b4ce16 (patch)
tree773e8c2115efba9d1f73ad33fc14bdd5311d591f /lib
parent50ecc771a493c3ae7bb75a392e50dfb3c05c0ffc (diff)
parentd57d91427e1ddb09cbf55cac2014a368fe717b46 (diff)
downloadotp-27da13e1e94961e68b049aab4a14a14d69b4ce16.tar.gz
otp-27da13e1e94961e68b049aab4a14a14d69b4ce16.tar.bz2
otp-27da13e1e94961e68b049aab4a14a14d69b4ce16.zip
Merge branch 'sverker/hipe-load-fixing/OTP-14891' into maint
Diffstat (limited to 'lib')
-rw-r--r--lib/kernel/src/hipe_unified_loader.erl5
1 files changed, 3 insertions, 2 deletions
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.