JVM_IR: compute classId on IR structures

JetBrains · Nov 27, 2020 · 6381d97 · 6381d97
1 parent ee1e05f
commit 6381d97
Show file tree

Hide file tree

Showing 36 changed files with 17 additions and 40 deletions.
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inlineClassesCodegenUtil.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inlineClassesCodegenUtil.kt
@@ -56,6 +56,10 @@ fun classFileContainsMethod(descriptor: FunctionDescriptor, state: GenerationSta
         }
     }
 
+    return classFileContainsMethod(classId, state, method)
+}
+
+fun classFileContainsMethod(classId: ClassId, state: GenerationState, method: Method): Boolean? {
     val bytes = VirtualFileFinder.getInstance(state.project, state.module).findVirtualFileWithHeader(classId)
         ?.contentsToByteArray() ?: return null
     var found = false

diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/irCodegenUtils.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/irCodegenUtils.kt
@@ -21,10 +21,7 @@ import org.jetbrains.kotlin.codegen.SourceInfo
 import org.jetbrains.kotlin.codegen.classFileContainsMethod
 import org.jetbrains.kotlin.codegen.inline.SourceMapper
 import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter
-import org.jetbrains.kotlin.descriptors.ClassKind
-import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithSource
-import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
-import org.jetbrains.kotlin.descriptors.Modality
+import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrMemberAccessExpression
@@ -36,6 +33,8 @@ import org.jetbrains.kotlin.ir.types.getClass
 import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities
 import org.jetbrains.kotlin.load.java.JvmAbi
+import org.jetbrains.kotlin.load.kotlin.JvmPackagePartSource
+import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.resolve.checkers.ExpectedActualDeclarationChecker
 import org.jetbrains.kotlin.resolve.inline.INLINE_ONLY_ANNOTATION_FQ_NAME
@@ -379,12 +378,20 @@ val IrMemberAccessExpression<*>.psiElement: PsiElement?
 fun IrSimpleType.isRawType(): Boolean =
     hasAnnotation(JvmGeneratorExtensions.RAW_TYPE_ANNOTATION_FQ_NAME)
 
-@OptIn(ObsoleteDescriptorBasedAPI::class)
 internal fun classFileContainsMethod(function: IrFunction, context: JvmBackendContext, name: String): Boolean? {
+    val classId = (function.parent as? IrClass)?.classId ?: (function.containerSource as? JvmPackagePartSource)?.classId ?: return null
     val originalDescriptor = context.methodSignatureMapper.mapSignatureWithGeneric(function).asmMethod.descriptor
     val descriptor = if (function.isSuspend)
         listOf(*Type.getArgumentTypes(originalDescriptor), Type.getObjectType("kotlin/coroutines/Continuation"))
             .joinToString(prefix = "(", postfix = ")", separator = "") + AsmTypes.OBJECT_TYPE
     else originalDescriptor
-    return classFileContainsMethod(function.descriptor, context.state, Method(name, descriptor))
+    return classFileContainsMethod(classId, context.state, Method(name, descriptor))
 }
+
+// Translated into IR-based terms from classifierDescriptor?.classId
+val IrClass.classId: ClassId?
+    get() = when (val parent = parent) {
+        is IrExternalPackageFragment -> ClassId(parent.fqName, name)
+        is IrClass -> parent.classId?.createNestedClassId(name)
+        else -> null
+    }
diff --git a/compiler/testData/codegen/box/inlineClasses/hiddenConstructor/kt28855.kt b/compiler/testData/codegen/box/inlineClasses/hiddenConstructor/kt28855.kt
@@ -3,7 +3,6 @@
 // !LANGUAGE: +InlineClasses
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 class C<T>(val x: T, vararg ys: UInt) {
     val y0 = ys[0]

diff --git a/compiler/testData/codegen/box/ranges/forInUntil/kt42533.kt b/compiler/testData/codegen/box/ranges/forInUntil/kt42533.kt
@@ -1,7 +1,6 @@
 // IGNORE_BACKEND: JVM
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 fun box(): String {
     // These should all be empty progressions

diff --git a/compiler/testData/codegen/box/ranges/unsigned/inMixedUnsignedRange.kt b/compiler/testData/codegen/box/ranges/unsigned/inMixedUnsignedRange.kt
@@ -1,6 +1,5 @@
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 fun ub_ub(x: UByte, a: UByte, b: UByte) = x in a..b
 fun ub_us(x: UByte, a: UShort, b: UShort) = x in a..b

diff --git a/compiler/testData/codegen/box/ranges/unsigned/kt35004.kt b/compiler/testData/codegen/box/ranges/unsigned/kt35004.kt
@@ -1,6 +1,5 @@
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 fun ULong.foobar() =
     when (this) {

diff --git a/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/progressionExpression.kt b/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/progressionExpression.kt
@@ -3,7 +3,6 @@
 // IGNORE_LIGHT_ANALYSIS
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 fun box(): String {
     var result = 0u

diff --git a/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/rangeExpression.kt b/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/rangeExpression.kt
@@ -3,7 +3,6 @@
 // IGNORE_LIGHT_ANALYSIS
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 fun box(): String {
     var result = 0u

diff --git a/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/rangeLiteral.kt b/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/rangeLiteral.kt
@@ -3,7 +3,6 @@
 // IGNORE_LIGHT_ANALYSIS
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 fun box(): String {
     var result = 0u

diff --git a/compiler/testData/codegen/box/ranges/unsigned/outOfBoundsInMixedContains.kt b/compiler/testData/codegen/box/ranges/unsigned/outOfBoundsInMixedContains.kt
@@ -1,6 +1,5 @@
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 fun testIn(x: ULong) =
     x in UInt.MIN_VALUE..UInt.MAX_VALUE

diff --git a/compiler/testData/codegen/box/unsignedTypes/checkBasicUnsignedLiterals.kt b/compiler/testData/codegen/box/unsignedTypes/checkBasicUnsignedLiterals.kt
@@ -1,6 +1,5 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 fun box(): String {
     val good = 42.toUInt()

diff --git a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedDownTo.kt b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedDownTo.kt
@@ -2,7 +2,6 @@
 // WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 const val MaxUI = UInt.MAX_VALUE
 const val MinUI = UInt.MIN_VALUE

diff --git a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedProgression.kt b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedProgression.kt
@@ -2,7 +2,6 @@
 // WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 const val MaxUI = UInt.MAX_VALUE
 const val MinUI = UInt.MIN_VALUE

diff --git a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRange.kt b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRange.kt
@@ -2,7 +2,6 @@
 // WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 const val MaxUI = UInt.MAX_VALUE
 const val MinUI = UInt.MIN_VALUE

diff --git a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRangeLiteral.kt b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRangeLiteral.kt
@@ -2,7 +2,6 @@
 // WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 const val MaxUI = UInt.MAX_VALUE
 const val MinUI = UInt.MIN_VALUE

diff --git a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRangeWithCoercion.kt b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRangeWithCoercion.kt
@@ -1,6 +1,5 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 val UB_MAX = UByte.MAX_VALUE
 val UB_START = (UB_MAX - 10u).toUByte()

diff --git a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedUntil.kt b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedUntil.kt
@@ -2,7 +2,6 @@
 // WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 const val MaxUI = UInt.MAX_VALUE
 const val MinUI = UInt.MIN_VALUE

diff --git a/compiler/testData/codegen/box/unsignedTypes/inUnsignedDownTo.kt b/compiler/testData/codegen/box/unsignedTypes/inUnsignedDownTo.kt
@@ -2,7 +2,6 @@
 // WASM_MUTE_REASON: STDLIB_COLLECTIONS
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 const val MaxUI = UInt.MAX_VALUE
 const val MinUI = UInt.MIN_VALUE

diff --git a/compiler/testData/codegen/box/unsignedTypes/inUnsignedRange.kt b/compiler/testData/codegen/box/unsignedTypes/inUnsignedRange.kt
@@ -1,6 +1,5 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 const val MaxUI = UInt.MAX_VALUE
 const val MinUI = UInt.MIN_VALUE

diff --git a/compiler/testData/codegen/box/unsignedTypes/inUnsignedRangeLiteral.kt b/compiler/testData/codegen/box/unsignedTypes/inUnsignedRangeLiteral.kt
@@ -1,6 +1,5 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 const val MaxUI = UInt.MAX_VALUE
 const val MinUI = UInt.MIN_VALUE

diff --git a/compiler/testData/codegen/box/unsignedTypes/inUnsignedUntil.kt b/compiler/testData/codegen/box/unsignedTypes/inUnsignedUntil.kt
@@ -1,6 +1,5 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 const val MaxUI = UInt.MAX_VALUE
 const val MinUI = UInt.MIN_VALUE

diff --git a/compiler/testData/codegen/box/unsignedTypes/iterateOverArrayOfUnsignedValues.kt b/compiler/testData/codegen/box/unsignedTypes/iterateOverArrayOfUnsignedValues.kt
@@ -2,7 +2,6 @@
 // WASM_MUTE_REASON: UNSIGNED_ARRAYS
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 fun box(): String {
     var sum = 0u

diff --git a/compiler/testData/codegen/box/unsignedTypes/iterateOverListOfBoxedUnsignedValues.kt b/compiler/testData/codegen/box/unsignedTypes/iterateOverListOfBoxedUnsignedValues.kt
@@ -1,6 +1,5 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 fun box(): String {
     var sum = 0u

diff --git a/compiler/testData/codegen/box/unsignedTypes/kt25784.kt b/compiler/testData/codegen/box/unsignedTypes/kt25784.kt
@@ -2,7 +2,6 @@
 // WASM_MUTE_REASON: PROPERTY_REFERENCES
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 import kotlin.reflect.KProperty
 import kotlin.reflect.KProperty0

diff --git a/compiler/testData/codegen/box/unsignedTypes/kt43286a.kt b/compiler/testData/codegen/box/unsignedTypes/kt43286a.kt
@@ -1,7 +1,6 @@
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 fun box(): String {
     val x = 3UL % 2U

diff --git a/compiler/testData/codegen/box/unsignedTypes/unsignedIntDivide.kt b/compiler/testData/codegen/box/unsignedTypes/unsignedIntDivide.kt
@@ -1,6 +1,5 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 val ua = 1234U
 val ub = 5678U

diff --git a/compiler/testData/codegen/box/unsignedTypes/unsignedIntRemainder.kt b/compiler/testData/codegen/box/unsignedTypes/unsignedIntRemainder.kt
@@ -1,6 +1,5 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 val ua = 1234U
 val ub = 5678U

diff --git a/compiler/testData/codegen/box/unsignedTypes/unsignedLongDivide.kt b/compiler/testData/codegen/box/unsignedTypes/unsignedLongDivide.kt
@@ -1,6 +1,5 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 val ua = 1234UL
 val ub = 5678UL

diff --git a/compiler/testData/codegen/box/unsignedTypes/unsignedLongRemainder.kt b/compiler/testData/codegen/box/unsignedTypes/unsignedLongRemainder.kt
@@ -1,6 +1,5 @@
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 val ua = 1234UL
 val ub = 5678UL

diff --git a/compiler/testData/codegen/box/unsignedTypes/unsignedTypeValuesInsideStringTemplates.kt b/compiler/testData/codegen/box/unsignedTypes/unsignedTypeValuesInsideStringTemplates.kt
@@ -2,7 +2,6 @@
 // WASM_MUTE_REASON: STDLIB_TEXT
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 const val MAX_BYTE: UByte = 0xFFu
 const val HUNDRED: UByte = 100u

diff --git a/compiler/testData/codegen/box/unsignedTypes/varargsOfUnsignedTypes.kt b/compiler/testData/codegen/box/unsignedTypes/varargsOfUnsignedTypes.kt
@@ -2,7 +2,6 @@
 // WASM_MUTE_REASON: SPREAD_OPERATOR
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 fun uint(vararg us: UInt): UIntArray = us
 

diff --git a/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedIntDivide_jvm18.kt b/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedIntDivide_jvm18.kt
@@ -1,6 +1,5 @@
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 val ua = 1234U
 val ub = 5678U

diff --git a/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedIntRemainder_jvm18.kt b/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedIntRemainder_jvm18.kt
@@ -1,6 +1,5 @@
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 val ua = 1234U
 val ub = 5678U

diff --git a/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedLongDivide_jvm18.kt b/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedLongDivide_jvm18.kt
@@ -1,6 +1,5 @@
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 val ua = 1234UL
 val ub = 5678UL

diff --git a/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedLongRemainder_jvm18.kt b/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedLongRemainder_jvm18.kt
@@ -1,6 +1,5 @@
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 val ua = 1234UL
 val ub = 5678UL

diff --git a/compiler/testData/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt b/compiler/testData/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND_FIR: JVM_IR
 // FILE: 1.kt
 // KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
 package test