From e16fb8ef1db5efd75045839ec6d71a31a50fa919 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Tue, 13 Apr 2021 14:04:59 +0700
Subject: [PATCH] Avoid assignment used as condition

GitOrigin-RevId: 6eb52135a5bfdf772bb10d3120648500a95325a4
---
 .../modules/decompiler/IfHelper.java          | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
index afcf55e..66e857c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
@@ -31,7 +31,8 @@ public final class IfHelper {
           res |= mergeAllIfsRec(st, setReorderedIfs);
 
           // collapse composed if's
-          if (changed = mergeIfs(st, setReorderedIfs)) {
+          if (mergeIfs(st, setReorderedIfs)) {
+            changed = true;
             break;
           }
         }
@@ -75,21 +76,25 @@ public final class IfHelper {
             continue;
           }
 
-          if (updated = collapseIfIf(rtnode)) {
+          if (collapseIfIf(rtnode)) {
+            updated = true;
             break;
           }
 
           if (!setReorderedIfs.contains(stat.id)) {
-            if (updated = collapseIfElse(rtnode)) {
+            if (collapseIfElse(rtnode)) {
+              updated = true;
               break;
             }
 
-            if (updated = collapseElse(rtnode)) {
+            if (collapseElse(rtnode)) {
+              updated = true;
               break;
             }
           }
 
-          if (updated = reorderIf((IfStatement)stat)) {
+          if (reorderIf((IfStatement)stat)) {
+            updated = true;
             setReorderedIfs.add(stat.id);
             break;
           }
@@ -440,10 +445,9 @@ public final class IfHelper {
         if (sttemp == ifstat) {
           break;
         }
-        else {
-          if (elsedirectpath = existsPath(sttemp, next)) {
-            break;
-          }
+        else if (existsPath(sttemp, next)) {
+          elsedirectpath = true;
+          break;
         }
       }
     }