Ignore only synthetic non-bridge methods

neoforged · Apr 20, 2024 · df7205b · df7205b
1 parent ba39ea9
commit df7205b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/net/neoforged/jarcompatibilitychecker/core/ClassInfoComparer.java b/src/main/java/net/neoforged/jarcompatibilitychecker/core/ClassInfoComparer.java
@@ -113,7 +113,7 @@ public static ClassInfoComparisonResults compare(boolean checkBinary, @Nullable
 
         for (MethodInfo baseInfo : baseClassInfo.getMethods().values()) {
             // base synthetic -> ignore changes
-            if (AccessHelpers.isSynthetic(baseInfo)) continue;
+            if (AccessHelpers.isSynthetic(baseInfo) && !AccessHelpers.isBridge(baseInfo)) continue;
 
             boolean isStatic = (baseInfo.access & Opcodes.ACC_STATIC) != 0;
             MethodInfo inputInfo = getMethodInfo(concreteClassInfo, concreteParents, isStatic, baseInfo.name, baseInfo.desc);
@@ -125,7 +125,7 @@ public static ClassInfoComparisonResults compare(boolean checkBinary, @Nullable
             boolean methodVisible = isVisible(checkBinary, baseInfo.access);
 
             // base non-synthetic -> synthetic should be considered an error as synthetic methods aren't stable
-            if (inputInfo == null || AccessHelpers.isSynthetic(inputInfo)) {
+            if (inputInfo == null || (AccessHelpers.isSynthetic(inputInfo) && !AccessHelpers.isBridge(inputInfo))) {
                 if (checkBinary) {
                     results.addMethodIncompatibility(baseInfo, IncompatibilityMessages.METHOD_REMOVED, isMethodError);
                 } else if (methodVisible) {

diff --git a/src/main/java/net/neoforged/jarcompatibilitychecker/util/AccessHelpers.java b/src/main/java/net/neoforged/jarcompatibilitychecker/util/AccessHelpers.java
@@ -11,4 +11,8 @@ public static boolean isSynthetic(int access) {
     public static boolean isSynthetic(MemberInfo info) {
         return isSynthetic(info.getAccess());
     }
+
+    public static boolean isBridge(MemberInfo info) {
+        return ((info.getAccess() & Opcodes.ACC_BRIDGE)) != 0;
+    }
 }