diff --git a/compiler/backend-common/build.gradle.kts b/compiler/backend-common/build.gradle.kts index ffe7f070ea8..9bd7b9cced4 100644 --- a/compiler/backend-common/build.gradle.kts +++ b/compiler/backend-common/build.gradle.kts @@ -9,7 +9,6 @@ dependencies { compile(project(":compiler:util")) compile(project(":compiler:frontend")) compile(project(":compiler:ir.tree")) - compile(project(":compiler:cli-common")) } sourceSets { diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/CommonBackendContext.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/CommonBackendContext.kt index 6a65cce7003..42f9b3ed7d9 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/CommonBackendContext.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/CommonBackendContext.kt @@ -2,13 +2,13 @@ package org.jetbrains.kotlin.backend.common import org.jetbrains.kotlin.backend.common.ir.Ir import org.jetbrains.kotlin.builtins.KOTLIN_REFLECT_FQ_NAME -import org.jetbrains.kotlin.cli.common.messages.MessageCollector -import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.incremental.components.NoLookupLocation +import org.jetbrains.kotlin.ir.IrElement +import org.jetbrains.kotlin.ir.declarations.IrFile import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.scopes.MemberScope @@ -35,7 +35,7 @@ interface CommonBackendContext : BackendContext { fun log(message: () -> String) - val messageCollector: MessageCollector + fun report(element: IrElement?, irFile: IrFile?, message: String, isError: Boolean) } class ReflectionTypes(module: ModuleDescriptor, internalPackage: FqName) { diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/Utils.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/Utils.kt index eaa9236628b..1cec73c0758 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/Utils.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/Utils.kt @@ -16,14 +16,11 @@ package org.jetbrains.kotlin.backend.common -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.declarations.IrFile -import org.jetbrains.kotlin.ir.util.getCompilerMessageLocation fun CommonBackendContext.reportWarning(message: String, irFile: IrFile, irElement: IrElement) { - val location = irElement.getCompilerMessageLocation(irFile) - messageCollector.report(CompilerMessageSeverity.WARNING, message, location) + report(irElement, irFile, message, false) } fun MutableList.push(element: E) = this.add(element) diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/util/IrUtils.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/util/IrUtils.kt index 445768a2772..629eac0e0ce 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/util/IrUtils.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/util/IrUtils.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.ir.util import org.jetbrains.kotlin.backend.common.atMostOne -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET @@ -122,16 +121,6 @@ fun IrExpression.isNullConst() = this is IrConst<*> && this.kind == IrConstKind. fun IrCall.usesDefaultArguments(): Boolean = this.descriptor.valueParameters.any { this.getValueArgument(it) == null } -fun IrElement.getCompilerMessageLocation(containingFile: IrFile): CompilerMessageLocation? { - val sourceRangeInfo = containingFile.fileEntry.getSourceRangeInfo(this.startOffset, this.endOffset) - return CompilerMessageLocation.create( - path = sourceRangeInfo.filePath, - line = sourceRangeInfo.startLineNumber, - column = sourceRangeInfo.startColumnNumber, - lineContent = null // TODO: retrieve the line content. - ) -} - fun IrFunction.createParameterDeclarations() { fun ParameterDescriptor.irValueParameter() = IrValueParameterImpl( innerStartOffset(this), innerEndOffset(this),