From 966098ceb9dd9d18e9bcd37cd06b96045903e320 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Tue, 20 Sep 2016 16:16:50 +0200
Subject: erts: Move new hipe ref and sdesc lists to loader state

---
 erts/emulator/beam/beam_bif_load.c |  1 -
 erts/emulator/beam/beam_load.c     | 11 ++++++-----
 erts/emulator/beam/module.c        |  6 ------
 erts/emulator/beam/module.h        |  4 ----
 4 files changed, 6 insertions(+), 16 deletions(-)

(limited to 'erts/emulator/beam')

diff --git a/erts/emulator/beam/beam_bif_load.c b/erts/emulator/beam/beam_bif_load.c
index ec1db8d9c2..f5d1ca7e54 100644
--- a/erts/emulator/beam/beam_bif_load.c
+++ b/erts/emulator/beam/beam_bif_load.c
@@ -1798,7 +1798,6 @@ delete_code(Module* modp)
 
     ASSERT(modp->curr.num_breakpoints == 0);
     ASSERT(modp->curr.num_traced_exports == 0);
-    DBG_TRACE_MFA(make_atom(modp->module), 0, 0, "delete_code old.first_hipe_ref=%p", modp->curr.first_hipe_ref);
     modp->old = modp->curr;
     erts_module_instance_init(&modp->curr);
 }
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c
index 7d29f393e5..0eb390bf4c 100644
--- a/erts/emulator/beam/beam_load.c
+++ b/erts/emulator/beam/beam_load.c
@@ -1126,11 +1126,8 @@ stub_insert_new_code(Process *c_p, ErtsProcLocks c_p_locks,
     modp->curr.code_length = size;
     modp->curr.catches = BEAM_CATCHES_NIL; /* Will be filled in later. */
 #if defined(HIPE)
-    DBG_TRACE_MFA(make_atom(modp->module), 0, 0, "insert_new_code new_hipe_refs = %p", modp->new_hipe_refs);
-    modp->curr.first_hipe_ref = modp->new_hipe_refs;
-    modp->curr.first_hipe_sdesc = modp->new_hipe_sdesc;
-    modp->new_hipe_refs = NULL;
-    modp->new_hipe_sdesc = NULL;
+    DBG_TRACE_MFA(make_atom(modp->module), 0, 0, "insert_new_code "
+                  "first_hipe_ref = %p", hipe_code->first_hipe_ref);
     modp->curr.hipe_code = hipe_code;
 #endif
 
@@ -6498,6 +6495,8 @@ erts_make_stub_module(Process* p, Eterm hipe_magic_bin, Eterm Beam, Eterm Info)
     hipe_code->text_segment = hipe_stp->text_segment;
     hipe_code->text_segment_size = hipe_stp->text_segment_size;
     hipe_code->data_segment = hipe_stp->data_segment;
+    hipe_code->first_hipe_ref = hipe_stp->new_hipe_refs;
+    hipe_code->first_hipe_sdesc = hipe_stp->new_hipe_sdesc;
 
     /*
      * Insert the module in the module table.
@@ -6524,6 +6523,8 @@ erts_make_stub_module(Process* p, Eterm hipe_magic_bin, Eterm Beam, Eterm Info)
 	/* Prevent code from being freed */
 	hipe_stp->text_segment = 0;
 	hipe_stp->data_segment = 0;
+        hipe_stp->new_hipe_refs = NULL;
+        hipe_stp->new_hipe_sdesc = NULL;
 
 	erts_free_aligned_binary_bytes(temp_alloc);
 	free_loader_state(magic);
diff --git a/erts/emulator/beam/module.c b/erts/emulator/beam/module.c
index 5c56ad20df..e9b18ba525 100644
--- a/erts/emulator/beam/module.c
+++ b/erts/emulator/beam/module.c
@@ -77,8 +77,6 @@ void erts_module_instance_init(struct erl_module_instance* modi)
     modi->num_breakpoints = 0;
     modi->num_traced_exports = 0;
 #ifdef HIPE
-    modi->first_hipe_ref = NULL;
-    modi->first_hipe_sdesc = NULL;
     modi->hipe_code = NULL;
 #endif
 }
@@ -95,8 +93,6 @@ static Module* module_alloc(Module* tmpl)
     obj->on_load = 0;
 #ifdef HIPE
     obj->first_hipe_mfa = NULL;
-    obj->new_hipe_refs = NULL;
-    obj->new_hipe_sdesc = NULL;
 #endif
     DBG_TRACE_MFA(make_atom(obj->module), 0, 0, "module_alloc");
     return obj;
@@ -214,8 +210,6 @@ static ERTS_INLINE void copy_module(Module* dst_mod, Module* src_mod)
     dst_mod->on_load = src_mod->on_load;
 #ifdef HIPE
     dst_mod->first_hipe_mfa = src_mod->first_hipe_mfa;
-    dst_mod->new_hipe_refs  = src_mod->new_hipe_refs;
-    dst_mod->new_hipe_sdesc = src_mod->new_hipe_sdesc;
 #endif
 }
 
diff --git a/erts/emulator/beam/module.h b/erts/emulator/beam/module.h
index c3adaf12fc..9de610ccf7 100644
--- a/erts/emulator/beam/module.h
+++ b/erts/emulator/beam/module.h
@@ -35,8 +35,6 @@ struct erl_module_instance {
     int num_breakpoints;
     int num_traced_exports;
 #ifdef HIPE
-    struct hipe_ref* first_hipe_ref;  /* all external hipe calls from this module */
-    struct hipe_sdesc* first_hipe_sdesc;  /* all stack descriptors for this module */
     HipeModule *hipe_code;
 #endif
 };
@@ -51,8 +49,6 @@ typedef struct erl_module {
     struct erl_module_instance* on_load;
 #ifdef HIPE
     struct hipe_mfa_info* first_hipe_mfa;
-    struct hipe_ref* new_hipe_refs;
-    struct hipe_sdesc* new_hipe_sdesc;
 #endif
 } Module; 
 
-- 
cgit v1.2.3