1 files changed, 44 insertions, 13 deletions

diff --git a/erts/emulator/hipe/hipe_bif0.c b/erts/emulator/hipe/hipe_bif0.c
index 26f183dc25..1562748f2d 100644
--- a/erts/emulator/hipe/hipe_bif0.c
+++ b/erts/emulator/hipe/hipe_bif0.c
@@ -609,8 +609,8 @@ static Uint *hipe_find_emu_address(Eterm mod, Eterm name, unsigned int arity)
     Uint *code_base;
     int i, n;
 
-    modp = erts_get_module(mod);
-    if (modp == NULL || (code_base = modp->code) == NULL)
+    modp = erts_get_module(mod, erts_active_code_ix());
+    if (modp == NULL || (code_base = modp->curr.code) == NULL)
 	return NULL;
     n = code_base[MI_NUM_FUNCTIONS];
     for (i = 0; i < n; ++i) {
@@ -648,7 +648,7 @@ static void *hipe_get_emu_address(Eterm m, Eterm f, unsigned int arity, int is_r
 	/* if not found, stub it via the export entry */
 	/* no lock needed around erts_export_get_or_make_stub() */
 	Export *export_entry = erts_export_get_or_make_stub(m, f, arity);
-	address = export_entry->address;
+	address = export_entry->addressv[erts_active_code_ix()];
     }
     return address;
 }
@@ -1093,10 +1093,8 @@ BIF_RETTYPE hipe_bifs_make_fun_3(BIF_ALIST_3)
     if (is_not_nil(free_vars))
 	BIF_ERROR(BIF_P, BADARG);
 
-#ifndef HYBRID /* FIND ME! */
     funp->next = MSO(BIF_P).funs;
     MSO(BIF_P).funs = funp;
-#endif
 
     BIF_RET(make_fun(funp));
 }
@@ -1585,14 +1583,6 @@ BIF_RETTYPE hipe_nonclosure_address(BIF_ALIST_2)
 	    goto badfun;
 	m = ep->code[0];
 	f = ep->code[1];
-    } else if (hdr == make_arityval(2)) {
-	Eterm *tp = tuple_val(BIF_ARG_1);
-	m = tp[1];
-	f = tp[2];
-	if (is_not_atom(m) || is_not_atom(f))
-	    goto badfun;
-	if (!erts_find_export_entry(m, f, BIF_ARG_2))
-	    goto badfun;
     } else
 	goto badfun;
     address = hipe_get_na_nofail(m, f, BIF_ARG_2, 1);
@@ -1757,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;
@@ -1764,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();
@@ -1801,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.