Implement unionTypeAttributes and replaceTypeAttributes in ConeInferenceContext

compiler/cli/cli-common/resources/META-INF/extensions/compiler.xml

@@ -11,8 +11,8 @@
         <extensionPoint qualifiedName="org.jetbrains.kotlin.extensions.internal.typeResolutionInterceptorExtension"
                         interface="org.jetbrains.kotlin.extensions.internal.TypeResolutionInterceptorExtension"
                         area="IDEA_PROJECT"/>
-        <extensionPoint qualifiedName="org.jetbrains.kotlin.extensions.TypeAttributeTranslatorExtension"
-                        interface="org.jetbrains.kotlin.extensions.TypeAttributeTranslatorExtension"
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.types.extensions.TypeAttributeTranslatorExtension"
+                        interface="org.jetbrains.kotlin.types.extensions.TypeAttributeTranslatorExtension"
                         area="IDEA_PROJECT"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.diagnosticSuppressor"
                         interface="org.jetbrains.kotlin.resolve.diagnostics.DiagnosticSuppressor"

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt

@@ -103,6 +103,7 @@ import org.jetbrains.kotlin.resolve.jvm.modules.JavaModuleResolver
 import org.jetbrains.kotlin.resolve.lazy.declarations.CliDeclarationProviderFactoryService
 import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService
 import org.jetbrains.kotlin.serialization.DescriptorSerializerPlugin
+import org.jetbrains.kotlin.types.extensions.TypeAttributeTranslators
 import org.jetbrains.kotlin.utils.PathUtil
 import java.io.File
 import java.nio.file.FileSystems

compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/ConeInferenceContext.kt

@@ -400,6 +400,20 @@ interface ConeInferenceContext : TypeSystemInferenceExtensionContext, ConeTypeCo
         return ConeIntegerLiteralTypeImpl.findCommonSuperType(explicitSupertypes)
     }
 
+    override fun unionTypeAttributes(types: List<KotlinTypeMarker>): List<AnnotationMarker> {
+        @Suppress("UNCHECKED_CAST")
+        types as List<ConeKotlinType>
+        return types.map { it.attributes }.reduce { x, y -> x.union(y) }.toList()
+    }
+
+    override fun KotlinTypeMarker.replaceTypeAttributes(newAttributes: List<AnnotationMarker>): KotlinTypeMarker {
+        require(this is ConeKotlinType)
+        val typeAttributes = newAttributes.filterIsInstance<ConeAttribute<*>>()
+        require(typeAttributes.size == newAttributes.size)
+        if (newAttributes.isEmpty()) return this
+        return createSimpleType(this.typeConstructor(), this.getArguments(), this.isNullable, this.isExtensionFunctionType, typeAttributes)
+    }
+
     override fun TypeConstructorMarker.getApproximatedIntegerLiteralType(): KotlinTypeMarker {
         require(this is ConeIntegerLiteralType)
         return this.getApproximatedType()

compiler/frontend/src/org/jetbrains/kotlin/extensions/TypeAttributeTranslators.kt

@@ -1,37 +0,0 @@
-/*
- * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.extensions
-
-import com.intellij.openapi.project.Project
-import org.jetbrains.kotlin.descriptors.annotations.Annotations
-import org.jetbrains.kotlin.types.*
-
-interface TypeAttributeTranslatorExtension : TypeAttributesTranslator
-
-class TypeAttributeTranslators(project: Project) {
-    val translators: List<TypeAttributesTranslator> =
-        getInstances(project) + DefaultTypeAttributesTranslator
-
-    fun toAttributes(annotations: Annotations): TypeAttributes {
-        val translated = translators.mapNotNull { translator ->
-            translator.toAttributes(annotations)
-        }.flatten()
-        return TypeAttributes.create(translated)
-    }
-
-    fun toAnnotations(attributes: TypeAttributes): Annotations {
-        val translated = translators.mapNotNull { translator ->
-            translator.toAnnotations(attributes)
-        }.flatten()
-        return Annotations.create(translated)
-    }
-
-    companion object :
-        ProjectExtensionDescriptor<TypeAttributeTranslatorExtension>(
-            "org.jetbrains.kotlin.extensions.typeAttribute",
-            TypeAttributeTranslatorExtension::class.java
-        )
-}

compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt

@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.descriptors.annotations.composeAnnotations
 import org.jetbrains.kotlin.descriptors.impl.VariableDescriptorImpl
 import org.jetbrains.kotlin.diagnostics.Errors
 import org.jetbrains.kotlin.diagnostics.Errors.*
-import org.jetbrains.kotlin.extensions.TypeAttributeTranslators
+import org.jetbrains.kotlin.types.extensions.TypeAttributeTranslators
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.*

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrTypeSystemContext.kt

@@ -383,6 +383,10 @@ interface IrTypeSystemContext : TypeSystemContext, TypeSystemCommonSuperTypesCon
     override fun findCommonIntegerLiteralTypesSuperType(explicitSupertypes: List<SimpleTypeMarker>): SimpleTypeMarker? =
         irBuiltIns.intType as IrSimpleType
 
+    override fun KotlinTypeMarker.replaceTypeAttributes(newAttributes: List<AnnotationMarker>): KotlinTypeMarker = this
+
+    override fun unionTypeAttributes(types: List<KotlinTypeMarker>): List<AnnotationMarker> = emptyList()
+
     override fun KotlinTypeMarker.isNullableType(): Boolean =
         this is IrType && isNullable()