azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIR checker: fix local type approximation on delegated property

Browse Source 
Previously types of delegated property is not approximated, which can
cause local types to leak through public APIs.
This commit is contained in:
Tianyu Geng
2021-09-02 15:02:34 -07:00
committed by teamcityserver
parent 76e192fc8a
commit d3e8cc577c
12 changed files with 314 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.fir.kt
Vendored
+55 -1
View File
@@ -1,3 +1,9 @@
interface Lazy<T> {
operator fun getValue(a1: Any, a2: Any): T
}
fun <T> lazy(f: () -> T): Lazy<T> = throw Exception()
interface MyTrait {
fun f1() {}
}
@@ -7,13 +13,21 @@ open class MyClass {
}
class Foo {
class Foo(val myTrait: MyTrait) {
private val privateProperty = object : MyClass(), MyTrait {}
val publicPropertyWithSingleSuperType = object : MyClass() {
fun onlyFromAnonymousObject() {}
}
private val privatePropertyWithSingleSuperType = object : MyClass() {
fun onlyFromAnonymousObject() {}
}
init {
privateProperty.f1()
privateProperty.f2()
publicPropertyWithSingleSuperType.<!UNRESOLVED_REFERENCE!>onlyFromAnonymousObject<!>() // unresolved due to approximation
privatePropertyWithSingleSuperType.onlyFromAnonymousObject() // resolvable since private
}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>protected val protectedProperty<!> = object : MyClass(), MyTrait {}
@@ -27,6 +41,46 @@ class Foo {
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>val propertyWithGetter<!>
get() = object: MyClass(), MyTrait {}
private val privateDelegateProperty by lazy { object : MyClass(), MyTrait {} }
val publicDelegatePropertyWithSingleSuperType by lazy {
object : MyClass() {
fun onlyFromAnonymousObject() {}
}
}
private val privateDelegatePropertyWithSingleSuperType by lazy {
object : MyClass() {
fun onlyFromAnonymousObject() {}
}
}
init {
privateDelegateProperty.f1()
privateDelegateProperty.f2()
publicDelegatePropertyWithSingleSuperType.<!UNRESOLVED_REFERENCE!>onlyFromAnonymousObject<!>() // unresolved due to approximation
privateDelegatePropertyWithSingleSuperType.onlyFromAnonymousObject() // resolvable since private
}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>protected val protectedDelegateProperty<!> by lazy { object : MyClass(), MyTrait {} }
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>val internalDelegateProperty<!> by lazy { object : MyClass(), MyTrait {} }
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>internal val internal2DelegateProperty<!> by lazy { object : MyClass(), MyTrait {} }
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>public val publicDelegateProperty<!> by lazy { object : MyClass(), MyTrait {} }
private val privateDelegate = object : MyTrait by myTrait {
fun f2() {}
}
val delegate = object : MyTrait by myTrait {
fun f2() {}
}
init {
privateDelegate.f1()
privateDelegate.f2()
delegate.f1()
delegate.<!UNRESOLVED_REFERENCE!>f2<!>()
}
private fun privateFunction() = object : MyClass(), MyTrait {}
compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.kt
Vendored
+55 -1
View File
@@ -1,3 +1,9 @@
interface Lazy<T> {
operator fun getValue(a1: Any, a2: Any): T
}
fun <T> lazy(f: () -> T): Lazy<T> = throw Exception()
interface MyTrait {
fun f1() {}
}
@@ -7,13 +13,21 @@ open class MyClass {
}
class Foo {
class Foo(val myTrait: MyTrait) {
private val privateProperty = object : MyClass(), MyTrait {}
val publicPropertyWithSingleSuperType = object : MyClass() {
fun onlyFromAnonymousObject() {}
}
private val privatePropertyWithSingleSuperType = object : MyClass() {
fun onlyFromAnonymousObject() {}
}
init {
privateProperty.f1()
privateProperty.f2()
publicPropertyWithSingleSuperType.<!UNRESOLVED_REFERENCE!>onlyFromAnonymousObject<!>() // unresolved due to approximation
privatePropertyWithSingleSuperType.onlyFromAnonymousObject() // resolvable since private
}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>protected val <!EXPOSED_PROPERTY_TYPE!>protectedProperty<!><!> = object : MyClass(), MyTrait {}
@@ -27,6 +41,46 @@ class Foo {
val <!EXPOSED_PROPERTY_TYPE!>propertyWithGetter<!>
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>get()<!> = object: MyClass(), MyTrait {}
private val privateDelegateProperty by lazy { object : MyClass(), MyTrait {} }
val publicDelegatePropertyWithSingleSuperType by lazy {
object : MyClass() {
fun onlyFromAnonymousObject() {}
}
}
private val privateDelegatePropertyWithSingleSuperType by lazy {
object : MyClass() {
fun onlyFromAnonymousObject() {}
}
}
init {
<!DEBUG_INFO_LEAKING_THIS!>privateDelegateProperty<!>.f1()
<!DEBUG_INFO_LEAKING_THIS!>privateDelegateProperty<!>.f2()
<!DEBUG_INFO_LEAKING_THIS!>publicDelegatePropertyWithSingleSuperType<!>.<!UNRESOLVED_REFERENCE!>onlyFromAnonymousObject<!>() // unresolved due to approximation
<!DEBUG_INFO_LEAKING_THIS!>privateDelegatePropertyWithSingleSuperType<!>.onlyFromAnonymousObject() // resolvable since private
}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>protected val <!EXPOSED_PROPERTY_TYPE!>protectedDelegateProperty<!><!> by lazy { object : MyClass(), MyTrait {} }
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>val <!EXPOSED_PROPERTY_TYPE!>internalDelegateProperty<!><!> by lazy { object : MyClass(), MyTrait {} }
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>internal val <!EXPOSED_PROPERTY_TYPE!>internal2DelegateProperty<!><!> by lazy { object : MyClass(), MyTrait {} }
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>public val <!EXPOSED_PROPERTY_TYPE!>publicDelegateProperty<!><!> by lazy { object : MyClass(), MyTrait {} }
private val privateDelegate = object : MyTrait by myTrait {
fun f2() {}
}
val delegate = object : MyTrait by myTrait {
fun f2() {}
}
init {
privateDelegate.f1()
privateDelegate.f2()
delegate.f1()
delegate.<!UNRESOLVED_REFERENCE!>f2<!>()
}
private fun privateFunction() = object : MyClass(), MyTrait {}
compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.txt
Vendored
+22 -1
View File
@@ -6,19 +6,32 @@ private val packagePrivateProperty: packagePrivateProperty.<no name provided>
protected val packageProtectedProperty: packageProtectedProperty.<no name provided>
public val packagePublicProperty: packagePublicProperty.<no name provided>
public fun fooPackage(): kotlin.Unit
public fun </*0*/ T> lazy(/*0*/ f: () -> T): Lazy<T>
internal fun packageInternal2Function(): packageInternal2Function.<no name provided>
public fun packageInternalFunction(): packageInternalFunction.<no name provided>
protected fun packageProtectedFunction(): packageProtectedFunction.<no name provided>
public fun packagePublicFunction(): packagePublicFunction.<no name provided>
public final class Foo {
public constructor Foo()
public constructor Foo(/*0*/ myTrait: MyTrait)
public final val delegate: MyTrait
internal final val internal2DelegateProperty: Foo.internal2DelegateProperty.<anonymous>.<no name provided>
internal final val internal2Property: Foo.internal2Property.<no name provided>
public final val internalDelegateProperty: Foo.internalDelegateProperty.<anonymous>.<no name provided>
public final val internalProperty: Foo.internalProperty.<no name provided>
public final val myTrait: MyTrait
private final val privateDelegate: Foo.privateDelegate.<no name provided>
private final val privateDelegateProperty: Foo.privateDelegateProperty.<anonymous>.<no name provided>
private final val privateDelegatePropertyWithSingleSuperType: Foo.privateDelegatePropertyWithSingleSuperType.<anonymous>.<no name provided>
private final val privateProperty: Foo.privateProperty.<no name provided>
private final val privatePropertyWithSingleSuperType: Foo.privatePropertyWithSingleSuperType.<no name provided>
public final val propertyWithGetter: Foo.<get-propertyWithGetter>.<no name provided>
protected final val protectedDelegateProperty: Foo.protectedDelegateProperty.<anonymous>.<no name provided>
protected final val protectedProperty: Foo.protectedProperty.<no name provided>
public final val publicDelegateProperty: Foo.publicDelegateProperty.<anonymous>.<no name provided>
public final val publicDelegatePropertyWithSingleSuperType: MyClass
public final val publicProperty: Foo.publicProperty.<no name provided>
public final val publicPropertyWithSingleSuperType: MyClass
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -47,6 +60,13 @@ public final class Foo {
}
}
public interface Lazy</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract operator fun getValue(/*0*/ a1: kotlin.Any, /*1*/ a2: kotlin.Any): T
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public open class MyClass {
public constructor MyClass()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -61,3 +81,4 @@ public interface MyTrait {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/declarationChecks/localObjectInInnerClass.fir.kt
Vendored
+30
View File
@@ -0,0 +1,30 @@
interface I1
interface I2
interface Lazy<T> {
operator fun getValue(a1: Any, a2: Any): T
}
fun <T> lazy(f: () -> T): Lazy<T> = throw Exception()
class A {
private inner class B {
val o1 = object : I1 {}
val o2 by lazy {
object : I1 {}
}
val o3 = object : I1, I2 {} // FIR allows this since the containing class is private
val o4 by lazy { // FIR allows this since the containing class is private
object : I1, I2 {}
}
private val privateO1 = object : I1 {}
private val privateO2 by lazy {
object : I1 {}
}
private val privateO3 = object : I1, I2 {}
private val privateO4 by lazy {
object : I1, I2 {}
}
}
}
compiler/testData/diagnostics/tests/declarationChecks/localObjectInInnerClass.kt
Vendored
+30
View File
@@ -0,0 +1,30 @@
interface I1
interface I2
interface Lazy<T> {
operator fun getValue(a1: Any, a2: Any): T
}
fun <T> lazy(f: () -> T): Lazy<T> = throw Exception()
class A {
private inner class B {
val o1 = object : I1 {}
val o2 by lazy {
object : I1 {}
}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>val o3<!> = object : I1, I2 {} // FIR allows this since the containing class is private
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>val o4<!> by lazy { // FIR allows this since the containing class is private
object : I1, I2 {}
}
private val privateO1 = object : I1 {}
private val privateO2 by lazy {
object : I1 {}
}
private val privateO3 = object : I1, I2 {}
private val privateO4 by lazy {
object : I1, I2 {}
}
}
}
compiler/testData/diagnostics/tests/declarationChecks/localObjectInInnerClass.txt
Vendored
+44
View File
@@ -0,0 +1,44 @@
package
public fun </*0*/ T> lazy(/*0*/ f: () -> T): Lazy<T>
public final class A {
public constructor A()
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
private final inner class B {
public constructor B()
public final val o1: I1
public final val o2: I1
public final val o3: A.B.o3.<no name provided>
public final val o4: A.B.o4.<anonymous>.<no name provided>
private final val privateO1: A.B.privateO1.<no name provided>
private final val privateO2: A.B.privateO2.<anonymous>.<no name provided>
private final val privateO3: A.B.privateO3.<no name provided>
private final val privateO4: A.B.privateO4.<anonymous>.<no name provided>
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 interface I1 {
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 interface I2 {
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 interface Lazy</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract operator fun getValue(/*0*/ a1: kotlin.Any, /*1*/ a2: kotlin.Any): T
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}