fix: fix inlining synthetic accessors

Author: pubiqq

jadx-core/src/main/java/jadx/core/dex/nodes/InsnNode.java

@@ -30,6 +30,7 @@ public class InsnNode extends LineAttrNode {
 
 	private RegisterArg result;
 	private final List<InsnArg> arguments;
+	private final List<InsnArg> unmodifiableArgs;
 	protected int offset;
 
 	public InsnNode(InsnType type, int argsCount) {
@@ -39,6 +40,7 @@ public InsnNode(InsnType type, int argsCount) {
 	public InsnNode(InsnType type, List<InsnArg> args) {
 		this.insnType = type;
 		this.arguments = args;
+		this.unmodifiableArgs = Collections.unmodifiableList(arguments);
 		this.offset = -1;
 		for (InsnArg arg : args) {
 			attachArg(arg);
@@ -91,8 +93,8 @@ public RegisterArg getResult() {
 		return result;
 	}
 
-	public Iterable<InsnArg> getArguments() {
-		return arguments;
+	public List<InsnArg> getArguments() {
+		return unmodifiableArgs;
 	}
 
 	public int getArgsCount() {

jadx-core/src/main/java/jadx/core/dex/visitors/MarkMethodsForInline.java

@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import jadx.core.utils.ListUtils;
 import org.jetbrains.annotations.Nullable;
 
 import jadx.api.plugins.input.data.AccessFlags;
@@ -113,9 +114,13 @@ private static boolean isSyntheticAccessPattern(MethodNode mth, InsnNode firstIn
 						&& firstInsn.getArg(0).isSameVar(mthRegs.get(0));
 
 			case INVOKE:
-				return !mthRegs.isEmpty()
-						&& firstInsn.getArg(0).isSameVar(mthRegs.get(0))
-						&& retInsn.getArg(0).isSameVar(firstInsn.getResult());
+				if (!retInsn.getArg(0).isSameVar(firstInsn.getResult())) {
+					return false;
+				}
+
+				return ListUtils.orderedEquals(
+						mth.getArgRegs(), firstInsn.getArguments(),
+						(mthArg, insnArg) -> insnArg.isSameVar(mthArg));
 			default:
 				return false;
 		}

jadx-core/src/main/java/jadx/core/utils/ListUtils.java

@@ -4,14 +4,17 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.function.BiPredicate;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class ListUtils {
@@ -30,6 +33,34 @@ public static <T> boolean unorderedEquals(List<T> first, List<T> second) {
 		return first.containsAll(second);
 	}
 
+	public static <T, U> boolean orderedEquals(
+			@NotNull List<T> list1,
+			@NotNull List<U> list2,
+			@NotNull BiPredicate<T, U> comparer) {
+
+		if (list1 == list2) {
+			return true;
+		}
+
+		if (list1.size() != list2.size()) {
+			return false;
+		}
+
+		final Iterator<T> iter1 = list1.iterator();
+		final Iterator<U> iter2 = list2.iterator();
+
+		while (iter1.hasNext() && iter2.hasNext()) {
+			final T item1 = iter1.next();
+			final U item2 = iter2.next();
+
+			if (!comparer.test(item1, item2)) {
+				return false;
+			}
+		}
+
+		return !iter1.hasNext() && !iter2.hasNext();
+	}
+
 	public static <T, R> List<R> map(Collection<T> list, Function<T, R> mapFunc) {
 		if (list == null || list.isEmpty()) {
 			return Collections.emptyList();