From e14a3f17e6d8d6ced42026b3c49e1f6d179e983d Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Wed, 5 Aug 2020 21:15:33 +0000
Subject: [PATCH]   * reverted r46220 as it is fixed now properly

git-svn-id: trunk@46276 -
---
 .gitattributes          | 1 +
 compiler/nadd.pas       | 4 ++--
 tests/webtbs/tw37493.pp | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 tests/webtbs/tw37493.pp

diff --git a/.gitattributes b/.gitattributes
index 8af203a076..a3b0d4b48c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -18407,6 +18407,7 @@ tests/webtbs/tw3742.pp svneol=native#text/plain
 tests/webtbs/tw37427.pp svneol=native#text/pascal
 tests/webtbs/tw37449.pp svneol=native#text/pascal
 tests/webtbs/tw37468.pp svneol=native#text/pascal
+tests/webtbs/tw37493.pp svneol=native#text/pascal
 tests/webtbs/tw3751.pp svneol=native#text/plain
 tests/webtbs/tw3758.pp svneol=native#text/plain
 tests/webtbs/tw3764.pp svneol=native#text/plain
diff --git a/compiler/nadd.pas b/compiler/nadd.pas
index 000eb90c36..494121afb9 100644
--- a/compiler/nadd.pas
+++ b/compiler/nadd.pas
@@ -1440,10 +1440,10 @@ implementation
                     case nodetype of
                       andn,orn:
                         begin
-                          { full boolean evaluation is only useful if the nodes are not too complex and if no flags/jumps must be converted,
+                          { full boolean evaluation is only useful if the nodes are not too complex and if no jumps must be converted,
                             further, we need to know the expectloc }
                           if (node_complexity(right)<=2) and
-                            not(left.expectloc in [LOC_FLAGS,LOC_JUMP,LOC_INVALID]) and not(right.expectloc in [LOC_FLAGS,LOC_JUMP,LOC_INVALID]) then
+                            not(left.expectloc in [LOC_JUMP,LOC_INVALID]) and not(right.expectloc in [LOC_JUMP,LOC_INVALID]) then
                             begin
                               { we need to copy the whole tree to force another pass_1 }
                               include(localswitches,cs_full_boolean_eval);
diff --git a/tests/webtbs/tw37493.pp b/tests/webtbs/tw37493.pp
new file mode 100644
index 0000000000..03248726ba
--- /dev/null
+++ b/tests/webtbs/tw37493.pp
@@ -0,0 +1,5 @@
+{ %OPT=-O3 }
+var a : integer;
+begin
+    write(not((1 in[a]) and (a > a) and (a in[1])))
+end.