diff options
| author | Lukas Larsson <[email protected]> | 2017-08-22 16:28:15 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-08-22 16:28:15 +0200 |
| commit | eb4ef92b083f9874b5b4db1f1060585fbb653779 (patch) | |
| tree | 0093503d7c8755a4481defbf091d68210f01f9c2 /lib/compiler/src/beam_validator.erl | |
| parent | 4cc6df95844a299aac361f5e57a850508b07fa59 (diff) | |
| parent | c803276c92bce2ed739f87f353108daff21c0d91 (diff) | |
| download | otp-eb4ef92b083f9874b5b4db1f1060585fbb653779.tar.gz otp-eb4ef92b083f9874b5b4db1f1060585fbb653779.tar.bz2 otp-eb4ef92b083f9874b5b4db1f1060585fbb653779.zip | |
Merge branch 'john/compiler/fail-labels-in-blocks-otp-18/ERIERL-48/OTP-14522' into maint
* john/compiler/fail-labels-in-blocks-otp-18/ERIERL-48/OTP-14522:
compiler: Fix live regs update on allocate in validator
Take fail labels into account when determining liveness in block ops
Conflicts:
lib/compiler/src/beam_utils.erl
Diffstat (limited to 'lib/compiler/src/beam_validator.erl')
| -rw-r--r-- | lib/compiler/src/beam_validator.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl index f726625510..622e00bb2b 100644 --- a/lib/compiler/src/beam_validator.erl +++ b/lib/compiler/src/beam_validator.erl @@ -928,9 +928,9 @@ verify_call_match_context(Lbl, Ctx, #vst{ft=Ft}) -> error({unsuitable_bs_start_match2,I}) end. -allocate(Zero, Stk, Heap, Live, #vst{current=#st{numy=none}=St}=Vst0) -> +allocate(Zero, Stk, Heap, Live, #vst{current=#st{numy=none}}=Vst0) -> verify_live(Live, Vst0), - Vst = prune_x_regs(Live, Vst0), + Vst = #vst{current=St} = prune_x_regs(Live, Vst0), Ys = init_regs(Stk, case Zero of true -> initialized; false -> uninitialized |