From 1f7324d0fd72b4137fb1f21b0b759ffebdf7ea90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Wed, 5 Feb 2014 19:07:22 +0100
Subject: erts: Fix Maps for beam_load

Map source may be anything, not only registers.
---
 erts/emulator/beam/beam_emu.c | 4 ++--
 erts/emulator/beam/ops.tab    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index 89d9442526..4d8ea354ce 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -2355,7 +2355,7 @@ void process_main(void)
      Next(4+Arg(3));
  }
 
- OpCase(update_map_assoc_jddII): {
+ OpCase(update_map_assoc_jsdII): {
      Eterm res;
      Eterm map;
 
@@ -2373,7 +2373,7 @@ void process_main(void)
      }
  }
 
- OpCase(update_map_exact_jddII): {
+ OpCase(update_map_exact_jsdII): {
      Eterm res;
      Eterm map;
 
diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab
index f35997efee..9ea3a3a8ea 100644
--- a/erts/emulator/beam/ops.tab
+++ b/erts/emulator/beam/ops.tab
@@ -1482,8 +1482,8 @@ put_map_exact F Src Dst Live Size Rest=* => \
 	      update_map_exact F Src Dst Live Size Rest
 
 new_map j d I I
-update_map_assoc j d d I I
-update_map_exact j d d I I
+update_map_assoc j s d I I
+update_map_exact j s d I I
 
 is_map Fail cq => jump Fail
 
-- 
cgit v1.2.3


From 963c06a5b72c2ac8d88a6910ee60248d6dca747d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Wed, 5 Feb 2014 19:11:07 +0100
Subject: erts: Maps must fail on exact updates of empty Maps

Exact updates on empty Maps must fail directly.
---
 erts/emulator/beam/beam_emu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index 4d8ea354ce..1ae413d46e 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -6614,7 +6614,7 @@ update_map_exact(Process* p, Eterm* reg, Eterm map, BeamInstr* I)
      */
 
     if (num_old == 0) {
-	return new_map(p, reg, I+1);
+	return THE_NON_VALUE;
     }
 
     /*
-- 
cgit v1.2.3


From b31a985383d1d641b4d05439c9e30a2f5958dd93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Wed, 5 Feb 2014 19:41:31 +0100
Subject: compiler: Update map_SUITE with error case test

  M#{ key := V } should fail when M is not a Map
---
 lib/compiler/test/map_SUITE.erl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/compiler/test/map_SUITE.erl b/lib/compiler/test/map_SUITE.erl
index 0ba5d5dd0d..dc880a7a9d 100644
--- a/lib/compiler/test/map_SUITE.erl
+++ b/lib/compiler/test/map_SUITE.erl
@@ -215,6 +215,7 @@ t_update_exact(Config) when is_list(Config) ->
     M2 = M0#{3=>wrong,3.0:=new},
 
     %% Errors cases.
+    {'EXIT',{badarg,_}} = (catch ((id(nil))#{ a := b })),
     {'EXIT',{badarg,_}} = (catch M0#{nonexisting:=val}),
     {'EXIT',{badarg,_}} = (catch M0#{1.0:=v,1.0=>v2}),
     {'EXIT',{badarg,_}} = (catch M0#{42.0:=v,42:=v2}),
-- 
cgit v1.2.3