Merge branch 'maint'

Conflicts:
	erts/preloaded/ebin/init.beam

5 files changed, 55 insertions, 1 deletions

diff --git a/erts/emulator/hipe/hipe_bif0.c b/erts/emulator/hipe/hipe_bif0.c
index ab62eeeb96..1562748f2d 100644
--- a/erts/emulator/hipe/hipe_bif0.c
+++ b/erts/emulator/hipe/hipe_bif0.c
@@ -1747,6 +1747,41 @@ BIF_RETTYPE hipe_bifs_mark_referred_from_1(BIF_ALIST_1) /* get_refs_from */
     BIF_RET(NIL);
 }
 
+/* Called by init:restart after unloading all hipe compiled modules
+ * to work around bug causing execution of deallocated beam code.
+ * Can be removed when delete/purge of native modules works better.
+ * Test: Do init:restart in debug compiled vm with hipe compiled kernel. 
+ */
+static void hipe_purge_all_refs(void)
+{
+    struct hipe_mfa_info **bucket;
+    unsigned int i, nrbuckets;
+
+    hipe_mfa_info_table_lock();
+
+    bucket = hipe_mfa_info_table.bucket;
+    nrbuckets = 1 << hipe_mfa_info_table.log2size;
+    for (i = 0; i < nrbuckets; ++i) {	
+	while (bucket[i] != NULL) {
+	    struct hipe_mfa_info* mfa = bucket[i];
+	    bucket[i] = mfa->bucket.next;
+
+	    while (mfa->refers_to) {
+		struct hipe_mfa_info_list *to = mfa->refers_to;
+		mfa->refers_to = to->next;
+		erts_free(ERTS_ALC_T_HIPE, to);
+	    }
+	    while (mfa->referred_from) {
+		struct ref* from = mfa->referred_from;
+		mfa->referred_from = from->next;
+		erts_free(ERTS_ALC_T_HIPE, from);
+	    }
+	    erts_free(ERTS_ALC_T_HIPE, mfa);
+	}
+    }
+    hipe_mfa_info_table_unlock();
+}
+
 BIF_RETTYPE hipe_bifs_remove_refs_from_1(BIF_ALIST_1)
 {
     struct mfa mfa;
@@ -1754,6 +1789,11 @@ BIF_RETTYPE hipe_bifs_remove_refs_from_1(BIF_ALIST_1)
     struct hipe_mfa_info_list *refers_to, *tmp_refers_to;
     struct ref **prev, *ref;
 
+    if (BIF_ARG_1 == am_all) {
+	hipe_purge_all_refs();
+	BIF_RET(NIL);
+    }
+
     if (!term_to_mfa(BIF_ARG_1, &mfa))
 	BIF_ERROR(BIF_P, BADARG);
     hipe_mfa_info_table_lock();
@@ -1791,6 +1831,7 @@ BIF_RETTYPE hipe_bifs_remove_refs_from_1(BIF_ALIST_1)
     BIF_RET(NIL);
 }
 
+
 /* redirect_referred_from(CalleeMFA)
  * Redirect all pending-redirect refs in CalleeMFA's referred_from.
  * Then remove any pending-redirect && pending-remove refs from CalleeMFA's referred_from.
diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam
index eeb155fe74..1a250932da 100644
--- a/erts/preloaded/ebin/init.beam
+++ b/erts/preloaded/ebin/init.beam
diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl
index 708991e261..185b62a899 100644
--- a/erts/preloaded/src/init.erl
+++ b/erts/preloaded/src/init.erl
@@ -635,8 +635,16 @@ do_unload([M|Mods]) ->
     catch erlang:purge_module(M),
     do_unload(Mods);
 do_unload([]) ->
+    purge_all_hipe_refs(),
     ok.
 
+purge_all_hipe_refs() ->
+    case erlang:system_info(hipe_architecture) of
+	undefined -> ok;
+	_ -> hipe_bifs:remove_refs_from(all)
+    end.
+
+
 sub([H|T],L) -> sub(T,del(H,L));
 sub([],L)    -> L.
     
diff --git a/lib/kernel/src/heart.erl b/lib/kernel/src/heart.erl
index 255ae4e51b..218be964a0 100644
--- a/lib/kernel/src/heart.erl
+++ b/lib/kernel/src/heart.erl
@@ -18,6 +18,10 @@
 %%
 -module(heart). 
 
+-compile(no_native).
+% 'no_native' as part of a crude fix to make init:restart/0 work by clearing
+% all hipe inter-module information (hipe_mfa_info's in hipe_bif0.c).
+
 %%%--------------------------------------------------------------------
 %%% This is a rewrite of pre_heart from BS.3.
 %%%
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index 69197d4915..5e0300639e 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -1589,7 +1589,8 @@ native_early_modules_1(Architecture) ->
         true ->
             ?line true = lists:all(fun code:is_module_native/1,
 				   [ets,file,filename,gb_sets,gb_trees,
-				    hipe_unified_loader,lists,os,packages]),
+				    %%hipe_unified_loader, no_native as workaround
+				    lists,os,packages]),
             ok
     end.