Merge branch 'sverker/hipe-code-loadnpurge/OTP-13968'

* sverker/hipe-code-loadnpurge: (35 commits)
  erts: Cleanup dead code
  kernel,hipe: Fix dialyzer warnings
  erts: Replace unsafe Module.first_hipe_ref
  erts: Disable DBG_TRACE_MFA for debug build
  kernel: Fix code_SUITE:upgrade for non-hipe
  erts: Cleanup hipe trampoline code
  erts: Remove dead alloc stats in hipe_amd64.c
  erts: Remove code_SUITE:make_stub and make_stub_many_funs
  erts: Let code:make_stub_module raise 'notsup'
  erts: Fix bug in stack walk on risc
  erts: Fix old leak for ppc hipe code
  erts: Fix old leak for arm hipe code
  erts: Fix old leak of sparc hipe code
  erts: Fix old leak of hipe code on x86 32-bit
  erts: Enable exec_alloc for all hipe architectures
  erts: Remove debug printout for hipe loader state
  erts: Free hipe_refs and hipe_sdesc of a failed load
  erts: Refactor out hipe_purge_refs/sdesc
  erts: Refactor hipe_loader_state_dtor into a true destructor
  hipe: TRY fix llvm external calls to own module
  ...

1 files changed, 47 insertions, 1 deletions

diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c
index dd8ca5fac1..163244237d 100644
--- a/erts/emulator/beam/erl_alloc_util.c
+++ b/erts/emulator/beam/erl_alloc_util.c
@@ -907,7 +907,9 @@ erts_alcu_literal_32_mseg_dealloc(Allctr_t *allctr, void *seg, Uint size,
 
 #elif defined(ARCH_64) && defined(ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION)
 
-/* Used by literal allocator that has its own mmapper (super carrier) */
+/* For allocators that have their own mmapper (super carrier),
+ * like literal_alloc and exec_alloc on amd64
+ */
 void*
 erts_alcu_mmapper_mseg_alloc(Allctr_t *allctr, Uint *size_p, Uint flags)
 {
@@ -948,6 +950,50 @@ erts_alcu_mmapper_mseg_dealloc(Allctr_t *allctr, void *seg, Uint size,
 }
 #endif /* ARCH_64 && ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION */
 
+#if defined(ERTS_ALC_A_EXEC) && !defined(ERTS_HAVE_EXEC_MMAPPER)
+
+/*
+ * For exec_alloc on non-amd64 that just need memory with PROT_EXEC
+ */
+void*
+erts_alcu_exec_mseg_alloc(Allctr_t *allctr, Uint *size_p, Uint flags)
+{
+    void* res = erts_alcu_mseg_alloc(allctr, size_p, flags);
+
+    if (res) {
+        int r = mprotect(res, *size_p, PROT_EXEC | PROT_READ | PROT_WRITE);
+        ASSERT(r == 0); (void)r;
+    }
+    return res;
+}
+
+void*
+erts_alcu_exec_mseg_realloc(Allctr_t *allctr, void *seg,
+                            Uint old_size, Uint *new_size_p)
+{
+    void *res;
+
+    if (seg && old_size) {
+        int r = mprotect(seg, old_size, PROT_READ | PROT_WRITE);
+        ASSERT(r == 0); (void)r;
+    }
+    res = erts_alcu_mseg_realloc(allctr, seg, old_size, new_size_p);
+    if (res) {
+        int r = mprotect(res, *new_size_p, PROT_EXEC | PROT_READ | PROT_WRITE);
+        ASSERT(r == 0); (void)r;
+    }
+    return res;
+}
+
+void
+erts_alcu_exec_mseg_dealloc(Allctr_t *allctr, void *seg, Uint size, Uint flags)
+{
+    int r = mprotect(seg, size, PROT_READ | PROT_WRITE);
+    ASSERT(r == 0); (void)r;
+    erts_alcu_mseg_dealloc(allctr, seg, size, flags);
+}
+#endif /* ERTS_ALC_A_EXEC && !ERTS_HAVE_EXEC_MMAPPER */
+
 #endif /* HAVE_ERTS_MSEG */
 
 void*