From d439bdd49fd3a6246bd7fc8d8c0083bc9c133097 Mon Sep 17 00:00:00 2001
From: aleksandrina-streltsova <alexandrina.streltsova@jetbrains.com>
Date: Tue, 20 Jun 2023 16:28:19 +0300
Subject: [PATCH] Move ClassId for `IntrinsicConstEvaluation` to
 `StandardClassIds`

^KTIJ-19863
---
 .../jetbrains/kotlin/fir/analysis/checkers/FirConstChecks.kt | 2 +-
 .../org/jetbrains/kotlin/fir/backend/Fir2IrTypeConverter.kt  | 2 +-
 .../tree/src/org/jetbrains/kotlin/fir/types/FirTypeUtils.kt  | 5 +----
 .../src/org/jetbrains/kotlin/name/StandardClassIds.kt        | 1 +
 4 files changed, 4 insertions(+), 6 deletions(-)

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 50052ad8468..51f54973667 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 @@ internal fun checkConstantArguments(
     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 6b47acd675e..d034a343d5c 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 @@ class Fir2IrTypeConverter(
             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 90f01d537fa..d00c31724ed 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 @@ val FirFunctionTypeRef.parametersCount: Int
     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 @@ private fun FirAnnotation.isOfType(classId: ClassId): Boolean {
 }
 
 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 5a18b5c224b..2c9920d9fed 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 @@ object StandardClassIds {
 
         val HidesMembers = "HidesMembers".internalId()
         val DynamicExtension = "DynamicExtension".internalId()
+        val IntrinsicConstEvaluation = "IntrinsicConstEvaluation".internalId()
 
         val Retention = "Retention".annotationId()
         val Target = "Target".annotationId()