diff options
| author | Erlang/OTP <[email protected]> | 2017-10-05 16:58:13 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2017-10-05 16:58:13 +0200 |
| commit | 74c9c2159b234317e5857de4f39318b50aa2d628 (patch) | |
| tree | e5bbd3fdac8556f108d0538aba1ada54caa18996 /lib/compiler/src/beam_validator.erl | |
| parent | 0c0d7899f869eae275a9dd2677791f34bbd25bfe (diff) | |
| parent | 9beb6d48a12ae4e7abdacbed42b5269121f2fee7 (diff) | |
| download | otp-74c9c2159b234317e5857de4f39318b50aa2d628.tar.gz otp-74c9c2159b234317e5857de4f39318b50aa2d628.tar.bz2 otp-74c9c2159b234317e5857de4f39318b50aa2d628.zip | |
Merge branch 'john/compiler/fail-labels-in-blocks-otp-19/ERIERL-48/OTP-14522' into maint-19
* 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 16dba35adc..69e34f76b0 100644 --- a/lib/compiler/src/beam_validator.erl +++ b/lib/compiler/src/beam_validator.erl @@ -921,9 +921,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 |