Merge branch 'sverker/stub-module-code-leakage' into dev

* sverker/stub-module-code-leakage:
  Prevent valgrind warning for erts_alloc_permanent_cache_aligned
  [erts] Fix memory leak in erts_make_stub_module (hipe loading)

1 files changed, 23 insertions, 2 deletions

diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index bbc8a445a7..9af80dd7a9 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -2960,6 +2960,29 @@ erts_allocator_options(void *proc)
     return res;
 }
 
+void *erts_alloc_permanent_cache_aligned(ErtsAlcType_t type, Uint size)
+{
+    UWord v = (UWord) erts_alloc(type, size + (ERTS_CACHE_LINE_SIZE-1));
+
+#ifdef VALGRIND
+    {   /* Avoid Leak_PossiblyLost */
+	static UWord vg_root_set[10];
+	static unsigned ix = 0;
+	if (ix >= sizeof(vg_root_set) / sizeof(*vg_root_set)) {
+	    erl_exit(ERTS_ABORT_EXIT, "Too many erts_alloc_permanent_cache_aligned's\n");
+	}
+	vg_root_set[ix++] = v;  /* not thread safe */
+    }
+#endif
+
+    if (v & ERTS_CACHE_LINE_MASK) {
+	v = (v & ~ERTS_CACHE_LINE_MASK) + ERTS_CACHE_LINE_SIZE;
+    }
+    ASSERT((v & ERTS_CACHE_LINE_MASK) == 0);
+    return (void*)v;
+}
+
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
  * Deprecated functions                                                    *
  *                                                                         *
@@ -3583,6 +3606,4 @@ install_debug_functions(void)
     return FENCE_SZ;
 }
 
-
-
 #endif /* #ifdef DEBUG */