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/beam_disasm.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/beam_disasm.erl')
-rw-r--r-- | lib/compiler/src/beam_disasm.erl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/compiler/src/beam_disasm.erl b/lib/compiler/src/beam_disasm.erl index c699672db1..8fd0b36d05 100644 --- a/lib/compiler/src/beam_disasm.erl +++ b/lib/compiler/src/beam_disasm.erl @@ -815,6 +815,9 @@ resolve_inst({is_tuple=I,Args0},_,_,_) -> resolve_inst({test_arity=I,Args0},_,_,_) -> [L|Args] = resolve_args(Args0), {test,I,L,Args}; +resolve_inst({is_tagged_tuple=I,Args0},_,_,_) -> + [F|Args] = resolve_args(Args0), + {test,I,F,Args}; resolve_inst({select_val,Args},_,_,_) -> [Reg,FLbl,{{z,1},{u,_Len},List0}] = Args, List = resolve_args(List0), |