aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/src
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-01-14 13:10:00 +0100
committerBjörn-Egil Dahlberg <[email protected]>2016-01-14 14:54:37 +0100
commit48e25dfef23a51d02629b2c9fa9963fd3ba7788c (patch)
treed663a1c951cf6f07f33e852572067978d19899c4 /lib/compiler/src
parente593432c9e590c29971a4e0dc1c6692d82c2a1d6 (diff)
downloadotp-48e25dfef23a51d02629b2c9fa9963fd3ba7788c.tar.gz
otp-48e25dfef23a51d02629b2c9fa9963fd3ba7788c.tar.bz2
otp-48e25dfef23a51d02629b2c9fa9963fd3ba7788c.zip
compiler, hipe: Fix pretty printing of Core Maps
Literal maps could cause dialyzer to crash when pretty printing the results. Reported-by: Chris McGrath <[email protected]>
Diffstat (limited to 'lib/compiler/src')
-rw-r--r--lib/compiler/src/cerl.erl11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/compiler/src/cerl.erl b/lib/compiler/src/cerl.erl
index 010327b5e3..e7a2b8177a 100644
--- a/lib/compiler/src/cerl.erl
+++ b/lib/compiler/src/cerl.erl
@@ -1598,13 +1598,20 @@ is_c_map(#c_literal{val = V}) when is_map(V) ->
is_c_map(_) ->
false.
--spec map_es(c_map()) -> [c_map_pair()].
+-spec map_es(c_map() | c_literal()) -> [c_map_pair()].
+map_es(#c_literal{anno=As,val=M}) when is_map(M) ->
+ [ann_c_map_pair(As,
+ #c_literal{anno=As,val='assoc'},
+ #c_literal{anno=As,val=K},
+ #c_literal{anno=As,val=V}) || {K,V} <- maps:to_list(M)];
map_es(#c_map{es = Es}) ->
Es.
--spec map_arg(c_map()) -> c_map() | c_literal().
+-spec map_arg(c_map() | c_literal()) -> c_map() | c_literal().
+map_arg(#c_literal{anno=As,val=M}) when is_map(M) ->
+ #c_literal{anno=As,val=#{}};
map_arg(#c_map{arg=M}) ->
M.