diff options
| author | Björn Gustavsson <[email protected]> | 2016-05-16 08:15:51 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-05-16 08:15:51 +0200 |
| commit | 85f0a672d1dc607bc039e7c83a9114f8395fe239 (patch) | |
| tree | ac5c9a3f509d2c35e1f17ac39457addfb53a4c37 /lib/compiler/src | |
| parent | 1421ffc24fc57c83c2edd886fe9e088ddc701056 (diff) | |
| parent | 7f4f4ef02349b4bf973cbc3bacc4d53a6a6abad2 (diff) | |
| download | otp-85f0a672d1dc607bc039e7c83a9114f8395fe239.tar.gz otp-85f0a672d1dc607bc039e7c83a9114f8395fe239.tar.bz2 otp-85f0a672d1dc607bc039e7c83a9114f8395fe239.zip | |
Merge branch 'bjorn/compiler/beam_bool/ERL-143'
* bjorn/compiler/beam_bool/ERL-143:
Eliminate crash in beam_bool
Add beam_bool_SUITE
Add missing test cases in andor_SUITE and beam_block_SUITE
Diffstat (limited to 'lib/compiler/src')
| -rw-r--r-- | lib/compiler/src/beam_bool.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/compiler/src/beam_bool.erl b/lib/compiler/src/beam_bool.erl index f9a08f8718..359fdb6d3c 100644 --- a/lib/compiler/src/beam_bool.erl +++ b/lib/compiler/src/beam_bool.erl @@ -238,9 +238,9 @@ extend_block(BlAcc0, Fail, [{block,Is0}|OldAcc]) -> end; extend_block(BlAcc, _, OldAcc) -> {BlAcc,OldAcc}. -extend_block_1([{set,[_],_,{bif,_,{f,Fail}}}=I|Is], Fail, Acc) -> +extend_block_1([{set,[{x,_}],_,{bif,_,{f,Fail}}}=I|Is], Fail, Acc) -> extend_block_1(Is, Fail, [I|Acc]); -extend_block_1([{set,[_],As,{bif,Bif,_}}=I|Is]=Is0, Fail, Acc) -> +extend_block_1([{set,[{x,_}],As,{bif,Bif,_}}=I|Is]=Is0, Fail, Acc) -> case safe_bool_op(Bif, length(As)) of false -> {Acc,reverse(Is0)}; true -> extend_block_1(Is, Fail, [I|Acc]) |