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

Move ClassId for IntrinsicConstEvaluation to StandardClassIds

Browse Source 
^KTIJ-19863
This commit is contained in:
aleksandrina-streltsova
2023-06-20 16:28:19 +03:00
committed by teamcity
parent 3477d35168
commit d439bdd49f
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirConstChecks.kt
+1 -1
View File
@@ -39,7 +39,7 @@ internal fun checkConstantArguments(
val intrinsicConstEvaluation = session.languageVersionSettings.supportsFeature(LanguageFeature.IntrinsicConstEvaluation) val intrinsicConstEvaluation = session.languageVersionSettings.supportsFeature(LanguageFeature.IntrinsicConstEvaluation)
fun FirBasedSymbol<*>.canBeEvaluated(): Boolean { fun FirBasedSymbol<*>.canBeEvaluated(): Boolean {
return intrinsicConstEvaluation && this.hasAnnotation(INTRINSIC_CONST_EVALUATION_ANNOTATION, session) return intrinsicConstEvaluation && this.hasAnnotation(StandardClassIds.Annotations.IntrinsicConstEvaluation, session)
} }
when { when {
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrTypeConverter.kt
+1 -1
View File
@@ -54,7 +54,7 @@ class Fir2IrTypeConverter(
StandardClassIds.Double to irBuiltIns.doubleClass, StandardClassIds.Double to irBuiltIns.doubleClass,
StandardClassIds.Char to irBuiltIns.charClass, StandardClassIds.Char to irBuiltIns.charClass,
StandardClassIds.Array to irBuiltIns.arrayClass, StandardClassIds.Array to irBuiltIns.arrayClass,
INTRINSIC_CONST_EVALUATION_ANNOTATION to irBuiltIns.intrinsicConst StandardClassIds.Annotations.IntrinsicConstEvaluation to irBuiltIns.intrinsicConst
) )
} }
compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeUtils.kt
+1 -4
View File
@@ -84,9 +84,6 @@ val FirFunctionTypeRef.parametersCount: Int
else else
parameters.size + contextReceiverTypeRefs.size 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 { private fun FirAnnotation.isOfType(classId: ClassId): Boolean {
return (annotationTypeRef as? FirResolvedTypeRef)?.let { typeRef -> return (annotationTypeRef as? FirResolvedTypeRef)?.let { typeRef ->
(typeRef.type as? ConeClassLikeType)?.let { (typeRef.type as? ConeClassLikeType)?.let {
@@ -96,7 +93,7 @@ private fun FirAnnotation.isOfType(classId: ClassId): Boolean {
} }
val FirAnnotation.isExtensionFunctionAnnotationCall: Boolean val FirAnnotation.isExtensionFunctionAnnotationCall: Boolean
get() = isOfType(EXTENSION_FUNCTION_ANNOTATION) get() = isOfType(StandardClassIds.Annotations.ExtensionFunctionType)
fun List<FirAnnotation>.dropExtensionFunctionAnnotation(): List<FirAnnotation> { fun List<FirAnnotation>.dropExtensionFunctionAnnotation(): List<FirAnnotation> {
return filterNot { it.isExtensionFunctionAnnotationCall } return filterNot { it.isExtensionFunctionAnnotationCall }
core/compiler.common/src/org/jetbrains/kotlin/name/StandardClassIds.kt
+1
View File
@@ -156,6 +156,7 @@ object StandardClassIds {
val HidesMembers = "HidesMembers".internalId() val HidesMembers = "HidesMembers".internalId()
val DynamicExtension = "DynamicExtension".internalId() val DynamicExtension = "DynamicExtension".internalId()
val IntrinsicConstEvaluation = "IntrinsicConstEvaluation".internalId()
val Retention = "Retention".annotationId() val Retention = "Retention".annotationId()
val Target = "Target".annotationId() val Target = "Target".annotationId()