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

Use TypeSubstitutor to get the substituted underlying type for inline

Browse Source 
classes, instead of MemberScope.

The primary motivation was to fix issues around type-mapping for inline
classes in FIR, which uses wrapped descriptors that have empty
MemberScopes.
This commit is contained in:
Mark Punzalan
2020-05-29 16:02:58 -07:00
committed by Mikhail Glukhikh
parent 88b130308d
commit 802beb49a6
27 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/coroutines/inlineClasses/boxUnboxInsideCoroutine_InlineAny.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_RUNTIME // WITH_RUNTIME
// WITH_COROUTINES // WITH_COROUTINES
// COMMON_COROUTINES_TEST // COMMON_COROUTINES_TEST
compiler/testData/codegen/box/coroutines/inlineClasses/boxUnboxInsideCoroutine_InlineInt.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_RUNTIME // WITH_RUNTIME
// WITH_COROUTINES // WITH_COROUTINES
// COMMON_COROUTINES_TEST // COMMON_COROUTINES_TEST
compiler/testData/codegen/box/inlineClasses/boundCallableReferencePassedToInlineFunction.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_RUNTIME // WITH_RUNTIME
inline class IcInt(val i: Int) { inline class IcInt(val i: Int) {
compiler/testData/codegen/box/inlineClasses/boxNullableValueOfInlineClassWithNonNullUnderlyingType.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
// IGNORE_BACKEND_FIR: JVM_IR
class BoxT<T>(val boxed: T) class BoxT<T>(val boxed: T)
class BoxAny(val boxed: Any?) class BoxAny(val boxed: Any?)
compiler/testData/codegen/box/inlineClasses/defaultParameterValues/inlineClassPrimaryConstructorWithInlineClassValue.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
// IGNORE_BACKEND_FIR: JVM_IR
inline class Inner(val result: String) inline class Inner(val result: String)
compiler/testData/codegen/box/inlineClasses/equalityChecksInlineClassNonNull.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
// IGNORE_BACKEND_FIR: JVM_IR
inline class Inner(val w: String) inline class Inner(val w: String)
inline class A(val x: Inner) inline class A(val x: Inner)
compiler/testData/codegen/box/inlineClasses/equalityChecksNegatedInlineClassNonNull.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
// IGNORE_BACKEND_FIR: JVM_IR
inline class Inner(val w: String) inline class Inner(val w: String)
inline class A(val x: Inner) inline class A(val x: Inner)
compiler/testData/codegen/box/inlineClasses/equalsEvaluationOrderInlineClass.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
// IGNORE_BACKEND_FIR: JVM_IR
inline class Inner(val x: Int) inline class Inner(val x: Int)
inline class A(val x: Inner) inline class A(val x: Inner)
compiler/testData/codegen/box/inlineClasses/kt26103.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// KJS_WITH_FULL_RUNTIME // KJS_WITH_FULL_RUNTIME
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
// WITH_RUNTIME // WITH_RUNTIME
compiler/testData/codegen/box/inlineClasses/kt26103_original.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_RUNTIME // WITH_RUNTIME
inline class Foo<T>(val x: Int) inline class Foo<T>(val x: Int)
compiler/testData/codegen/box/inlineClasses/kt27096.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// KJS_WITH_FULL_RUNTIME // KJS_WITH_FULL_RUNTIME
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
// WITH_RUNTIME // WITH_RUNTIME
compiler/testData/codegen/box/inlineClasses/kt27096_enum.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
// IGNORE_BACKEND_FIR: JVM_IR
enum class En { N, A, B, C } enum class En { N, A, B, C }
compiler/testData/codegen/box/inlineClasses/kt27096_functional.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
// IGNORE_BACKEND_FIR: JVM_IR
inline class Z1(val x: () -> String) inline class Z1(val x: () -> String)
inline class Z2(val z: Z1) inline class Z2(val z: Z1)
compiler/testData/codegen/box/inlineClasses/kt27096_nullablePrimitive.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
// IGNORE_BACKEND_FIR: JVM_IR
inline class Z1(val x: Int?) inline class Z1(val x: Int?)
inline class Z2(val z: Z1) inline class Z2(val z: Z1)
compiler/testData/codegen/box/inlineClasses/kt27096_nullableReference.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
// IGNORE_BACKEND_FIR: JVM_IR
inline class Z1(val x: String?) inline class Z1(val x: String?)
inline class Z2(val z: Z1) inline class Z2(val z: Z1)
compiler/testData/codegen/box/inlineClasses/kt27096_primitive.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
// IGNORE_BACKEND_FIR: JVM_IR
inline class Z1(val x: Int) inline class Z1(val x: Int)
inline class Z2(val z: Z1) inline class Z2(val z: Z1)
compiler/testData/codegen/box/inlineClasses/kt27096_reference.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
// IGNORE_BACKEND_FIR: JVM_IR
inline class Z1(val x: String) inline class Z1(val x: String)
inline class Z2(val z: Z1) inline class Z2(val z: Z1)
compiler/testData/codegen/box/inlineClasses/kt27132.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// KJS_WITH_FULL_RUNTIME // KJS_WITH_FULL_RUNTIME
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
// WITH_RUNTIME // WITH_RUNTIME
compiler/testData/codegen/box/inlineClasses/kt28405.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_RUNTIME // WITH_RUNTIME
// KJS_WITH_FULL_RUNTIME // KJS_WITH_FULL_RUNTIME
compiler/testData/codegen/box/inlineClasses/mappingOfBoxedFlexibleInlineClassType.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_RUNTIME // WITH_RUNTIME
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
compiler/testData/codegen/box/inlineClasses/nullableWrapperEquality.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
// IGNORE_BACKEND_FIR: JVM_IR
inline class Z1(val x: String) inline class Z1(val x: String)
inline class ZN(val z: Z1?) inline class ZN(val z: Z1?)
compiler/testData/codegen/box/inlineClasses/unboxNullableValueOfInlineClassWithNonNullUnderlyingType.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
// IGNORE_BACKEND_FIR: JVM_IR
class BoxT<T>(val boxed: T) class BoxT<T>(val boxed: T)
class BoxAny(val boxed: Any?) class BoxAny(val boxed: Any?)
compiler/testData/codegen/box/reflection/call/inlineClasses/constructorWithInlineClassParameters.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// IGNORE_BACKEND: JS_IR, JS, NATIVE // IGNORE_BACKEND: JS_IR, JS, NATIVE
// IGNORE_BACKEND: JS_IR_ES6 // IGNORE_BACKEND: JS_IR_ES6
// WITH_REFLECT // WITH_REFLECT
compiler/testData/codegen/box/reflection/call/inlineClasses/inlineClassConstructor.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// IGNORE_BACKEND: JS_IR, JS, NATIVE // IGNORE_BACKEND: JS_IR, JS, NATIVE
// IGNORE_BACKEND: JS_IR_ES6 // IGNORE_BACKEND: JS_IR_ES6
// WITH_REFLECT // WITH_REFLECT
compiler/testData/codegen/box/reflection/call/inlineClasses/primaryValOfInlineClass.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// IGNORE_BACKEND: JS_IR, JS, NATIVE // IGNORE_BACKEND: JS_IR, JS, NATIVE
// IGNORE_BACKEND: JS_IR_ES6 // IGNORE_BACKEND: JS_IR_ES6
// WITH_REFLECT // WITH_REFLECT
compiler/testData/codegen/box/unsignedTypes/equalsImplForInlineClassWrappingNullableInlineClass.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
// IGNORE_BACKEND_FIR: JVM_IR
inline class Z(val x: Int) inline class Z(val x: Int)
inline class NZ1(val nz: Z?) inline class NZ1(val nz: Z?)
core/descriptors/src/org/jetbrains/kotlin/resolve/inlineClassesUtils.kt
+3 -1
View File
@@ -8,7 +8,9 @@ package org.jetbrains.kotlin.resolve
import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.types.TypeSubstitutor
import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.types.TypeUtils
import org.jetbrains.kotlin.types.Variance
import org.jetbrains.kotlin.utils.addToStdlib.safeAs import org.jetbrains.kotlin.utils.addToStdlib.safeAs
fun ClassDescriptor.underlyingRepresentation(): ValueParameterDescriptor? { fun ClassDescriptor.underlyingRepresentation(): ValueParameterDescriptor? {
@@ -28,7 +30,7 @@ fun KotlinType.isInlineClassType(): Boolean = constructor.declarationDescriptor?
fun KotlinType.substitutedUnderlyingType(): KotlinType? { fun KotlinType.substitutedUnderlyingType(): KotlinType? {
val parameter = unsubstitutedUnderlyingParameter() ?: return null val parameter = unsubstitutedUnderlyingParameter() ?: return null
return memberScope.getContributedVariables(parameter.name, NoLookupLocation.FOR_ALREADY_TRACKED).singleOrNull()?.type return TypeSubstitutor.create(this).substitute(parameter.type, Variance.INVARIANT)
} }
fun KotlinType.isRecursiveInlineClassType() = fun KotlinType.isRecursiveInlineClassType() =