Skip to content

Commit 2a3a9bb

Browse files
author
Mikhael Bogdanov
committed
Support properties reificaton
1 parent 944c200 commit 2a3a9bb

File tree

5 files changed

+3
-6
lines changed

5 files changed

+3
-6
lines changed

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package org.jetbrains.kotlin.backend.jvm.codegen
77

8+
import org.jetbrains.kotlin.backend.common.descriptors.propertyIfAccessor
89
import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin
910
import org.jetbrains.kotlin.backend.jvm.intrinsics.ComparisonIntrinsic
1011
import org.jetbrains.kotlin.backend.jvm.intrinsics.IrIntrinsicFunction
@@ -1283,9 +1284,9 @@ class ExpressionCodegen(
12831284
if (memberAccessExpression.typeArgumentsCount == 0) {
12841285
//avoid ambiguity with type constructor type parameters
12851286
emptyMap()
1286-
} else descriptor.original.typeParameters.keysToMap {
1287+
} else (descriptor.propertyIfAccessor as? CallableDescriptor)?.original?.typeParameters?.keysToMap {
12871288
memberAccessExpression.getTypeArgumentOrDefault(it)
1288-
}
1289+
} ?: emptyMap()
12891290

12901291
val mappings = TypeParameterMappings()
12911292
for (entry in typeArguments.entries) {

compiler/testData/codegen/boxInline/property/reifiedVal.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// IGNORE_BACKEND: JVM_IR
21
// WITH_RUNTIME
32
// WITH_REFLECT
43
// FILE: 1.kt

compiler/testData/codegen/boxInline/property/reifiedVar.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// IGNORE_BACKEND: JVM_IR
21
// WITH_RUNTIME
32
// WITH_REFLECT
43
// FILE: 1.kt

compiler/testData/codegen/boxInline/simple/propImportedFromObject.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// IGNORE_BACKEND: JVM_IR
21
// TARGET_BACKEND: JVM
32
// WITH_RUNTIME
43
// FILE: 1.kt

compiler/testData/codegen/boxInline/smap/inlineOnly/reifiedProperty.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// IGNORE_BACKEND: JVM_IR
21
// TARGET_BACKEND: JVM
32
// FILE: 1.kt
43
// WITH_REFLECT

0 commit comments

Comments
 (0)