diff options
author | Björn-Egil Dahlberg <[email protected]> | 2017-03-24 10:54:53 +0100 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2017-03-24 10:54:53 +0100 |
commit | 513a14e3f8225aa35ced7c0a1753d287bae1b707 (patch) | |
tree | 8404345447bc0a9bb7e033e3a1e4aa167b8a86e6 /lib/compiler/src/compile.erl | |
parent | 84be7e0ec7c0c64f1beb418cdd09879822aca4b0 (diff) | |
parent | 63289176d5555903b72776dd96b38b3a13a257ab (diff) | |
download | otp-513a14e3f8225aa35ced7c0a1753d287bae1b707.tar.gz otp-513a14e3f8225aa35ced7c0a1753d287bae1b707.tar.bz2 otp-513a14e3f8225aa35ced7c0a1753d287bae1b707.zip |
Merge branch 'egil/compiler/is_tagged_tuple/OTP-12148'
* egil/compiler/is_tagged_tuple/OTP-12148:
Update primary bootstrap
compiler: Cover beam_record in tests
hipe: Transform is_tagged_tuple instruction
compiler: Add is_tagged_tuple instruction
Diffstat (limited to 'lib/compiler/src/compile.erl')
-rw-r--r-- | lib/compiler/src/compile.erl | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl index c849306c0d..03b52932d1 100644 --- a/lib/compiler/src/compile.erl +++ b/lib/compiler/src/compile.erl @@ -216,19 +216,19 @@ expand_opt(return, Os) -> expand_opt(r12, Os) -> [no_recv_opt,no_line_info,no_utf8_atoms|Os]; expand_opt(r13, Os) -> - [no_recv_opt,no_line_info,no_utf8_atoms|Os]; + [no_record_opt,no_recv_opt,no_line_info,no_utf8_atoms|Os]; expand_opt(r14, Os) -> - [no_line_info,no_utf8_atoms|Os]; + [no_record_opt,no_line_info,no_utf8_atoms|Os]; expand_opt(r15, Os) -> - [no_utf8_atoms|Os]; + [no_record_opt,no_utf8_atoms|Os]; expand_opt(r16, Os) -> - [no_utf8_atoms|Os]; + [no_record_opt,no_utf8_atoms|Os]; expand_opt(r17, Os) -> - [no_utf8_atoms|Os]; + [no_record_opt,no_utf8_atoms|Os]; expand_opt(r18, Os) -> - [no_utf8_atoms|Os]; + [no_record_opt,no_utf8_atoms|Os]; expand_opt(r19, Os) -> - [no_utf8_atoms|Os]; + [no_record_opt,no_utf8_atoms|Os]; expand_opt({debug_info_key,_}=O, Os) -> [encrypt_debug_info,O|Os]; expand_opt(no_float_opt, Os) -> @@ -755,6 +755,8 @@ asm_passes() -> {iff,dbsm,{listing,"bsm"}}, {unless,no_recv_opt,{pass,beam_receive}}, {iff,drecv,{listing,"recv"}}, + {unless,no_record_opt,{pass,beam_record}}, + {iff,drecord,{listing,"record"}}, {unless,no_stack_trimming,{pass,beam_trim}}, {iff,dtrim,{listing,"trim"}}, {pass,beam_flatten}]}, @@ -1849,6 +1851,7 @@ pre_load() -> beam_opcodes, beam_peep, beam_receive, + beam_record, beam_reorder, beam_split, beam_trim, |