From fc12f37105fcdf3fbf871d83667e905a228ad554 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 11 Jul 2017 09:00:38 +0200 Subject: [PATCH] Rolling back commits related to Unit -> Void? confersion in RMI interface since it breaks the compatibility and doesn't actually help - the problem with NoClassDef Unit is apparently elsewhere. --- .../BasicCompilerServicesWithResultsFacadeServer.kt | 3 +-- .../client/CompilerCallbackServicesFacadeServer.kt | 9 +++------ .../kotlin/daemon/client/KotlinCompilerClient.kt | 2 +- .../kotlin/daemon/client/RemoteInputStreamServer.kt | 3 +-- .../kotlin/daemon/client/RemoteOutputStreamServer.kt | 9 +++------ .../jetbrains/kotlin/daemon/common/CompilationResults.kt | 2 +- .../daemon/common/CompilerCallbackServicesFacade.kt | 6 +++--- .../kotlin/daemon/common/CompilerServicesFacadeBase.kt | 2 +- .../jetbrains/kotlin/daemon/common/RemoteInputStream.kt | 2 +- .../kotlin/daemon/common/RemoteOperationsTracer.kt | 4 ++-- .../jetbrains/kotlin/daemon/common/RemoteOutputStream.kt | 6 +++--- .../compilerRunner/JpsCompilerServicesFacadeImpl.kt | 3 +-- 12 files changed, 21 insertions(+), 30 deletions(-) diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/BasicCompilerServicesWithResultsFacadeServer.kt b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/BasicCompilerServicesWithResultsFacadeServer.kt index 3c297c1b2a6..94a936ea665 100644 --- a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/BasicCompilerServicesWithResultsFacadeServer.kt +++ b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/BasicCompilerServicesWithResultsFacadeServer.kt @@ -33,9 +33,8 @@ open class BasicCompilerServicesWithResultsFacadeServer( ) : CompilerServicesFacadeBase, UnicastRemoteObject(port, LoopbackNetworkInterface.clientLoopbackSocketFactory, LoopbackNetworkInterface.serverLoopbackSocketFactory) { - override fun report(category: Int, severity: Int, message: String?, attachment: Serializable?): Void? { + override fun report(category: Int, severity: Int, message: String?, attachment: Serializable?) { messageCollector.reportFromDaemon(outputsCollector, category, severity, message, attachment) - return null } } diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/CompilerCallbackServicesFacadeServer.kt b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/CompilerCallbackServicesFacadeServer.kt index 8bb190b8ff2..e632c6d2ae1 100644 --- a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/CompilerCallbackServicesFacadeServer.kt +++ b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/CompilerCallbackServicesFacadeServer.kt @@ -56,27 +56,24 @@ open class CompilerCallbackServicesFacadeServer( override fun incrementalCache_getModuleMappingData(target: TargetId): ByteArray? = incrementalCompilationComponents!!.getIncrementalCache(target).getModuleMappingData() - override fun incrementalCache_registerInline(target: TargetId, fromPath: String, jvmSignature: String, toPath: String): Void? { + override fun incrementalCache_registerInline(target: TargetId, fromPath: String, jvmSignature: String, toPath: String) { incrementalCompilationComponents!!.getIncrementalCache(target).registerInline(fromPath, jvmSignature, toPath) - return null } override fun incrementalCache_getClassFilePath(target: TargetId, internalClassName: String): String = incrementalCompilationComponents!!.getIncrementalCache(target).getClassFilePath(internalClassName) - override fun incrementalCache_close(target: TargetId): Void? { + override fun incrementalCache_close(target: TargetId) { incrementalCompilationComponents!!.getIncrementalCache(target).close() - return null } override fun lookupTracker_requiresPosition() = incrementalCompilationComponents!!.getLookupTracker().requiresPosition - override fun lookupTracker_record(lookups: Collection): Void? { + override fun lookupTracker_record(lookups: Collection) { val lookupTracker = incrementalCompilationComponents!!.getLookupTracker() for (it in lookups) { lookupTracker.record(it.filePath, it.position, it.scopeFqName, it.scopeKind, it.name) } - return null } private val lookupTracker_isDoNothing: Boolean = incrementalCompilationComponents?.getLookupTracker() === LookupTracker.DO_NOTHING diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt index 7dd1a424dd8..e95ec9d1961 100644 --- a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt +++ b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt @@ -444,7 +444,7 @@ class DaemonReportingTargets(val out: PrintStream? = null, val messageCollector: MessageCollector? = null, val compilerServices: CompilerServicesFacadeBase? = null) -internal fun DaemonReportingTargets.report(category: DaemonReportCategory, message: String, source: String? = null): Unit { +internal fun DaemonReportingTargets.report(category: DaemonReportCategory, message: String, source: String? = null) { val sourceMessage: String by lazy { source?.let { "[$it] $message" } ?: message } out?.println("${category.name}: $sourceMessage") messages?.add(DaemonReportMessage(category, sourceMessage)) diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/RemoteInputStreamServer.kt b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/RemoteInputStreamServer.kt index b58e466d200..95533c5555f 100644 --- a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/RemoteInputStreamServer.kt +++ b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/RemoteInputStreamServer.kt @@ -27,9 +27,8 @@ class RemoteInputStreamServer(val `in`: InputStream, port: Int = SOCKET_ANY_FREE : RemoteInputStream, UnicastRemoteObject(port, LoopbackNetworkInterface.clientLoopbackSocketFactory, LoopbackNetworkInterface.serverLoopbackSocketFactory) { - override fun close(): Void? { + override fun close() { `in`.close() - return null } override fun read(length: Int): ByteArray { diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/RemoteOutputStreamServer.kt b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/RemoteOutputStreamServer.kt index 3b211fa44b7..61a273841ce 100644 --- a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/RemoteOutputStreamServer.kt +++ b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/RemoteOutputStreamServer.kt @@ -28,18 +28,15 @@ class RemoteOutputStreamServer(val out: OutputStream, port: Int = SOCKET_ANY_FRE : RemoteOutputStream, UnicastRemoteObject(port, LoopbackNetworkInterface.clientLoopbackSocketFactory, LoopbackNetworkInterface.serverLoopbackSocketFactory) { - override fun close(): Void? { + override fun close() { out.close() - return null } - override fun write(data: ByteArray, offset: Int, length: Int): Void? { + override fun write(data: ByteArray, offset: Int, length: Int) { out.write(data, offset, length) - return null } - override fun write(dataByte: Int): Void? { + override fun write(dataByte: Int) { out.write(dataByte) - return null } } diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationResults.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationResults.kt index a92f5769d19..8c5e3ed2590 100644 --- a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationResults.kt +++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationResults.kt @@ -22,7 +22,7 @@ import java.rmi.RemoteException interface CompilationResults : Remote { @Throws(RemoteException::class) - fun add(compilationResultCategory: Int, value: Serializable): Void? + fun add(compilationResultCategory: Int, value: Serializable) } enum class CompilationResultCategory(val code: Int) { diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerCallbackServicesFacade.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerCallbackServicesFacade.kt index c0429a35e49..41649d69c52 100644 --- a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerCallbackServicesFacade.kt +++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerCallbackServicesFacade.kt @@ -56,13 +56,13 @@ interface CompilerCallbackServicesFacade : Remote { fun incrementalCache_getModuleMappingData(target: TargetId): ByteArray? @Throws(RemoteException::class) - fun incrementalCache_registerInline(target: TargetId, fromPath: String, jvmSignature: String, toPath: String): Void? + fun incrementalCache_registerInline(target: TargetId, fromPath: String, jvmSignature: String, toPath: String) @Throws(RemoteException::class) fun incrementalCache_getClassFilePath(target: TargetId, internalClassName: String): String @Throws(RemoteException::class) - fun incrementalCache_close(target: TargetId): Void? + fun incrementalCache_close(target: TargetId) @Throws(RemoteException::class) fun incrementalCache_getMultifileFacadeParts(target: TargetId, internalName: String): Collection? @@ -73,7 +73,7 @@ interface CompilerCallbackServicesFacade : Remote { fun lookupTracker_requiresPosition(): Boolean @Throws(RemoteException::class) - fun lookupTracker_record(lookups: Collection): Void? + fun lookupTracker_record(lookups: Collection) @Throws(RemoteException::class) fun lookupTracker_isDoNothing(): Boolean diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerServicesFacadeBase.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerServicesFacadeBase.kt index 5851471881b..0e65caa0de6 100644 --- a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerServicesFacadeBase.kt +++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerServicesFacadeBase.kt @@ -25,7 +25,7 @@ interface CompilerServicesFacadeBase : Remote { * Reports different kind of diagnostic messages from compile daemon to compile daemon clients (jps, gradle, ...) */ @Throws(RemoteException::class) - fun report(category: Int, severity: Int, message: String?, attachment: Serializable?): Void? + fun report(category: Int, severity: Int, message: String?, attachment: Serializable?) } enum class ReportCategory(val code: Int) { diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/RemoteInputStream.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/RemoteInputStream.kt index f9f245fd17e..e72f6731490 100644 --- a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/RemoteInputStream.kt +++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/RemoteInputStream.kt @@ -22,7 +22,7 @@ import java.rmi.RemoteException interface RemoteInputStream : Remote { @Throws(RemoteException::class) - fun close(): Void? + fun close() @Throws(RemoteException::class) fun read(length: Int): ByteArray diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/RemoteOperationsTracer.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/RemoteOperationsTracer.kt index 5d544f1c55b..b0731a01463 100644 --- a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/RemoteOperationsTracer.kt +++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/RemoteOperationsTracer.kt @@ -22,8 +22,8 @@ import java.rmi.RemoteException interface RemoteOperationsTracer : Remote { @Throws(RemoteException::class) - fun before(id: String): Void? + fun before(id: String) @Throws(RemoteException::class) - fun after(id: String): Void? + fun after(id: String) } diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/RemoteOutputStream.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/RemoteOutputStream.kt index e5aebcc47cf..3afe999e887 100644 --- a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/RemoteOutputStream.kt +++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/RemoteOutputStream.kt @@ -22,11 +22,11 @@ import java.rmi.RemoteException interface RemoteOutputStream : Remote { @Throws(RemoteException::class) - fun close(): Void? + fun close() @Throws(RemoteException::class) - fun write(data: ByteArray, offset: Int, length: Int): Void? + fun write(data: ByteArray, offset: Int, length: Int) @Throws(RemoteException::class) - fun write(dataByte: Int): Void? + fun write(dataByte: Int) } diff --git a/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt b/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt index 183c4bd11ac..3410543678a 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt @@ -32,10 +32,9 @@ internal class JpsCompilerServicesFacadeImpl( port), JpsCompilerServicesFacade { - override fun report(category: Int, severity: Int, message: String?, attachment: Serializable?): Void? { + override fun report(category: Int, severity: Int, message: String?, attachment: Serializable?) { env.messageCollector.reportFromDaemon( { outFile, srcFiles -> env.outputItemsCollector.add(srcFiles, outFile) }, category, severity, message, attachment) - return null } } \ No newline at end of file