From e8659d4b37216f16d8b7459eafdf34ff6615401c Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 25 Jun 2020 14:19:27 +0200 Subject: [PATCH] Fix initializer error arizing on scripting annotation creation also fixes tests in main-kts --- .../src/org/jetbrains/kotlin/builtins/PrimitiveType.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/PrimitiveType.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/PrimitiveType.kt index 956b31cd4c6..f835fa9d000 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/PrimitiveType.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/PrimitiveType.kt @@ -34,9 +34,9 @@ enum class PrimitiveType(typeName: String) { val arrayTypeName: Name = Name.identifier("${typeName}Array") - val typeFqName: FqName = KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME.child(this.typeName) + val typeFqName: FqName by lazy(LazyThreadSafetyMode.PUBLICATION) { KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME.child(this.typeName) } - val arrayTypeFqName: FqName = KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME.child(arrayTypeName) + val arrayTypeFqName: FqName by lazy(LazyThreadSafetyMode.PUBLICATION) { KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME.child(arrayTypeName) } companion object { @JvmField