aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2018-01-24 15:01:57 +0100
committerSverker Eriksson <[email protected]>2018-01-24 15:01:57 +0100
commiteb93dfeebdeb48a644a9804e2d4a9d0cb557cbce (patch)
tree75a019bb00a3a04c4318bd77b86d71626352bf29 /lib/kernel/src
parentec9af70ef85da3467913ec3adbce15ac122dcb60 (diff)
parent27da13e1e94961e68b049aab4a14a14d69b4ce16 (diff)
downloadotp-eb93dfeebdeb48a644a9804e2d4a9d0cb557cbce.tar.gz
otp-eb93dfeebdeb48a644a9804e2d4a9d0cb557cbce.tar.bz2
otp-eb93dfeebdeb48a644a9804e2d4a9d0cb557cbce.zip
Merge branch 'maint'
Diffstat (limited to 'lib/kernel/src')
-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.