From 893ac735bc5d226be37607f3997beb6e4250db73 Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Tue, 28 May 2019 15:56:39 +0300 Subject: [PATCH] Convert property initializer to getter in JvmPlatforms.unspecifiedJvmPlatform This unties static initialization loop which lead to NCDFE and other issues. --- .../src/org/jetbrains/kotlin/platform/jvm/JvmPlatform.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/platform/jvm/JvmPlatform.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/platform/jvm/JvmPlatform.kt index 5148586f34e..edc348b71a4 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/platform/jvm/JvmPlatform.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/platform/jvm/JvmPlatform.kt @@ -26,7 +26,8 @@ object JvmPlatforms { // as previously some clients used TargetPlatform just as platform-marker // and didn't care about particular jvmTarget. // TODO(dsavvinov): review all usages and choose proper JvmTarget - val unspecifiedJvmPlatform: TargetPlatform = CompatJvmPlatform + val unspecifiedJvmPlatform: TargetPlatform + get() = CompatJvmPlatform val defaultJvmPlatform: TargetPlatform = jvmTargetToJdkPlatform[JvmTarget.DEFAULT]!!