diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-05-22 10:15:48 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-05-22 10:15:48 +0200 |
| commit | 44968437b3a3a7551d6ebcb66c0a2ba899538096 (patch) | |
| tree | 3fde9a8c266a40b94e41f0ff55d669f6b774e392 /lib/compiler/src | |
| parent | 600bb902552f7c6ceec64e7731a5b4f2d473c752 (diff) | |
| parent | aec9df2cde184950340888826d84663aec72b5c7 (diff) | |
| download | otp-44968437b3a3a7551d6ebcb66c0a2ba899538096.tar.gz otp-44968437b3a3a7551d6ebcb66c0a2ba899538096.tar.bz2 otp-44968437b3a3a7551d6ebcb66c0a2ba899538096.zip | |
Merge branch 'egil/fix-compiler-beam_bsm/OTP-12758'
* egil/fix-compiler-beam_bsm/OTP-12758:
compiler: Add tests for beam_bsm get_map_elements
compiler: Teach beam_bsm get_map_elements instruction
Diffstat (limited to 'lib/compiler/src')
| -rw-r--r-- | lib/compiler/src/beam_bsm.erl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/compiler/src/beam_bsm.erl b/lib/compiler/src/beam_bsm.erl index 2a15c1ddf3..ee3e88959d 100644 --- a/lib/compiler/src/beam_bsm.erl +++ b/lib/compiler/src/beam_bsm.erl @@ -242,6 +242,12 @@ btb_reaches_match_2([{bif,_,{f,F},Ss,Dst}=I|Is], Regs0, D0) -> Regs = btb_kill([Dst], Regs0), D = btb_follow_branch(F, Regs, D0), btb_reaches_match_1(Is, Regs, D); +btb_reaches_match_2([{get_map_elements,{f,F},Src,{list,Ls}}=I|Is], Regs0, D0) -> + {Ss,Ds} = beam_utils:split_even(Ls), + btb_ensure_not_used([Src|Ss], I, Regs0), + Regs = btb_kill(Ds, Regs0), + D = btb_follow_branch(F, Regs, D0), + btb_reaches_match_1(Is, Regs, D); btb_reaches_match_2([{test,bs_start_match2,{f,F},Live,[Ctx,_],Ctx}=I|Is], Regs0, D0) -> CtxRegs = btb_context_regs(Regs0), |