Move ClassId for `IntrinsicConstEvaluation` to `StandardClassIds`
^KTIJ-19863
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirConstChecks.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirConstChecks.kt
index 50052ad..51f5497 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirConstChecks.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirConstChecks.kt
@@ -39,7 +39,7 @@
val intrinsicConstEvaluation = session.languageVersionSettings.supportsFeature(LanguageFeature.IntrinsicConstEvaluation)
fun FirBasedSymbol<*>.canBeEvaluated(): Boolean {
- return intrinsicConstEvaluation && this.hasAnnotation(INTRINSIC_CONST_EVALUATION_ANNOTATION, session)
+ return intrinsicConstEvaluation && this.hasAnnotation(StandardClassIds.Annotations.IntrinsicConstEvaluation, session)
}
when {
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrTypeConverter.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrTypeConverter.kt
index 6b47acd..d034a34 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrTypeConverter.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrTypeConverter.kt
@@ -54,7 +54,7 @@
StandardClassIds.Double to irBuiltIns.doubleClass,
StandardClassIds.Char to irBuiltIns.charClass,
StandardClassIds.Array to irBuiltIns.arrayClass,
- INTRINSIC_CONST_EVALUATION_ANNOTATION to irBuiltIns.intrinsicConst
+ StandardClassIds.Annotations.IntrinsicConstEvaluation to irBuiltIns.intrinsicConst
)
}
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeUtils.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeUtils.kt
index 90f01d5..d00c317 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeUtils.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeUtils.kt
@@ -84,9 +84,6 @@
else
parameters.size + contextReceiverTypeRefs.size
-val EXTENSION_FUNCTION_ANNOTATION = ClassId.fromString("kotlin/ExtensionFunctionType")
-val INTRINSIC_CONST_EVALUATION_ANNOTATION = ClassId.fromString("kotlin/internal/IntrinsicConstEvaluation")
-
private fun FirAnnotation.isOfType(classId: ClassId): Boolean {
return (annotationTypeRef as? FirResolvedTypeRef)?.let { typeRef ->
(typeRef.type as? ConeClassLikeType)?.let {
@@ -96,7 +93,7 @@
}
val FirAnnotation.isExtensionFunctionAnnotationCall: Boolean
- get() = isOfType(EXTENSION_FUNCTION_ANNOTATION)
+ get() = isOfType(StandardClassIds.Annotations.ExtensionFunctionType)
fun List<FirAnnotation>.dropExtensionFunctionAnnotation(): List<FirAnnotation> {
return filterNot { it.isExtensionFunctionAnnotationCall }
diff --git a/core/compiler.common/src/org/jetbrains/kotlin/name/StandardClassIds.kt b/core/compiler.common/src/org/jetbrains/kotlin/name/StandardClassIds.kt
index 5a18b5c..2c9920d9 100644
--- a/core/compiler.common/src/org/jetbrains/kotlin/name/StandardClassIds.kt
+++ b/core/compiler.common/src/org/jetbrains/kotlin/name/StandardClassIds.kt
@@ -156,6 +156,7 @@
val HidesMembers = "HidesMembers".internalId()
val DynamicExtension = "DynamicExtension".internalId()
+ val IntrinsicConstEvaluation = "IntrinsicConstEvaluation".internalId()
val Retention = "Retention".annotationId()
val Target = "Target".annotationId()
