From 12181d274bfb43ce7592bf183941f7a6b5974d4c Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 7 Sep 2015 20:53:19 +0300 Subject: [PATCH] Remove InlineRegistering interface --- .../kotlin/codegen/inline/InlineCodegen.java | 4 +--- .../components/IncrementalCache.kt | 4 ++-- .../components/InlineRegistering.kt | 21 ------------------- .../kotlinr/RemoteIncrementalCacheServer.kt | 5 +++-- .../jetbrains/kotlin/rmi/CompileService.kt | 3 +-- .../service/RemoteIncrementalCacheClient.kt | 7 ++++--- .../jps/incremental/IncrementalCacheImpl.kt | 9 ++------ 7 files changed, 13 insertions(+), 40 deletions(-) delete mode 100644 compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/components/InlineRegistering.kt diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java index abd3ae87a30..1d040069a92 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java @@ -32,7 +32,6 @@ import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache; import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents; -import org.jetbrains.kotlin.load.kotlin.incremental.components.InlineRegistering; import org.jetbrains.kotlin.modules.TargetId; import org.jetbrains.kotlin.name.ClassId; import org.jetbrains.kotlin.name.Name; @@ -754,7 +753,6 @@ public class InlineCodegen extends CallGenerator { IncrementalCache incrementalCache = incrementalCompilationComponents.getIncrementalCache(targetId); String sourceFile = getClassFilePath(sourceDescriptor, incrementalCache); String targetFile = getSourceFilePath(targetDescriptor); - InlineRegistering inlineRegistering = incrementalCache.getInlineRegistering(); - inlineRegistering.registerInline(sourceFile, jvmSignature.toString(), targetFile); + incrementalCache.registerInline(sourceFile, jvmSignature.toString(), targetFile); } } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/components/IncrementalCache.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/components/IncrementalCache.kt index cd99922c5da..71e65d08887 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/components/IncrementalCache.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/components/IncrementalCache.kt @@ -17,14 +17,14 @@ package org.jetbrains.kotlin.load.kotlin.incremental.components public interface IncrementalCache { - public fun getInlineRegistering(): InlineRegistering - public fun getObsoletePackageParts(): Collection public fun getPackagePartData(fqName: String): ByteArray? public fun getModuleMappingData(): ByteArray? + public fun registerInline(fromPath: String, jvmSignature: String, toPath: String) + public fun getClassFilePath(internalClassName: String): String public fun close() diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/components/InlineRegistering.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/components/InlineRegistering.kt deleted file mode 100644 index 3fd7f5759c7..00000000000 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/components/InlineRegistering.kt +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.load.kotlin.incremental.components - -interface InlineRegistering { - fun registerInline(fromPath: String, jvmSignature: String, toPath: String) -} \ No newline at end of file diff --git a/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/RemoteIncrementalCacheServer.kt b/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/RemoteIncrementalCacheServer.kt index b995499ddb3..eea9346850a 100644 --- a/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/RemoteIncrementalCacheServer.kt +++ b/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/RemoteIncrementalCacheServer.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.rmi.kotlinr import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache -import org.jetbrains.kotlin.load.kotlin.incremental.components.InlineRegistering import org.jetbrains.kotlin.rmi.CompileService import java.rmi.server.UnicastRemoteObject @@ -34,7 +33,9 @@ public class RemoteIncrementalCacheServer(val cache: IncrementalCache) : Compile override fun getModuleMappingData(): ByteArray? = cache.getModuleMappingData() - override fun getInlineRegistering(): InlineRegistering = cache.getInlineRegistering() + override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { + cache.registerInline(fromPath, jvmSignature, toPath) + } override fun getClassFilePath(internalClassName: String): String = cache.getClassFilePath(internalClassName) diff --git a/compiler/rmi/rmi-interface/src/org/jetbrains/kotlin/rmi/CompileService.kt b/compiler/rmi/rmi-interface/src/org/jetbrains/kotlin/rmi/CompileService.kt index a89c535793e..676adc3741c 100644 --- a/compiler/rmi/rmi-interface/src/org/jetbrains/kotlin/rmi/CompileService.kt +++ b/compiler/rmi/rmi-interface/src/org/jetbrains/kotlin/rmi/CompileService.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.rmi -import org.jetbrains.kotlin.load.kotlin.incremental.components.InlineRegistering import org.jetbrains.kotlin.modules.TargetId import java.rmi.Remote import java.rmi.RemoteException @@ -39,7 +38,7 @@ public interface CompileService : Remote { public fun getModuleMappingData(): ByteArray? throws(RemoteException::class) - public fun getInlineRegistering(): InlineRegistering + public fun registerInline(fromPath: String, jvmSignature: String, toPath: String) throws(RemoteException::class) fun getClassFilePath(internalClassName: String): String diff --git a/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/RemoteIncrementalCacheClient.kt b/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/RemoteIncrementalCacheClient.kt index c358fa9a280..0120c038a12 100644 --- a/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/RemoteIncrementalCacheClient.kt +++ b/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/RemoteIncrementalCacheClient.kt @@ -17,18 +17,19 @@ package org.jetbrains.kotlin.rmi.service import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache -import org.jetbrains.kotlin.load.kotlin.incremental.components.InlineRegistering import org.jetbrains.kotlin.rmi.CompileService public class RemoteIncrementalCacheClient(val cache: CompileService.RemoteIncrementalCache): IncrementalCache { - override fun getInlineRegistering(): InlineRegistering = cache.getInlineRegistering() - override fun getObsoletePackageParts(): Collection = cache.getObsoletePackageParts() override fun getPackagePartData(fqName: String): ByteArray? = cache.getPackagePartData(fqName) override fun getModuleMappingData(): ByteArray? = cache.getModuleMappingData() + override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { + cache.registerInline(fromPath, jvmSignature, toPath) + } + override fun getClassFilePath(internalClassName: String): String = cache.getClassFilePath(internalClassName) override fun close(): Unit = cache.close() diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index cc7b75b4dd0..58b8b0d2dc0 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -44,7 +44,6 @@ import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind import org.jetbrains.kotlin.load.kotlin.header.isCompatibleFileFacadeKind import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache -import org.jetbrains.kotlin.load.kotlin.incremental.components.InlineRegistering import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.resolve.jvm.JvmClassName.byInternalName import org.jetbrains.kotlin.serialization.Flags @@ -149,14 +148,10 @@ public class IncrementalCacheImpl( private val dependents = arrayListOf() private val outputDir = requireNotNull(target.outputDir) { "Target is expected to have output directory: $target" } - private val inlineRegistering = object : InlineRegistering { - override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { - inlinedTo.add(fromPath, jvmSignature, toPath) - } + override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { + inlinedTo.add(fromPath, jvmSignature, toPath) } - override fun getInlineRegistering(): InlineRegistering = inlineRegistering - public fun addDependentCache(cache: IncrementalCacheImpl) { dependents.add(cache) }