diff options
| author | Erlang/OTP <[email protected]> | 2017-08-23 10:39:20 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2017-08-23 10:39:20 +0200 |
| commit | 345a79ac188caa24229195991ed134e1e4df8179 (patch) | |
| tree | 977f36798dd0450fcd43bf3cce35c12fc77dac8b /lib/compiler/src/beam_validator.erl | |
| parent | 6ede2da826335960037299d9f3b0e66d072ea5a0 (diff) | |
| parent | 9beb6d48a12ae4e7abdacbed42b5269121f2fee7 (diff) | |
| download | otp-345a79ac188caa24229195991ed134e1e4df8179.tar.gz otp-345a79ac188caa24229195991ed134e1e4df8179.tar.bz2 otp-345a79ac188caa24229195991ed134e1e4df8179.zip | |
Merge branch 'john/compiler/fail-labels-in-blocks-otp-19/ERIERL-48/OTP-14522' into maint-20
* john/compiler/fail-labels-in-blocks-otp-19/ERIERL-48/OTP-14522:
compiler: Fix live regs update on allocate in validator
Take fail labels into account when determining liveness in block ops
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 |