Use descriptors for building SAM constructors

It helps to get rid of semantics duplicating and fixes known bugs

- SOE in OnlyAbstractMethodFinder.find
- type enhancement for SAM constructors

 #KT-11287 Fixed
 #KT-11322 Fixed
 EA-77989 Fixed
This commit is contained in:
Denis Zharkov
2016-03-07 17:49:03 +03:00
parent b8b48c5f98
commit 151e55b2fa
22 changed files with 234 additions and 258 deletions
@@ -0,0 +1,28 @@
// FILE: A.java
public interface A extends A {
int getFoo();
}
// FILE: B.java
public class B {
interface B1 extends B2 {
int getFoo();
}
interface B2 extends B3 {
int getFoo();
}
interface B3 extends B2 {
int getFoo();
}
}
// FILE: main.kt
fun foo() {
object : A { override fun getFoo() = 1 }
object : B.B1 { override fun getFoo() = 1 }
object : B.B2 { override fun getFoo() = 1 }
object : B.B3 { override fun getFoo() = 1 }
}
@@ -0,0 +1,32 @@
package
public /*synthesized*/ fun A(/*0*/ function: () -> kotlin.Int): A
public fun foo(): kotlin.Unit
public interface A {
public abstract fun getFoo(): kotlin.Int
}
public open class B {
public constructor B()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public/*package*/ interface B1 : B.B2 {
public abstract override /*1*/ fun getFoo(): kotlin.Int
}
public/*package*/ interface B2 {
public abstract fun getFoo(): kotlin.Int
}
public/*package*/ interface B3 {
public abstract fun getFoo(): kotlin.Int
}
// Static members
public/*package*/ final /*synthesized*/ fun B1(/*0*/ function: () -> kotlin.Int): B.B1
public/*package*/ final /*synthesized*/ fun B2(/*0*/ function: () -> kotlin.Int): B.B2
public/*package*/ final /*synthesized*/ fun B3(/*0*/ function: () -> kotlin.Int): B.B3
}
@@ -0,0 +1,24 @@
// FILE: A.java
public interface A extends A.B {
interface B extends A { public int getFoo() { return 1; } }
}
// FILE: A0.java
public interface A0 extends A0.B {
interface B { public int getFoo() { return 1; } }
}
// FILE: B.java
public class B extends D {
public int getFoo() { return 1; }
public static class C {
public int getFoo() { return 1; }
}
}
// FILE: D.java
public class D extends B.C {
public int getFoo() { return 1; }
}
@@ -0,0 +1,42 @@
package
public interface A {
public interface B {
public abstract fun getFoo(): kotlin.Int
}
// Static members
public final /*synthesized*/ fun B(/*0*/ function: () -> kotlin.Int): A.B
}
public interface A0 {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun getFoo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
// Static members
public final /*synthesized*/ fun B(/*0*/ function: () -> kotlin.Int): A0.B
}
public open class B {
public constructor B()
public open fun getFoo(): kotlin.Int
public open class C {
public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getFoo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
public open class D {
public constructor D()
public open fun getFoo(): kotlin.Int
}
@@ -1,5 +1,8 @@
package
public/*package*/ /*synthesized*/ fun A(/*0*/ function: () -> kotlin.Unit): A
public/*package*/ /*synthesized*/ fun C(/*0*/ function: () -> kotlin.Unit): C
public/*package*/ interface A {
public abstract fun foo(): kotlin.Unit
}
@@ -0,0 +1,27 @@
// FILE: J.java
import org.jetbrains.annotations.*;
public interface J {
@NotNull
String foo(@Nullable String x);
}
// FILE: J2.java
import org.jetbrains.annotations.Nullable;
public interface J2 extends J {
String foo(String x);
}
// FILE: main.kt
fun main() {
J { <!EXPECTED_PARAMETER_TYPE_MISMATCH!>s: String<!> -> s} // should be prohibited, because SAM value parameter has nullable type
J { "" + it<!UNSAFE_CALL!>.<!>length }
J { <!NULL_FOR_NONNULL_TYPE!>null<!> }
J { <!TYPE_MISMATCH!>it?.length?.toString()<!> }
J2 { <!EXPECTED_PARAMETER_TYPE_MISMATCH!>s: String<!> -> s}
J2 { "" + it<!UNSAFE_CALL!>.<!>length }
J2 { <!NULL_FOR_NONNULL_TYPE!>null<!> }
J2 { <!TYPE_MISMATCH!>it?.length?.toString()<!> }
}
@@ -0,0 +1,19 @@
package
public /*synthesized*/ fun J(/*0*/ function: (kotlin.String?) -> kotlin.String): J
public /*synthesized*/ fun J2(/*0*/ function: (kotlin.String?) -> kotlin.String): J2
public fun main(): kotlin.Unit
public interface J {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@org.jetbrains.annotations.NotNull() public abstract fun foo(/*0*/ @org.jetbrains.annotations.Nullable() x: kotlin.String?): kotlin.String
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface J2 : J {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(/*0*/ x: kotlin.String?): kotlin.String
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -1,6 +1,6 @@
package
public/*package*/ /*synthesized*/ fun J(/*0*/ function: () -> kotlin.collections.(Mutable)List<kotlin.String!>!): J
public/*package*/ /*synthesized*/ fun J(/*0*/ function: () -> kotlin.collections.List<kotlin.String>): J
public/*package*/ interface J : K {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -1,8 +1,8 @@
package
public /*synthesized*/ fun J1(/*0*/ function: () -> In<kotlin.String!>!): J1
public /*synthesized*/ fun J2(/*0*/ function: () -> In<kotlin.String!>!): J2
public /*synthesized*/ fun J3(/*0*/ function: () -> In<kotlin.String!>!): J3
public /*synthesized*/ fun J2(/*0*/ function: () -> In<kotlin.String!>): J2
public /*synthesized*/ fun J3(/*0*/ function: () -> In<kotlin.String!>?): J3
public interface In</*0*/ in T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -1,6 +1,6 @@
package
public /*synthesized*/ fun </*0*/ T : kotlin.Any!> A(/*0*/ function: (T!) -> kotlin.Boolean): A<T>
public /*synthesized*/ fun </*0*/ T : kotlin.Any!> A(/*0*/ function: (T?) -> kotlin.Boolean): A<T>
public fun test(): kotlin.Unit
public interface A</*0*/ T : kotlin.Any!> {
@@ -1,6 +1,6 @@
package
public /*synthesized*/ fun </*0*/ T : kotlin.Any!> A(/*0*/ function: (T!) -> kotlin.Unit): A<T>
public /*synthesized*/ fun </*0*/ T : kotlin.Any!> A(/*0*/ function: (T) -> kotlin.Unit): A<T>
public fun test(): kotlin.Unit
public interface A</*0*/ T : kotlin.Any!> {
@@ -1,5 +1,7 @@
package
public /*synthesized*/ fun B(/*0*/ function: (kotlin.Any!, kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!) -> kotlin.String!): B
public interface A</*0*/ T : kotlin.Any!> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun </*0*/ E : kotlin.CharSequence!> foo(/*0*/ x: T!, /*1*/ y: (kotlin.collections.MutableList<out T!>..kotlin.collections.List<T!>?)): E!
@@ -1,8 +1,8 @@
package
public /*synthesized*/ fun </*0*/ T : kotlin.Any!> A(/*0*/ function: (T!, T!) -> kotlin.Unit): A<T>
public /*synthesized*/ fun </*0*/ T : kotlin.Any!> A(/*0*/ function: (T, T?) -> kotlin.Unit): A<T>
public /*synthesized*/ fun B1(/*0*/ function: (kotlin.String, kotlin.String?) -> kotlin.Unit): B1
public /*synthesized*/ fun B2(/*0*/ function: (kotlin.String!, kotlin.String!) -> kotlin.Unit): B2
public /*synthesized*/ fun B2(/*0*/ function: (kotlin.String, kotlin.String?) -> kotlin.Unit): B2
public /*synthesized*/ fun B3(/*0*/ function: (kotlin.String!, kotlin.String!) -> kotlin.Unit): B3
public interface A</*0*/ T : kotlin.Any!> {
@@ -1,7 +1,7 @@
package
public /*synthesized*/ fun A(/*0*/ function: (kotlin.String!) -> kotlin.Unit): A
public /*synthesized*/ fun B(/*0*/ function: (kotlin.String!) -> kotlin.Unit): B
public /*synthesized*/ fun A(/*0*/ function: (kotlin.String?) -> kotlin.Unit): A
public /*synthesized*/ fun B(/*0*/ function: (kotlin.String) -> kotlin.Unit): B
public interface A {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -1,7 +1,7 @@
package
public /*synthesized*/ fun A(/*0*/ function: () -> kotlin.String!): A
public /*synthesized*/ fun B(/*0*/ function: () -> kotlin.String!): B
public /*synthesized*/ fun A(/*0*/ function: () -> kotlin.String?): A
public /*synthesized*/ fun B(/*0*/ function: () -> kotlin.String): B
public interface A {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -1,6 +1,6 @@
package
public /*synthesized*/ fun JavaInterface(/*0*/ function: (kotlin.String!, java.lang.Runnable!) -> kotlin.Unit): JavaInterface
public /*synthesized*/ fun JavaInterface(/*0*/ function: (kotlin.String, java.lang.Runnable) -> kotlin.Unit): JavaInterface
public fun foo(/*0*/ javaInterface: JavaInterface): kotlin.Unit
public interface JavaInterface {