diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrSourceCompilerForInline.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrSourceCompilerForInline.kt index 4b06c44e024..f93c3c12372 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrSourceCompilerForInline.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrSourceCompilerForInline.kt @@ -58,9 +58,8 @@ class IrSourceCompilerForInline( override val callElementText: String get() = callElement.toString() - //TODO override val callsiteFile: PsiFile? - get() = callElement.descriptor.psiElement?.containingFile + get() = codegen.context.psiSourceManager.getKtFile(codegen.irFunction.fileParent) override val contextKind: OwnerKind get() = OwnerKind.getMemberOwnerKind(callElement.descriptor.containingDeclaration) diff --git a/compiler/testData/codegen/box/delegatedProperty/kt9712.kt b/compiler/testData/codegen/box/delegatedProperty/kt9712.kt index 5dc11f8177c..585489f7886 100644 --- a/compiler/testData/codegen/box/delegatedProperty/kt9712.kt +++ b/compiler/testData/codegen/box/delegatedProperty/kt9712.kt @@ -1,5 +1,4 @@ // KJS_WITH_FULL_RUNTIME -// IGNORE_BACKEND: JVM_IR // WITH_RUNTIME import kotlin.properties.Delegates diff --git a/compiler/testData/codegen/box/inference/integerLiteralTypeInLamdaReturnType.kt b/compiler/testData/codegen/box/inference/integerLiteralTypeInLamdaReturnType.kt index ae9a9f113b8..1b64f47c726 100644 --- a/compiler/testData/codegen/box/inference/integerLiteralTypeInLamdaReturnType.kt +++ b/compiler/testData/codegen/box/inference/integerLiteralTypeInLamdaReturnType.kt @@ -1,6 +1,5 @@ // !LANGUAGE: +NewInference // KJS_WITH_FULL_RUNTIME -// IGNORE_BACKEND: JVM_IR // WITH_RUNTIME class Foo { diff --git a/compiler/testData/codegen/box/reflection/properties/getDelegate/nameClashExtensionProperties.kt b/compiler/testData/codegen/box/reflection/properties/getDelegate/nameClashExtensionProperties.kt index 6041b22d7d7..b66b174c18c 100644 --- a/compiler/testData/codegen/box/reflection/properties/getDelegate/nameClashExtensionProperties.kt +++ b/compiler/testData/codegen/box/reflection/properties/getDelegate/nameClashExtensionProperties.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM // WITH_REFLECT diff --git a/compiler/testData/codegen/boxInline/reified/kt15956.kt b/compiler/testData/codegen/boxInline/reified/kt15956.kt index 69666f441ad..83c25c4edb4 100644 --- a/compiler/testData/codegen/boxInline/reified/kt15956.kt +++ b/compiler/testData/codegen/boxInline/reified/kt15956.kt @@ -1,6 +1,5 @@ // FILE: 1.kt // WITH_REFLECT -// IGNORE_BACKEND: JVM_IR package foo diff --git a/compiler/testData/codegen/boxInline/reified/kt15997.kt b/compiler/testData/codegen/boxInline/reified/kt15997.kt index 848faa1cc04..d5e316774ee 100644 --- a/compiler/testData/codegen/boxInline/reified/kt15997.kt +++ b/compiler/testData/codegen/boxInline/reified/kt15997.kt @@ -1,7 +1,6 @@ // FILE: 1.kt // FULL_JDK // WITH_REFLECT -// IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM package test diff --git a/compiler/testData/codegen/boxInline/signature/recursion.kt b/compiler/testData/codegen/boxInline/signature/recursion.kt index 521d5526b42..4b394b9ca04 100644 --- a/compiler/testData/codegen/boxInline/signature/recursion.kt +++ b/compiler/testData/codegen/boxInline/signature/recursion.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM // FILE: 1.kt // WITH_REFLECT