core: fix loop handling

jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition5.java

@@ -0,0 +1,45 @@
+package jadx.tests.integration.loops;
+
+import org.junit.Test;
+
+import jadx.core.dex.nodes.ClassNode;
+import jadx.tests.api.SmaliTest;
+
+import static jadx.tests.api.utils.JadxMatchers.containsOne;
+import static jadx.tests.api.utils.JadxMatchers.countString;
+import static org.hamcrest.Matchers.anyOf;
+import static org.junit.Assert.assertThat;
+
+public class TestLoopCondition5 extends SmaliTest {
+
+	public static class TestCls {
+		private static int lastIndexOf(int[] array, int target, int start, int end) {
+			for (int i = end - 1; i >= start; i--) {
+				if (array[i] == target) {
+					return i;
+				}
+			}
+			return -1;
+		}
+	}
+
+	@Test
+	public void test0() {
+		ClassNode cls = getClassNode(TestCls.class);
+		String code = cls.getCode().toString();
+
+		assertThat(code, containsOne("for ("));
+		assertThat(code, containsOne("return -1;"));
+		assertThat(code, countString(2, "return "));
+	}
+
+	@Test
+	public void test1() {
+		ClassNode cls = getClassNodeFromSmaliWithPath("loops", "TestLoopCondition5");
+		String code = cls.getCode().toString();
+
+		assertThat(code, anyOf(containsOne("for ("), containsOne("while (true) {")));
+		assertThat(code, containsOne("return -1;"));
+		assertThat(code, countString(2, "return "));
+	}
+}

jadx-core/src/test/smali/loops/TestLoopCondition5.smali

@@ -0,0 +1,31 @@
+.class public LTestLoopCondition5;
+.super Ljava/lang/Object;
+.source "TestLoopCondition5.java"
+
+.method private static lastIndexOf([IIII)I
+    .locals 1
+
+    add-int/lit8 p3, p3, -0x1
+
+    :goto_0
+    const/4 v0, -0x1
+
+    if-lt p3, p2, :cond_1
+
+    .line 219
+    aget v0, p0, p3
+
+    if-ne v0, p1, :cond_0
+
+    return p3
+
+    :cond_0
+    add-int/lit8 p3, p3, -0x1
+
+    goto :goto_0
+
+    :cond_1
+    move p3, v0
+
+    return p3
+.end method