Skip to content

Commit 14b0680

Browse files
udalovSpace Team
authored and
Space Team
committed
JVM: move JvmBackendErrors from 'frontend.java' to 'backend.jvm'
1 parent 584c5e4 commit 14b0680

File tree

10 files changed

+9
-12
lines changed

10 files changed

+9
-12
lines changed

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
package org.jetbrains.kotlin.backend.jvm.codegen
77

88
import org.jetbrains.kotlin.backend.jvm.InlineClassAbi
9+
import org.jetbrains.kotlin.backend.jvm.JvmBackendErrors
910
import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin
10-
import org.jetbrains.kotlin.ir.util.erasedUpperBound
1111
import org.jetbrains.kotlin.backend.jvm.ir.hasContinuation
1212
import org.jetbrains.kotlin.backend.jvm.ir.isReadOfCrossinline
1313
import org.jetbrains.kotlin.backend.jvm.ir.suspendFunctionOriginal
@@ -23,7 +23,6 @@ import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin
2323
import org.jetbrains.kotlin.ir.types.*
2424
import org.jetbrains.kotlin.ir.util.*
2525
import org.jetbrains.kotlin.ir.util.isNullable
26-
import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmBackendErrors
2726
import org.jetbrains.org.objectweb.asm.MethodVisitor
2827
import org.jetbrains.org.objectweb.asm.Type
2928
import org.jetbrains.org.objectweb.asm.tree.MethodNode

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

+1-1
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.jvm.JvmBackendErrors
89
import org.jetbrains.kotlin.backend.jvm.ir.fileParent
910
import org.jetbrains.kotlin.backend.jvm.ir.psiElement
1011
import org.jetbrains.kotlin.backend.jvm.ir.suspendFunctionOriginal
@@ -14,7 +15,6 @@ import org.jetbrains.kotlin.codegen.inline.GlobalInlineContext
1415
import org.jetbrains.kotlin.ir.IrElement
1516
import org.jetbrains.kotlin.ir.descriptors.toIrBasedDescriptor
1617
import org.jetbrains.kotlin.ir.expressions.IrFunctionAccessExpression
17-
import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmBackendErrors
1818

1919
interface IrInlineCallGenerator : IrCallGenerator {
2020
override fun genCall(

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package org.jetbrains.kotlin.backend.jvm.codegen
77

88
import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
9+
import org.jetbrains.kotlin.backend.jvm.JvmBackendErrors
910
import org.jetbrains.kotlin.backend.jvm.intrinsics.SignatureString
1011
import org.jetbrains.kotlin.backend.jvm.ir.getCallableReferenceOwnerKClassType
1112
import org.jetbrains.kotlin.backend.jvm.ir.getCallableReferenceTopLevelFlag
@@ -24,7 +25,6 @@ import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable
2425
import org.jetbrains.kotlin.ir.util.render
2526
import org.jetbrains.kotlin.name.Name
2627
import org.jetbrains.kotlin.resolve.jvm.AsmTypes.*
27-
import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmBackendErrors
2828
import org.jetbrains.kotlin.types.KotlinType
2929
import org.jetbrains.kotlin.types.model.TypeParameterMarker
3030
import org.jetbrains.org.objectweb.asm.Type

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package org.jetbrains.kotlin.backend.jvm.codegen
77

88
import com.intellij.openapi.util.TextRange
9+
import org.jetbrains.kotlin.backend.jvm.JvmBackendErrors
910
import org.jetbrains.kotlin.backend.jvm.JvmEvaluatorData
1011
import org.jetbrains.kotlin.backend.jvm.hasMangledReturnType
1112
import org.jetbrains.kotlin.backend.jvm.ir.*
@@ -23,7 +24,6 @@ import org.jetbrains.kotlin.ir.expressions.IrFunctionAccessExpression
2324
import org.jetbrains.kotlin.ir.expressions.IrLoop
2425
import org.jetbrains.kotlin.ir.util.*
2526
import org.jetbrains.kotlin.psi.doNotAnalyze
26-
import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmBackendErrors
2727
import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature
2828
import org.jetbrains.org.objectweb.asm.Label
2929
import org.jetbrains.org.objectweb.asm.Type

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
package org.jetbrains.kotlin.backend.jvm.codegen
77

88
import org.jetbrains.kotlin.backend.common.linkage.issues.SignatureClashDetector
9+
import org.jetbrains.kotlin.backend.jvm.JvmBackendErrors
910
import org.jetbrains.kotlin.ir.IrDiagnosticReporter
1011
import org.jetbrains.kotlin.ir.declarations.IrField
11-
import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmBackendErrors
1212
import org.jetbrains.kotlin.resolve.jvm.diagnostics.RawSignature
1313

1414
internal class JvmFieldSignatureClashDetector(

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.backend.jvm.codegen
77

88
import org.jetbrains.kotlin.backend.common.linkage.issues.SignatureClashDetector
99
import org.jetbrains.kotlin.backend.common.lower.ANNOTATION_IMPLEMENTATION
10+
import org.jetbrains.kotlin.backend.jvm.JvmBackendErrors
1011
import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin
1112
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
1213
import org.jetbrains.kotlin.diagnostics.KtDiagnosticFactory1
@@ -20,7 +21,6 @@ import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
2021
import org.jetbrains.kotlin.ir.descriptors.toIrBasedDescriptor
2122
import org.jetbrains.kotlin.ir.util.isFakeOverride
2223
import org.jetbrains.kotlin.resolve.MemberComparator
23-
import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmBackendErrors
2424
import org.jetbrains.kotlin.resolve.jvm.diagnostics.MemberKind
2525
import org.jetbrains.kotlin.resolve.jvm.diagnostics.RawSignature
2626

compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/GenerateMultifileFacades.kt

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities
3838
import org.jetbrains.kotlin.name.JvmStandardClassIds
3939
import org.jetbrains.kotlin.name.JvmStandardClassIds.JVM_SYNTHETIC_ANNOTATION_FQ_NAME
4040
import org.jetbrains.kotlin.resolve.inline.INLINE_ONLY_ANNOTATION_FQ_NAME
41-
import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmBackendErrors
4241
import org.jetbrains.kotlin.utils.addToStdlib.assignFrom
4342

4443
/**

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendContext.kt

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import org.jetbrains.kotlin.ir.util.SymbolTable
3737
import org.jetbrains.kotlin.ir.util.dump
3838
import org.jetbrains.kotlin.ir.util.render
3939
import org.jetbrains.kotlin.resolve.jvm.JvmClassName
40-
import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmBackendErrors
4140
import org.jetbrains.org.objectweb.asm.Type
4241

4342
@OptIn(ObsoleteDescriptorBasedAPI::class)
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
2-
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
2+
* Copyright 2010-2025 JetBrains s.r.o. and Kotlin Programming Language contributors.
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
44
*/
55

6-
package org.jetbrains.kotlin.resolve.jvm.diagnostics
6+
package org.jetbrains.kotlin.backend.jvm
77

88
import com.intellij.psi.PsiElement
99
import org.jetbrains.kotlin.diagnostics.KtDiagnosticFactoryToRendererMap

plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/irLowerings/scriptingLoweringVisitors.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.backend.common.extensions.ExperimentalAPIForScriptin
1111
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
1212
import org.jetbrains.kotlin.backend.common.lower.ClosureAnnotator
1313
import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
14+
import org.jetbrains.kotlin.backend.jvm.JvmBackendErrors
1415
import org.jetbrains.kotlin.backend.jvm.JvmInnerClassesSupport
1516
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
1617
import org.jetbrains.kotlin.diagnostics.KtDiagnosticFactory1
@@ -35,7 +36,6 @@ import org.jetbrains.kotlin.ir.visitors.IrVisitorVoid
3536
import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
3637
import org.jetbrains.kotlin.name.Name
3738
import org.jetbrains.kotlin.name.SpecialNames
38-
import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmBackendErrors
3939
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
4040

4141
internal data class ScriptLikeToClassTransformerContext(

0 commit comments

Comments
 (0)