From 560f1483e8fa71b258e6cc205f200625f92736f5 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 26 Jul 2019 15:37:27 +0300 Subject: [PATCH] Drop MaxPermSize support from compiler daemon #KT-17045 Fixed --- .../src/org/jetbrains/kotlin/daemon/common/DaemonParams.kt | 4 +--- .../tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt | 4 ++-- .../daemon/experimental/integration/CompilerDaemonTest.kt | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/DaemonParams.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/DaemonParams.kt index 8fc00c78701..e8874b9c421 100644 --- a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/DaemonParams.kt +++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/DaemonParams.kt @@ -186,14 +186,12 @@ fun Iterable.filterExtractProps(vararg groups: OptionsGroup, prefix: Str data class DaemonJVMOptions( var maxMemory: String = "", - var maxPermSize: String = "", var maxMetaspaceSize: String = "", var reservedCodeCacheSize: String = "", var jvmParams: MutableCollection = arrayListOf() ) : OptionsGroup { override val mappers: List> get() = listOf(StringPropMapper(this, DaemonJVMOptions::maxMemory, listOf("Xmx"), mergeDelimiter = ""), - StringPropMapper(this, DaemonJVMOptions::maxPermSize, listOf("XX:MaxPermSize"), mergeDelimiter = "="), StringPropMapper(this, DaemonJVMOptions::maxMetaspaceSize, listOf("XX:MaxMetaspaceSize"), mergeDelimiter = "="), StringPropMapper(this, DaemonJVMOptions::reservedCodeCacheSize, listOf("XX:ReservedCodeCacheSize"), mergeDelimiter = "="), restMapper) @@ -368,7 +366,7 @@ private fun String.memToBytes(): Long? = private val daemonJVMOptionsMemoryProps = - listOf(DaemonJVMOptions::maxMemory, DaemonJVMOptions::maxPermSize, DaemonJVMOptions::maxMetaspaceSize, DaemonJVMOptions::reservedCodeCacheSize) + listOf(DaemonJVMOptions::maxMemory, DaemonJVMOptions::maxMetaspaceSize, DaemonJVMOptions::reservedCodeCacheSize) infix fun DaemonJVMOptions.memorywiseFitsInto(other: DaemonJVMOptions): Boolean = daemonJVMOptionsMemoryProps diff --git a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt index 0e05bb02a8c..ed8ffce29a3 100644 --- a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt @@ -160,10 +160,10 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() { fun testDaemonJvmOptionsParsing() { val backupJvmOptions = System.getProperty(COMPILE_DAEMON_JVM_OPTIONS_PROPERTY) try { - System.setProperty(COMPILE_DAEMON_JVM_OPTIONS_PROPERTY, "-aaa,-bbb\\,ccc,-ddd,-Xmx200m,-XX:MaxPermSize=10k,-XX:ReservedCodeCacheSize=100,-xxx\\,yyy") + System.setProperty(COMPILE_DAEMON_JVM_OPTIONS_PROPERTY, "-aaa,-bbb\\,ccc,-ddd,-Xmx200m,-XX:MaxMetaspaceSize=10k,-XX:ReservedCodeCacheSize=100,-xxx\\,yyy") val opts = configureDaemonJVMOptions(inheritMemoryLimits = false, inheritAdditionalProperties = false, inheritOtherJvmOptions = false) assertEquals("200m", opts.maxMemory) - assertEquals("10k", opts.maxPermSize) + assertEquals("10k", opts.maxMetaspaceSize) assertEquals("100", opts.reservedCodeCacheSize) assertEquals(arrayListOf("aaa", "bbb,ccc", "ddd", "xxx,yyy"), opts.jvmParams) diff --git a/compiler/tests/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt b/compiler/tests/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt index 93cf4fcf083..804fdacd0a1 100644 --- a/compiler/tests/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt @@ -230,12 +230,12 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() { try { System.setProperty( COMPILE_DAEMON_JVM_OPTIONS_PROPERTY, - "-aaa,-bbb\\,ccc,-ddd,-Xmx200m,-XX:MaxPermSize=10k,-XX:ReservedCodeCacheSize=100,-xxx\\,yyy" + "-aaa,-bbb\\,ccc,-ddd,-Xmx200m,-XX:MaxMetaspaceSize=10k,-XX:ReservedCodeCacheSize=100,-xxx\\,yyy" ) val opts = configureDaemonJVMOptions(inheritMemoryLimits = false, inheritAdditionalProperties = false, inheritOtherJvmOptions = false) assertEquals("200m", opts.maxMemory) - assertEquals("10k", opts.maxPermSize) + assertEquals("10k", opts.maxMetaspaceSize) assertEquals("100", opts.reservedCodeCacheSize) assertEquals(arrayListOf("aaa", "bbb,ccc", "ddd", "xxx,yyy"), opts.jvmParams)