From ec15a2aaab58816c728676807c0b6e61d5a5185e Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Sat, 3 May 2014 20:49:08 +0200
Subject: Fix evaluation of map updates in the debugger and erl_eval
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reported-by: José Valim
---
 lib/debugger/src/dbg_ieval.erl                               | 4 ++--
 lib/debugger/test/int_eval_SUITE.erl                         | 1 +
 lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl | 5 ++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'lib/debugger')

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;
diff --git a/lib/debugger/test/int_eval_SUITE.erl b/lib/debugger/test/int_eval_SUITE.erl
index ecbd68ab40..9d7ef238e3 100644
--- a/lib/debugger/test/int_eval_SUITE.erl
+++ b/lib/debugger/test/int_eval_SUITE.erl
@@ -294,6 +294,7 @@ stacktrace(Config) when is_list(Config) ->
 maps(Config) when is_list(Config) ->
     Fun = fun () -> ?IM:empty_map_update([camembert]) end,
     {'EXIT',{{badarg,[camembert]},_}} = spawn_eval(Fun),
+    [#{hello := 0, price := 0}] = spawn_eval(fun () -> ?IM:update_in_fun() end),
     ok.
 
 
diff --git a/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl b/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl
index e047a33d8c..7f55360f48 100644
--- a/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl
+++ b/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl
@@ -29,7 +29,7 @@
 -export([more_catch/1,more_nocatch/1,exit_me/0]).
 -export([f/1, f_try/1, f_catch/1]).
 -export([otp_5837/1, otp_8310/0]).
--export([empty_map_update/1]).
+-export([empty_map_update/1, update_in_fun/0]).
 
 %% Internal exports.
 -export([echo/2,my_subtract/2,catch_a_ball/0,throw_a_ball/0]).
@@ -244,3 +244,6 @@ otp_8310() ->
     ok.
 
 empty_map_update(Map) -> Map#{}.
+
+update_in_fun() ->
+    lists:map(fun (X) -> X#{price := 0} end, [#{hello => 0, price => nil}]).
-- 
cgit v1.2.3