Merge branch 'bjorn/maps'

* bjorn/maps:
  Document the new {badmap,Term} and {badkey,Key} exceptions
  Raise more descriptive error messages for failed map operations
  erl_term.h: Add is_not_map() macro
  Tigthen code for the i_get_map_elements/3 instruction
  Pre-compute hash values for the general get_map_elements instruction
  Teach the loader to pre-compute the hash value for single-key lookups
  Optimize use of i_get_map_element/4
  beam_emu: Slightly optimize update_map_{assoc,exact}
  v3_codegen: Don't sort map keys in map creation/update
  beam_validator: No longer require strict literal term order
  Sort maps keys in the loader
  De-optimize the has_map_fields instructions
  erts/map_SUITE.erl: Add a test case that tests has_map_fields
  Fully evaluate is_map/1 for literals at load-time
  map_SUITE: Add tests of is_map/1 with literal maps
  Run a clone of map_SUITE without optimizations
  Remove the fail label operand of the new_map instruction
  Correct transformation of put_map_assoc to new_map
  Remove support for put_map_exact without a source map

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/compiler/src/sys_core_fold.erl b/lib/compiler/src/sys_core_fold.erl
index 0d020578f5..beab2ce897 100644
--- a/lib/compiler/src/sys_core_fold.erl
+++ b/lib/compiler/src/sys_core_fold.erl
@@ -70,7 +70,8 @@
 -export([module/2,format_error/1]).
 
 -import(lists, [map/2,foldl/3,foldr/3,mapfoldl/3,all/2,any/2,
-		reverse/1,reverse/2,member/2,nth/2,flatten/1,unzip/1]).
+		reverse/1,reverse/2,member/2,nth/2,flatten/1,
+		unzip/1,keyfind/3]).
 
 -import(cerl, [ann_c_cons/3,ann_c_map/3,ann_c_tuple/2]).
 
@@ -1624,12 +1625,11 @@ eval_case(Case, _) -> Case.
 
 eval_case_warn(#c_primop{anno=Anno,
 			 name=#c_literal{val=match_fail},
-			 args=[#c_literal{val=Reason}]}=Core)
-  when is_atom(Reason) ->
-    case member(eval_failure, Anno) of
+			 args=[_]}=Core) ->
+    case keyfind(eval_failure, 1, Anno) of
 	false ->
 	    ok;
-	true ->
+	{eval_failure,Reason} ->
 	    %% Example: M = not_map, M#{k:=v}
 	    add_warning(Core, {eval_failure,Reason})
     end;