aboutsummaryrefslogtreecommitdiffstats
path: root/lib/hipe/rtl/hipe_icode2rtl.erl
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2014-03-31 10:37:01 +0200
committerBjörn-Egil Dahlberg <[email protected]>2014-03-31 10:37:01 +0200
commit07eee76fa86019a922784099403ad3d9f0d958eb (patch)
tree48d973bd36b4825ab9f4c7c9e3178d85483953d8 /lib/hipe/rtl/hipe_icode2rtl.erl
parent8dfd01213a764ca23b1bcadf367429113030805e (diff)
parent918f0a26da2ad559bb674e19fce952c2564b9b45 (diff)
downloadotp-07eee76fa86019a922784099403ad3d9f0d958eb.tar.gz
otp-07eee76fa86019a922784099403ad3d9f0d958eb.tar.bz2
otp-07eee76fa86019a922784099403ad3d9f0d958eb.zip
Merge branch 'ks/hipe-is_map-support/OTP-11831'
* ks/hipe-is_map-support/OTP-11831: Reinstate native code compilation of cerl and erl_types Take out no_native compiler attribute Add support for the compilation of the is_map/1 guard to native code Add 'map' to the set of icode_type_test()s Support the translation of the is_map BEAM instruction to Icode
Diffstat (limited to 'lib/hipe/rtl/hipe_icode2rtl.erl')
-rw-r--r--lib/hipe/rtl/hipe_icode2rtl.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/hipe/rtl/hipe_icode2rtl.erl b/lib/hipe/rtl/hipe_icode2rtl.erl
index 6ab40adcc8..483d0b37f7 100644
--- a/lib/hipe/rtl/hipe_icode2rtl.erl
+++ b/lib/hipe/rtl/hipe_icode2rtl.erl
@@ -437,6 +437,8 @@ gen_type_test([X], Type, TrueLbl, FalseLbl, Pred, ConstTab) ->
{hipe_tagscheme:test_integer(X, TrueLbl, FalseLbl, Pred), ConstTab};
list ->
{hipe_tagscheme:test_list(X, TrueLbl, FalseLbl, Pred), ConstTab};
+ map ->
+ {hipe_tagscheme:test_map(X, TrueLbl, FalseLbl, Pred), ConstTab};
nil ->
{hipe_tagscheme:test_nil(X, TrueLbl, FalseLbl, Pred), ConstTab};
number ->