From fda8d697b12cc4e7daf6d0131dc35b2b48bceb9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
 <grubba@grubba.org>
Date: Sun, 15 May 2016 16:20:20 +0200
Subject: [PATCH] Optimizer: Fixed special case whenn optimizing logical and.

---
 src/treeopt.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/treeopt.in b/src/treeopt.in
index 3e88599357..71bae72c1f 100644
--- a/src/treeopt.in
+++ b/src/treeopt.in
@@ -858,7 +858,7 @@ F_LAND(0 = F_ASSIGN(*, +[node_is_true($$)]), 2):
 F_LAND(0 = F_ASSIGN(*, +[node_is_false($$)]), *):
   $0;
 
-F_LAND(F_COMMA_EXPR(0, 1), 2):
+F_LAND(F_COMMA_EXPR(0, 1[$$->token != F_POP_VALUE]), 2):
   F_COMMA_EXPR($0, F_LAND($1, $2));
 
 F_LAND(+[node_is_true($$)], 0):
-- 
GitLab