diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-03-31 10:37:01 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-03-31 10:37:01 +0200 |
| commit | 07eee76fa86019a922784099403ad3d9f0d958eb (patch) | |
| tree | 48d973bd36b4825ab9f4c7c9e3178d85483953d8 /lib/compiler/src/cerl.erl | |
| parent | 8dfd01213a764ca23b1bcadf367429113030805e (diff) | |
| parent | 918f0a26da2ad559bb674e19fce952c2564b9b45 (diff) | |
| download | otp-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/compiler/src/cerl.erl')
| -rw-r--r-- | lib/compiler/src/cerl.erl | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/compiler/src/cerl.erl b/lib/compiler/src/cerl.erl index e400e4f185..ed11c8de4d 100644 --- a/lib/compiler/src/cerl.erl +++ b/lib/compiler/src/cerl.erl @@ -136,10 +136,6 @@ c_literal/0, c_map_pair/0, c_module/0, c_tuple/0, c_values/0, c_var/0, cerl/0, var_name/0]). -%% HiPE does not understand Maps -%% (guard functions is_map/1 and map_size/1 in ann_c_map/3) --compile(no_native). - -include("core_parse.hrl"). -type c_alias() :: #c_alias{}. |