Merge branch 'sverker/hipe-amd64-code-alloc/OTP-13359'

This merge is actually only some left overs.
The bulk work for hipe-amd64-code-alloc has already been
merge (without ticket number) at 42a1166b47721cd444.

4 files changed, 44 insertions, 11 deletions

diff --git a/erts/doc/src/erts_alloc.xml b/erts/doc/src/erts_alloc.xml
index 70775b9f0f..9aef1c0b1f 100644
--- a/erts/doc/src/erts_alloc.xml
+++ b/erts/doc/src/erts_alloc.xml
@@ -583,7 +583,7 @@
     </taglist>
     <p>The following flag is special for <c>exec_alloc</c>:</p>
     <taglist>
-      <tag><marker id="MIscs"/><c><![CDATA[+MXscs <size in MB>]]></c></tag>
+      <tag><marker id="MXscs"/><c><![CDATA[+MXscs <size in MB>]]></c></tag>
       <item>
       <c>exec_alloc</c> super carrier size (in MB). The amount of
       <em>virtual</em> address space reserved for native executable code
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c
index 95489d9a63..0c2743beb2 100644
--- a/erts/emulator/beam/beam_load.c
+++ b/erts/emulator/beam/beam_load.c
@@ -4424,6 +4424,7 @@ gen_get_map_elements(LoaderState* stp, GenOpArg Fail, GenOpArg Src,
     int good_hash;
 #endif
 
+    ERTS_UNDEF(hx, 0);
     ASSERT(Size.type == TAG_u);
 
     NEW_GENOP(stp, op);
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index c367d4162c..3c2c9def3b 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -137,10 +137,13 @@ static ErtsAllocatorState_t exec_alloc_state;
 #endif
 static ErtsAllocatorState_t test_alloc_state;
 
-#define ERTS_ALC_INFO_A_ALLOC_UTIL (ERTS_ALC_A_MAX + 1)
-#define ERTS_ALC_INFO_A_MSEG_ALLOC (ERTS_ALC_A_MAX + 2)
-#define ERTS_ALC_INFO_A_ERTS_MMAP  (ERTS_ALC_A_MAX + 3)
-#define ERTS_ALC_INFO_A_MAX        ERTS_ALC_INFO_A_ERTS_MMAP
+enum {
+    ERTS_ALC_INFO_A_ALLOC_UTIL = ERTS_ALC_A_MAX + 1,
+    ERTS_ALC_INFO_A_MSEG_ALLOC,
+    ERTS_ALC_INFO_A_ERTS_MMAP,
+    ERTS_ALC_INFO_A_DISABLED_EXEC,  /* fake a disabled "exec_alloc" */
+    ERTS_ALC_INFO_A_END
+};
 
 typedef struct {
     erts_smp_atomic32_t refc;
@@ -150,7 +153,7 @@ typedef struct {
     Process *proc;
     Eterm ref;
     Eterm ref_heap[REF_THING_SIZE];
-    int allocs[ERTS_ALC_INFO_A_MAX - ERTS_ALC_A_MIN + 1 + 1];
+    int allocs[ERTS_ALC_INFO_A_END - ERTS_ALC_A_MIN + 1];
 } ErtsAllocInfoReq;
 
 ERTS_SCHED_PREF_QUICK_ALLOC_IMPL(aireq,
@@ -3260,6 +3263,12 @@ reply_alloc_info(void *vair)
                                             am_false);
 #endif
 		    break;
+#ifndef ERTS_ALC_A_EXEC
+		case ERTS_ALC_INFO_A_DISABLED_EXEC:
+		    alloc_atom = erts_bld_atom(hpp, szp, "exec_alloc");
+		    ainfo = erts_bld_tuple2(hpp, szp, alloc_atom, am_false);
+		    break;
+#endif
 		default:
 		    alloc_atom = erts_bld_atom(hpp, szp,
 					       (char *) ERTS_ALC_A2AD(ai));
@@ -3287,7 +3296,8 @@ reply_alloc_info(void *vair)
 	    switch (ai) {
 	    case ERTS_ALC_A_SYSTEM:
             case ERTS_ALC_INFO_A_ALLOC_UTIL:
-            case ERTS_ALC_INFO_A_ERTS_MMAP:
+	    case ERTS_ALC_INFO_A_ERTS_MMAP:
+	    case ERTS_ALC_INFO_A_DISABLED_EXEC:
 		break;
 	    case ERTS_ALC_INFO_A_MSEG_ALLOC:
 #if HAVE_ERTS_MSEG && defined(ERTS_SMP)
@@ -3359,7 +3369,7 @@ erts_request_alloc_info(struct process *c_p,
 			int internal)
 {
     ErtsAllocInfoReq *air = aireq_alloc();
-    Eterm req_ai[ERTS_ALC_INFO_A_MAX+1] = {0};
+    Eterm req_ai[ERTS_ALC_INFO_A_END] = {0};
     Eterm alist;
     Eterm *hp;
     int airix = 0, ai;
@@ -3399,6 +3409,12 @@ erts_request_alloc_info(struct process *c_p,
             ai = ERTS_ALC_INFO_A_ERTS_MMAP;
             goto save_alloc;
         }
+#ifndef ERTS_ALC_A_EXEC
+	if (erts_is_atom_str("exec_alloc", alloc, 0)) {
+	    ai = ERTS_ALC_INFO_A_DISABLED_EXEC;
+	    goto save_alloc;
+	}
+#endif
 	if (erts_is_atom_str("alloc_util", alloc, 0)) {
 	    ai = ERTS_ALC_INFO_A_ALLOC_UTIL;
 	save_alloc:
diff --git a/erts/emulator/test/alloc_SUITE.erl b/erts/emulator/test/alloc_SUITE.erl
index 1f7b499dcb..84cf4921d3 100644
--- a/erts/emulator/test/alloc_SUITE.erl
+++ b/erts/emulator/test/alloc_SUITE.erl
@@ -73,16 +73,32 @@ migration(Cfg) ->
     end.
 
 erts_mmap(Config) when is_list(Config) ->
-    case os:type() of
-	{unix, _} ->
+    case {os:type(), mmsc_flags()} of
+	{{unix,_}, false} ->
 	    [erts_mmap_do(Config, SCO, SCRPM, SCRFSD)
 	     || SCO <-[true,false], SCRFSD <-[1234,0], SCRPM <- [true,false]];
-	{SkipOs,_} ->
+	{{unix,_}, Flags} ->
+	    {skipped, Flags};
+	{{SkipOs,_},_} ->
 	    {skipped,
 		   lists:flatten(["Not run on "
 				  | io_lib:format("~p",[SkipOs])])}
     end.
 
+%% Check if there are ERL_FLAGS set that will mess up this test case
+mmsc_flags() ->
+    case mmsc_flags("ERL_FLAGS") of
+	false -> mmsc_flags("ERL_ZFLAGS");
+	Flags -> Flags
+    end.
+mmsc_flags(Env) ->
+    case os:getenv(Env) of
+	false -> false;
+	V -> case string:str(V, "+MMsc") of
+		 0 -> false;
+		 P -> Env ++ "=" ++ string:substr(V, P)
+	     end
+    end.
 
 erts_mmap_do(Config, SCO, SCRPM, SCRFSD) ->
     %% We use the number of schedulers + 1 * approx main carriers size