Fix evaluation of map updates in the debugger and erl_eval

Reported-by: José Valim

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/debugger/src/dbg_ieval.erl b/lib/debugger/src/dbg_ieval.erl
index 0653ce4c00..77297de0f3 100644
--- a/lib/debugger/src/dbg_ieval.erl
+++ b/lib/debugger/src/dbg_ieval.erl
@@ -665,11 +665,11 @@ expr({map,Line,E0,Fs0}, Bs0, Ieval0) ->
     {value,E,Bs1} = expr(E0, Bs0, Ieval),
     case E of
         #{} ->
-            {Fs,Bs2} = eval_map_fields(Fs0, Bs1, Ieval),
+            {Fs,Bs2} = eval_map_fields(Fs0, Bs0, Ieval),
             Value = lists:foldl(fun ({map_assoc,K,V}, Mi) -> maps:put(K,V,Mi);
                                     ({map_exact,K,V}, Mi) -> maps:update(K,V,Mi)
                                 end, E, Fs),
-            {value,Value,Bs2};
+            {value,Value,merge_bindings(Bs2, Bs1, Ieval)};
         _ ->
             exception(error, {badarg,E}, Bs1, Ieval)
     end;