Skip to content

Commit

Permalink
Revert synthetic checks
Browse files Browse the repository at this point in the history
Fixes #2
  • Loading branch information
Matyrobbrt committed Jun 23, 2024
1 parent d40d440 commit ef8d008
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import net.neoforged.jarcompatibilitychecker.data.MemberInfo;
import net.neoforged.jarcompatibilitychecker.data.MethodInfo;
import net.neoforged.jarcompatibilitychecker.sort.TopologicalSort;
import net.neoforged.jarcompatibilitychecker.util.AccessHelpers;
import org.jetbrains.annotations.Nullable;
import org.objectweb.asm.Opcodes;

Expand Down Expand Up @@ -116,9 +115,6 @@ public static ClassInfoComparisonResults compare(boolean checkBinary, @Nullable
Set<MethodInfo> seenMethods = new HashSet<>();

for (MethodInfo baseInfo : baseClassInfo.getMethods().values()) {
// base synthetic -> ignore changes
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);
boolean methodInternal = classInternal || isInternalApi(baseInfo, internalAnnotations, internalAnnotationCheckMode, packageInfo);
Expand All @@ -128,8 +124,7 @@ public static ClassInfoComparisonResults compare(boolean checkBinary, @Nullable
boolean isMethodError = !methodInternal || internalAnnotationCheckMode == InternalAnnotationCheckMode.ERROR;
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) && !AccessHelpers.isBridge(inputInfo))) {
if (inputInfo == null) {
if (checkBinary) {
results.addMethodIncompatibility(baseInfo, IncompatibilityMessages.METHOD_REMOVED, isMethodError);
} else if (methodVisible) {
Expand Down
3 changes: 0 additions & 3 deletions tests/base/src/main/java/com/example/test/TestClassA.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@

public class TestClassA {
public String field;
public Runnable lambdaThing = () -> {
System.out.println("Hi!");
};
public void publicMethodA(String p1) {

}
Expand Down
1 change: 0 additions & 1 deletion tests/top/src/main/java/com/example/test/TestClassA.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

abstract class TestClassA {
public final String field = "a";
public Runnable lambdaThing;
private void publicMethodA(String p1) {

}
Expand Down

0 comments on commit ef8d008

Please sign in to comment.