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, 2 insertions, 14 deletions

diff --git a/erts/emulator/beam/erl_alloc.h b/erts/emulator/beam/erl_alloc.h
index c35a60da22..80cb82c393 100644
--- a/erts/emulator/beam/erl_alloc.h
+++ b/erts/emulator/beam/erl_alloc.h
@@ -180,11 +180,11 @@ void *erts_realloc(ErtsAlcType_t type, void *ptr, Uint size);
 void erts_free(ErtsAlcType_t type, void *ptr);
 void *erts_alloc_fnf(ErtsAlcType_t type, Uint size);
 void *erts_realloc_fnf(ErtsAlcType_t type, void *ptr, Uint size);
-void *erts_alloc_permanent_cache_aligned(ErtsAlcType_t type, Uint size);
-
 
 #endif /* #if !ERTS_ALC_DO_INLINE */
 
+void *erts_alloc_permanent_cache_aligned(ErtsAlcType_t type, Uint size);
+
 #ifndef ERTS_CACHE_LINE_SIZE
 /* Assume a cache line size of 64 bytes */
 #  define ERTS_CACHE_LINE_SIZE ((UWord) 64)
@@ -250,18 +250,6 @@ void *erts_realloc_fnf(ErtsAlcType_t type, void *ptr, Uint size)
 	size);
 }
 
-ERTS_ALC_INLINE
-void *erts_alloc_permanent_cache_aligned(ErtsAlcType_t type, Uint size)
-{
-    UWord v = (UWord) erts_alloc(type, size + (ERTS_CACHE_LINE_SIZE-1));
-
-    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;
-}
-
 #endif /* #if ERTS_ALC_DO_INLINE || defined(ERTS_ALC_INTERNAL__) */
 
 typedef void (*erts_alloc_verify_func_t)(Allctr_t *);