4 files changed, 45 insertions, 8 deletions
diff --git a/erts/preloaded/ebin/erts_internal.beam b/erts/preloaded/ebin/erts_internal.beam
index fe99cc769b..c0ff53f503 100644
--- a/erts/preloaded/ebin/erts_internal.beam
+++ b/erts/preloaded/ebin/erts_internal.beam
diff --git a/erts/preloaded/ebin/prim_eval.beam b/erts/preloaded/ebin/prim_eval.beam
index 66cc919bf1..a011890c1a 100644
--- a/erts/preloaded/ebin/prim_eval.beam
+++ b/erts/preloaded/ebin/prim_eval.beam
diff --git a/erts/preloaded/src/erts_internal.erl b/erts/preloaded/src/erts_internal.erl
index a27cb2ba38..bcc779e6f6 100644
--- a/erts/preloaded/src/erts_internal.erl
+++ b/erts/preloaded/src/erts_internal.erl
@@ -31,7 +31,8 @@
 
 -export([await_port_send_result/3]).
 -export([cmp_term/2]).
--export([map_to_tuple_keys/1, term_type/1, map_hashmap_children/1]).
+-export([map_to_tuple_keys/1, term_type/1, map_hashmap_children/1,
+         maps_to_list/2]).
 -export([open_port/2, port_command/3, port_connect/2, port_close/1,
 	 port_control/3, port_call/3, port_info/1, port_info/2]).
 
@@ -369,6 +370,15 @@ map_hashmap_children(_M) ->
       Multi :: boolean(),
       Res :: term().
 
+%% return a list of key value pairs, at most of length N
+-spec maps_to_list(M,N) -> Pairs when
+    M :: map(),
+    N :: integer(),
+    Pairs :: list().
+
+maps_to_list(_M, _N) ->
+    erlang:nif_error(undefined).
+
 %% erlang:demonitor(Ref, [flush]) traps to
 %% erts_internal:flush_monitor_messages(Ref, Res) when
 %% it needs to flush monitor messages.
diff --git a/erts/preloaded/src/prim_eval.S b/erts/preloaded/src/prim_eval.S
index e7f09a870c..c6623f8e03 100644
--- a/erts/preloaded/src/prim_eval.S
+++ b/erts/preloaded/src/prim_eval.S
@@ -26,7 +26,7 @@
 
 {attributes, []}.
 
-{labels, 10}.
+{labels, 14}.
 
 
 {function, 'receive', 2, 2}.
@@ -36,6 +36,9 @@
     {allocate,2,2}.
     {move,{x,1},{y,0}}.
     {move,{x,0},{y,1}}.
+    %% Call arg_reg_alloc() in order to ensure
+    %% that def_arg_reg[0] isn't clobbered
+    {call,0,{f,7}}.
   {label,3}.
     {loop_rec,{f,5},{x,0}}.
     {move,{y,1},{x,1}}.
@@ -53,19 +56,43 @@
     {deallocate,2}.
     return.
 
-
-{function, module_info, 0, 8}.
+{function, arg_reg_alloc, 0, 7}.
   {label,6}.
-    {func_info,{atom,prim_eval},{atom,module_info},0}.
+    {func_info,{atom,prim_eval},{atom,arg_reg_alloc},0}.
   {label,7}.
+    {allocate,0,0}.
+    {move,{integer,134217727},{x,0}}.
+    {call_ext,1,{extfunc,erlang,bump_reductions,1}}.
+    {move,{atom,true},{x,3}}.
+    {move,{atom,true},{x,4}}.
+    {move,{atom,true},{x,2}}.
+    {move,{atom,true},{x,5}}.
+    {move,{atom,true},{x,1}}.
+    {move,{atom,true},{x,6}}.
+    {move,{atom,true},{x,0}}.
+    {call_last,7,{f,9},0}.
+
+
+{function, arg_reg_alloc, 7, 9}.
+  {label,8}.
+    {func_info,{atom,prim_eval},{atom,arg_reg_alloc},7}.
+  {label,9}.
+    {move,{atom,ok},{x,0}}.
+    return.
+
+
+{function, module_info, 0, 11}.
+  {label,10}.
+    {func_info,{atom,prim_eval},{atom,module_info},0}.
+  {label,11}.
     {move,{atom,prim_eval},{x,0}}.
     {call_ext_only,1,{extfunc,erlang,get_module_info,1}}.
 
 
-{function, module_info, 1, 10}.
-  {label,8}.
+{function, module_info, 1, 13}.
+  {label,12}.
     {func_info,{atom,prim_eval},{atom,module_info},1}.
-  {label,9}.
+  {label,13}.
     {move,{x,0},{x,1}}.
     {move,{atom,prim_eval},{x,0}}.
     {call_ext_only,2,{extfunc,erlang,get_module_info,2}}.