aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/src/beam_bool.erl
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2013-08-19 16:00:03 +0200
committerBjörn Gustavsson <[email protected]>2013-08-19 16:00:03 +0200
commit627f658bb7a53cdbfe862ca3aa5d66259bbaead7 (patch)
tree8e48cfeb7368871c82b8a93ea3baa20e903ca7e2 /lib/compiler/src/beam_bool.erl
parentb3068b837fc5d82a0cf49d57b20d3b6d4ef8ea2d (diff)
parent81ac8ee8eba862d4e8a12f88f15e2ee526d74dbd (diff)
downloadotp-627f658bb7a53cdbfe862ca3aa5d66259bbaead7.tar.gz
otp-627f658bb7a53cdbfe862ca3aa5d66259bbaead7.tar.bz2
otp-627f658bb7a53cdbfe862ca3aa5d66259bbaead7.zip
Merge branch 'maint'
* maint: Fix compiler crash for 'B and B' guard
Diffstat (limited to 'lib/compiler/src/beam_bool.erl')
-rw-r--r--lib/compiler/src/beam_bool.erl3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/compiler/src/beam_bool.erl b/lib/compiler/src/beam_bool.erl
index cf5455dfde..124abd13c1 100644
--- a/lib/compiler/src/beam_bool.erl
+++ b/lib/compiler/src/beam_bool.erl
@@ -425,6 +425,9 @@ bopt_tree([], Forest, Pre) ->
safe_bool_op(N, Ar) ->
erl_internal:new_type_test(N, Ar) orelse erl_internal:comp_op(N, Ar).
+bopt_bool_args([V0,V0], Forest0) ->
+ {V,Forest} = bopt_bool_arg(V0, Forest0),
+ {[V,V],Forest};
bopt_bool_args(As, Forest) ->
mapfoldl(fun bopt_bool_arg/2, Forest, As).