jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-17 15:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FIR] Match type in super<type> access with actual supertypes of class

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-07-15 12:17:44 +03:00
parent 1ce4eca3a6
commit cedd1c133e
9 changed files with 63 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
compiler/fir/analysis-tests/testData/resolve/diagnostics/qualifiedSupertypeExtendedByOtherSupertype.txt vendored
View File

@@ -23,11 +23,11 @@ FILE: qualifiedSupertypeExtendedByOtherSupertype.kt
}
public final fun test(): R|kotlin/Unit| {
this@R|/Test|.super<R|IBase<T>|>.R|/IBase.foo|()
this@R|/Test|.super<R|IBase<T>|>.R|/IBase.bar|()
this@R|/Test|.super<R|IDerived<T>|>.R|/IDerived.foo|()
this@R|/Test|.super<R|IDerived<T>|>.R|/IBase.bar|()
this@R|/Test|.super<R|IDerived<T>|>.R|/IDerived.qux|()
this@R|/Test|.super<R|IBase<kotlin/String>|>.R|/IBase.foo|()
this@R|/Test|.super<R|IBase<kotlin/String>|>.R|/IBase.bar|()
this@R|/Test|.super<R|IDerived<kotlin/String>|>.R|/IDerived.foo|()
this@R|/Test|.super<R|IDerived<kotlin/String>|>.R|/IBase.bar|()
this@R|/Test|.super<R|IDerived<kotlin/String>|>.R|/IDerived.qux|()
}
}
@@ -37,13 +37,13 @@ FILE: qualifiedSupertypeExtendedByOtherSupertype.kt
}
public final fun test(): R|kotlin/Unit| {
this@R|/Test2|.super<R|IBase<T>|>.R|/IBase.foo|()
this@R|/Test2|.super<R|IBase<T>|>.R|/IBase.bar|()
this@R|/Test2|.super<R|AliasedIBase|>.R|/IBase.foo|()
this@R|/Test2|.super<R|AliasedIBase|>.R|/IBase.bar|()
this@R|/Test2|.super<R|IDerived<T>|>.R|/IDerived.foo|()
this@R|/Test2|.super<R|IDerived<T>|>.R|/IBase.bar|()
this@R|/Test2|.super<R|IDerived<T>|>.R|/IDerived.qux|()
this@R|/Test2|.super<R|IBase<kotlin/String>|>.R|/IBase.foo|()
this@R|/Test2|.super<R|IBase<kotlin/String>|>.R|/IBase.bar|()
this@R|/Test2|.super<R|IBase<kotlin/String>|>.R|/IBase.foo|()
this@R|/Test2|.super<R|IBase<kotlin/String>|>.R|/IBase.bar|()
this@R|/Test2|.super<R|IDerived<kotlin/String>|>.R|/IDerived.foo|()
this@R|/Test2|.super<R|IDerived<kotlin/String>|>.R|/IBase.bar|()
this@R|/Test2|.super<R|IDerived<kotlin/String>|>.R|/IDerived.qux|()
}
}

7
compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypeUtils.kt
View File

@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.fir.types
import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.utils.SmartSet
import org.jetbrains.kotlin.utils.addToStdlib.safeAs
@@ -33,4 +34,10 @@ private fun ConeKotlinType.contains(predicate: (ConeKotlinType) -> Boolean, visi
is ConeIntersectionType -> intersectedTypes.any { it.contains(predicate, visited) }
else -> typeArguments.any { it is ConeKotlinTypeProjection && it.type.contains(predicate, visited) }
}
}
fun ConeClassLikeType.withArguments(typeArguments: Array<out ConeTypeProjection>): ConeClassLikeType = when (this) {
is ConeClassLikeTypeImpl -> ConeClassLikeTypeImpl(lookupTag, typeArguments, isNullable, attributes)
is ConeClassErrorType -> this
else -> error("Unknown cone type: ${this::class}")
}

37
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt
View File

@@ -139,8 +139,41 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform
superReferenceContainer.resultType = superTypeRef
}
!is FirImplicitTypeRef -> {
superReference.transformChildren(transformer, ResolutionMode.ContextIndependent)
superReferenceContainer.resultType = superReference.superTypeRef
components.typeResolverTransformer.withAllowedBareTypes {
superReference.transformChildren(transformer, ResolutionMode.ContextIndependent)
}
val actualSuperType = (superReference.superTypeRef.coneType as? ConeClassLikeType)
?.fullyExpandedType(session)?.let { superType ->
val classId = superType.lookupTag.classId
val superTypeRefs = implicitReceiver?.boundSymbol?.phasedFir?.superTypeRefs
val correspondingDeclaredSuperType = superTypeRefs?.firstOrNull {
it.coneType.fullyExpandedType(session).classId == classId
}?.coneTypeSafe<ConeClassLikeType>()?.fullyExpandedType(session) ?: return@let superType
if (superType.typeArguments.isEmpty() && correspondingDeclaredSuperType.typeArguments.isNotEmpty()) {
superType.withArguments(correspondingDeclaredSuperType.typeArguments)
} else {
superType
}
}
/*
* See tests:
* DiagnosticsTestGenerated$Tests$ThisAndSuper.testGenericQualifiedSuperOverridden
* DiagnosticsTestGenerated$Tests$ThisAndSuper.testQualifiedSuperOverridden
*/
val actualSuperTypeRef = actualSuperType?.let {
buildResolvedTypeRef {
source = superTypeRef.source
type = it
}
} ?: buildErrorTypeRef {
source = superTypeRef.source
diagnostic = ConeSimpleDiagnostic("Not a super type", DiagnosticKind.Other)
}
superReference.replaceSuperTypeRef(actualSuperTypeRef)
superReferenceContainer.resultType = actualSuperTypeRef
}
else -> {
val superTypeRefs = implicitReceiver?.boundSymbol?.phasedFir?.superTypeRefs

2
compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesTransitive.fir.kt vendored
View File

@@ -14,6 +14,6 @@ class Derived : BaseDerived2<Int>() {
}
fun foo() {
Derived().foo() checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Outer<Int, String>.Inner<Char>>() }
Derived().foo() checkType { _<Outer<Int, String>.Inner<Char>>() }
Derived().baz() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Map<Char, Int>>() }
}

18
compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/secondLevelDepth.fir.kt vendored
View File

@@ -1,18 +0,0 @@
// !CHECK_TYPE
open class Outer<E> {
inner open class Inner<F> {
inner class Inner2<D> {
}
}
}
class DerivedOuter : Outer<String>() {
inner class DerivedInner : Inner<Int>() {
fun foo(): Inner2<Char> = null!!
}
}
fun foo() {
DerivedOuter().DerivedInner().foo() checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Outer<String>.Inner<Int>.Inner2<Char>>() }
}

1
compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/secondLevelDepth.kt vendored
View File

@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !CHECK_TYPE
open class Outer<E> {
inner open class Inner<F> {

6
compiler/testData/diagnostics/tests/generics/innerClasses/simpleOutUseSite.fir.kt vendored
View File

@@ -29,9 +29,9 @@ fun main() {
checkSubtype<Outer<out CharSequence>.Inner>(outer.bar())
checkSubtype<Outer<out CharSequence>.Inner>(outer.Inner())
outer.<!INAPPLICABLE_CANDIDATE!>set<!>(outer.bar())
outer.<!INAPPLICABLE_CANDIDATE!>set<!>(outer.Inner())
outer.set(outer.bar())
outer.set(outer.Inner())
val x: Outer<String>.Inner = factoryString()
outer.<!INAPPLICABLE_CANDIDATE!>set<!>(x)
outer.set(x)
}

4
compiler/testData/diagnostics/tests/thisAndSuper/Super.fir.kt vendored
View File

@@ -17,8 +17,8 @@ class A<E>() : C(), T {
super<C>.bar()
super<T>@A.foo()
super<C>@A.bar()
super<E>.<!UNRESOLVED_REFERENCE!>bar<!>()
super<E>@A.<!UNRESOLVED_REFERENCE!>bar<!>()
super<<!OTHER_ERROR, OTHER_ERROR!>E<!>>.<!UNRESOLVED_REFERENCE!>bar<!>()
super<<!OTHER_ERROR, OTHER_ERROR!>E<!>>@A.<!UNRESOLVED_REFERENCE!>bar<!>()
<!NOT_A_SUPERTYPE!>super<Int><!>.<!UNRESOLVED_REFERENCE!>foo<!>()
super<<!SYNTAX!><!>>.<!UNRESOLVED_REFERENCE!>foo<!>()
<!NOT_A_SUPERTYPE!>super<() -> Unit><!>.<!UNRESOLVED_REFERENCE!>foo<!>()

4
compiler/testData/diagnostics/tests/typealias/typeAliasAsSuperQualifier.fir.kt vendored
View File

@@ -23,7 +23,7 @@ class TestSuperForBase : B() {
super<Base>.foo()
super<B>.foo()
super<MyBase>.<!UNRESOLVED_REFERENCE!>foo<!>()
super<U>.foo()
<!NOT_A_SUPERTYPE!>super<U><!>.foo()
}
}
@@ -36,6 +36,6 @@ class TestSuperForGenericBase<T> : GB<T>() {
super<GB>.foo()
super<MyBase>.<!UNRESOLVED_REFERENCE!>foo<!>()
super<MyBaseInt>.<!UNRESOLVED_REFERENCE!>foo<!>() // Type arguments don't matter here
super<U>.foo()
<!NOT_A_SUPERTYPE!>super<U><!>.foo()
}
}