From f26a3150bae415b22e843280dab04818492f5dd1 Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Mon, 25 May 2020 22:29:39 +0700
Subject: [PATCH] [Commonizer] Explicitly check if annotation constants are
 allowed

---
 .../kotlin/descriptors/commonizer/mergedtree/ir/CirProperty.kt | 3 ++-
 .../jetbrains/kotlin/descriptors/commonizer/utils/constants.kt | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirProperty.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirProperty.kt
index 9b3f12f8cec..c8e32ecd252 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirProperty.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirProperty.kt
@@ -62,7 +62,8 @@ class CirPropertyImpl(original: PropertyDescriptor) : CirFunctionOrPropertyImpl<
         compileTimeInitializer?.let { compileTimeInitializer ->
             checkConstantSupportedInCommonization(
                 constantValue = compileTimeInitializer,
-                owner = original
+                owner = original,
+                allowAnnotationValues = false
             )
         }
     }
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/constants.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/constants.kt
index e08ade191bf..ef0e920246a 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/constants.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/constants.kt
@@ -12,7 +12,7 @@ internal fun checkConstantSupportedInCommonization(
     constantValue: ConstantValue<*>,
     constantName: Name? = null,
     owner: Any,
-    allowAnnotationValues: Boolean = false,
+    allowAnnotationValues: Boolean,
     onError: (String) -> Nothing = ::error
 ) {
     checkConstantSupportedInCommonization(