diff options
| author | John Högberg <[email protected]> | 2018-10-16 10:34:03 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2018-10-16 10:34:03 +0200 |
| commit | 41ab6463e73011969498969834b4ee84024748b0 (patch) | |
| tree | 99dd22fc7a1ed513f617285ad846963989737555 /lib/compiler/src | |
| parent | 13baa4384c4c9c49e6d540bc8ae6b8946f2454ed (diff) | |
| parent | 59e5879164f0c11d2063e4eecb8a7052e2f4a04a (diff) | |
| download | otp-41ab6463e73011969498969834b4ee84024748b0.tar.gz otp-41ab6463e73011969498969834b4ee84024748b0.tar.bz2 otp-41ab6463e73011969498969834b4ee84024748b0.zip | |
Merge branch 'john/compiler/bs_match-anno-liveness-fix/OTP-15353/ERL-753' into maint
* john/compiler/bs_match-anno-liveness-fix/OTP-15353/ERL-753:
beam_utils: Handle bs_start_match2 in anno_defs
Diffstat (limited to 'lib/compiler/src')
| -rw-r--r-- | lib/compiler/src/beam_utils.erl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/compiler/src/beam_utils.erl b/lib/compiler/src/beam_utils.erl index 5580d2f123..6e23003fc7 100644 --- a/lib/compiler/src/beam_utils.erl +++ b/lib/compiler/src/beam_utils.erl @@ -1115,6 +1115,10 @@ defs([{bs_init,{f,L},_,Live,_,Dst}=I|Is], Regs0, D) -> end, Regs = def_regs([Dst], Regs1), [I|defs(Is, Regs, update_regs(L, Regs, D))]; +defs([{test,bs_start_match2,{f,L},Live,_,Dst}=I|Is], _Regs, D) -> + Regs0 = init_def_regs(Live), + Regs = def_regs([Dst], Regs0), + [I|defs(Is, Regs, update_regs(L, Regs0, D))]; defs([{bs_put,{f,L},_,_}=I|Is], Regs, D) -> [I|defs(Is, Regs, update_regs(L, Regs, D))]; defs([build_stacktrace=I|Is], _Regs, D) -> |