Report JVM signature clashes from JVM_IR
Also: * Do not rename public ABI fields This includes backing fields for const, lateinit, @JvmField properties, and instance fields for objects. * FAKE_OVERRIDE declarations for static members of parent Java classes Required to report cases when a Kotlin function accidentally overrides Java class member.
This commit is contained in:
+2
-2
@@ -22,6 +22,7 @@ import org.jetbrains.org.objectweb.asm.Type;
|
||||
import org.jetbrains.org.objectweb.asm.commons.Method;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
public class JvmMethodGenericSignature extends JvmMethodSignature {
|
||||
private final String genericsSignature;
|
||||
@@ -47,8 +48,7 @@ public class JvmMethodGenericSignature extends JvmMethodSignature {
|
||||
|
||||
JvmMethodGenericSignature that = (JvmMethodGenericSignature) o;
|
||||
|
||||
return super.equals(that) &&
|
||||
(genericsSignature == null ? that.genericsSignature == null : genericsSignature.equals(that.genericsSignature));
|
||||
return super.equals(that) && Objects.equals(genericsSignature, that.genericsSignature);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user