3 files changed, 94 insertions, 23 deletions

diff --git a/erts/emulator/beam/break.c b/erts/emulator/beam/break.c
index f2eda6c0f8..4c7c910419 100644
--- a/erts/emulator/beam/break.c
+++ b/erts/emulator/beam/break.c
@@ -381,10 +381,12 @@ info(fmtfn_t to, void *to_arg)
 
 static int code_size(struct erl_module_instance* modi)
 {
-    ErtsLiteralArea* lit = modi->code_hdr->literal_area;
     int size = modi->code_length;
-    if (lit) {
-        size += (lit->end - lit->start) * sizeof(Eterm);
+
+    if (modi->code_hdr) {
+        ErtsLiteralArea* lit = modi->code_hdr->literal_area;
+        if (lit)
+            size += (lit->end - lit->start) * sizeof(Eterm);
     }
     return size;
 }
@@ -406,13 +408,9 @@ loaded(fmtfn_t to, void *to_arg)
      * Calculate and print totals.
      */
     for (i = 0; i < module_code_size(code_ix); i++) {
-	if ((modp = module_code(i, code_ix)) != NULL &&
-	    ((modp->curr.code_length != 0) ||
-	     (modp->old.code_length != 0))) {
+	if ((modp = module_code(i, code_ix)) != NULL) {
 	    cur += code_size(&modp->curr);
-	    if (modp->old.code_length != 0) {
-		old += code_size(&modp->old);
-	    }
+            old += code_size(&modp->old);
 	}
     }
     erts_print(to, to_arg, "Current code: %d\n", cur);
@@ -428,26 +426,20 @@ loaded(fmtfn_t to, void *to_arg)
 	    /*
 	     * Interactive dump; keep it brief.
 	     */
-	    if (modp != NULL &&
-	    ((modp->curr.code_length != 0) ||
-	     (modp->old.code_length != 0))) {
-		erts_print(to, to_arg, "%T", make_atom(modp->module));
-		cur += code_size(&modp->curr);
-		erts_print(to, to_arg, " %d", code_size(&modp->curr));
-		if (modp->old.code_length != 0) {
-		    erts_print(to, to_arg, " (%d old)",
-			       code_size(&modp->old));
-		    old += code_size(&modp->old);
-		}
+	    if (modp != NULL && ((modp->curr.code_length != 0) ||
+                                 (modp->old.code_length != 0))) {
+		erts_print(to, to_arg, "%T %d", make_atom(modp->module),
+                           code_size(&modp->curr));
+		if (modp->old.code_length != 0)
+		    erts_print(to, to_arg, " (%d old)", code_size(&modp->old));
 		erts_print(to, to_arg, "\n");
 	    }
 	} else {
 	    /*
 	     * To crash dump; make it parseable.
 	     */
-	    if (modp != NULL &&
-		((modp->curr.code_length != 0) ||
-		 (modp->old.code_length != 0))) {
+	    if (modp != NULL && ((modp->curr.code_length != 0) ||
+                                 (modp->old.code_length != 0))) {
 		erts_print(to, to_arg, "=mod:");
 		erts_print(to, to_arg, "%T", make_atom(modp->module));
 		erts_print(to, to_arg, "\n");
diff --git a/erts/emulator/test/Makefile b/erts/emulator/test/Makefile
index 2e48c475d5..453f819d1b 100644
--- a/erts/emulator/test/Makefile
+++ b/erts/emulator/test/Makefile
@@ -87,6 +87,7 @@ MODULES= \
 	op_SUITE \
 	port_SUITE \
 	port_bif_SUITE \
+	prim_eval_SUITE \
 	process_SUITE \
 	pseudoknot_SUITE \
 	receive_SUITE \
diff --git a/erts/emulator/test/prim_eval_SUITE.erl b/erts/emulator/test/prim_eval_SUITE.erl
new file mode 100644
index 0000000000..3f4965f96d
--- /dev/null
+++ b/erts/emulator/test/prim_eval_SUITE.erl
@@ -0,0 +1,78 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(prim_eval_SUITE).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2,
+	 init_per_group/2, end_per_group/2]).
+
+-export(['ERL-365'/1]).
+
+init_per_testcase(_Case, Config) ->
+    Config.
+
+end_per_testcase(_Case, _Config) ->
+    ok.
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+all() ->
+    ['ERL-365'].
+
+'ERL-365'(Config) when is_list(Config) ->
+    %% def_arg_reg[0] is used for storage of timeout instruction
+    %% when a 'receive after' is executed. When a process was
+    %% scheduled out inside prim_eval:'receive'/0 due to a function
+    %% call, def_arg_reg[0] was overwritten due to storage of live
+    %% registers.
+    P = spawn_link(fun () ->
+                           prim_eval:'receive'(fun (_M) -> 
+                                                       erlang:bump_reductions((1 bsl 27)-1),
+                                                       id(true),
+                                                       nomatch
+                                               end,
+                                               200)
+                   end),
+    receive after 100 -> ok end,
+    P ! {wont, match},
+    receive after 200 -> ok end,
+    ok.
+
+
+
+id(X) ->
+    X.