aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2012-05-25 15:33:57 +0200
committerSverker Eriksson <[email protected]>2012-05-25 15:33:57 +0200
commit5c0b87f2d1be9d5355cbe38beb9b02073377a8d6 (patch)
treeccbb6437b3a7e966793207b90d2ce6ac562da1d9 /lib
parent0fa2bbda2ae3736bf52b0e95bf4042055344a6de (diff)
parent07185e1a2ad69abe5d71ddb09eddd5d6fbc838e5 (diff)
downloadotp-5c0b87f2d1be9d5355cbe38beb9b02073377a8d6.tar.gz
otp-5c0b87f2d1be9d5355cbe38beb9b02073377a8d6.tar.bz2
otp-5c0b87f2d1be9d5355cbe38beb9b02073377a8d6.zip
Merge branch 'sverk/hipelibs-code_server-crash'
* sverk/hipelibs-code_server-crash: kernel: Disable hipe compilation for hipe_unified_loader
Diffstat (limited to 'lib')
-rw-r--r--lib/kernel/src/hipe_unified_loader.erl7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/kernel/src/hipe_unified_loader.erl b/lib/kernel/src/hipe_unified_loader.erl
index cedaaf4f7e..06d404905d 100644
--- a/lib/kernel/src/hipe_unified_loader.erl
+++ b/lib/kernel/src/hipe_unified_loader.erl
@@ -34,6 +34,13 @@
-module(hipe_unified_loader).
+-compile(no_native).
+% 'no_native' is a workaround to avoid "The code server called unloaded module"
+% caused by Mod:module_info(exports) in patch_to_emu_step1() called by post_beam_load.
+% Reproducable with hipelibs and asn1_SUITE.
+% I think the real solution would be to let BIF erlang:load_module/2 redirect all
+% hipe calls to the module and thereby remove post_beam_load.
+
-export([chunk_name/1,
%% Only the code and code_server modules may call the entries below!
load_native_code/2,