azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Commonizer] Explicitly check if annotation constants are allowed

Browse Source
This commit is contained in:
Dmitriy Dolovov
2020-05-25 22:29:39 +07:00
parent 0827d2e8a3
commit f26a3150ba
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirProperty.kt
+2 -1
View File
@@ -62,7 +62,8 @@ class CirPropertyImpl(original: PropertyDescriptor) : CirFunctionOrPropertyImpl<
compileTimeInitializer?.let { compileTimeInitializer -> compileTimeInitializer?.let { compileTimeInitializer ->
checkConstantSupportedInCommonization( checkConstantSupportedInCommonization(
constantValue = compileTimeInitializer, constantValue = compileTimeInitializer,
owner = original owner = original,
allowAnnotationValues = false
) )
} }
} }
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/constants.kt
+1 -1
View File
@@ -12,7 +12,7 @@ internal fun checkConstantSupportedInCommonization(
constantValue: ConstantValue<*>, constantValue: ConstantValue<*>,
constantName: Name? = null, constantName: Name? = null,
owner: Any, owner: Any,
allowAnnotationValues: Boolean = false, allowAnnotationValues: Boolean,
onError: (String) -> Nothing = ::error onError: (String) -> Nothing = ::error
) { ) {
checkConstantSupportedInCommonization( checkConstantSupportedInCommonization(