From 098d64b63110363de08ac4516dfa830a57dfe65f Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Sat, 28 Jan 2017 14:33:39 +0000
Subject: [PATCH]   * don't swap and/or boolean operations, they always need to
 be evaluated in     the regular order (caused internalerror 200709253 while
 compiling     tests/test/jvm/trange3, not sure why it wasn't a problem
 before)

git-svn-id: trunk@35349 -
---
 compiler/jvm/njvmadd.pas | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/compiler/jvm/njvmadd.pas b/compiler/jvm/njvmadd.pas
index dbc466d045..c9508a20cf 100644
--- a/compiler/jvm/njvmadd.pas
+++ b/compiler/jvm/njvmadd.pas
@@ -372,7 +372,9 @@ interface
 
     procedure tjvmaddnode.pass_left_right;
       begin
-        swapleftright;
+        if not((nodetype in [orn,andn]) and
+               is_boolean(left.resultdef)) then
+          swapleftright;
         inherited pass_left_right;
       end;