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

Revert "[light classes] drop old light classes and backend: iteration #8"

Browse Source 
This reverts commit 0df6ac688a.
This commit is contained in:
Dmitry Gridin
2022-06-28 13:52:08 +02:00
parent 38c623bc3a
commit 91fa6af556
4 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt
+1 -1
View File
@@ -46,7 +46,7 @@ class CliLightClassGenerationSupport(
private class CliLightClassSupport( private class CliLightClassSupport(
private val project: Project, private val project: Project,
override val languageVersionSettings: LanguageVersionSettings, override val languageVersionSettings: LanguageVersionSettings,
override val jvmTarget: JvmTarget private val jvmTarget: JvmTarget
) : KtUltraLightSupport { ) : KtUltraLightSupport {
// This is the way to untie CliLightClassSupport and CliLightClassGenerationSupport to prevent descriptors leak // This is the way to untie CliLightClassSupport and CliLightClassGenerationSupport to prevent descriptors leak
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightSupport.kt
-5
View File
@@ -6,9 +6,6 @@
package org.jetbrains.kotlin.asJava.classes package org.jetbrains.kotlin.asJava.classes
import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
import org.jetbrains.kotlin.config.JvmAnalysisFlags
import org.jetbrains.kotlin.config.JvmDefaultMode
import org.jetbrains.kotlin.config.JvmTarget
import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.config.LanguageVersionSettings
import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
@@ -21,8 +18,6 @@ interface KtUltraLightSupport {
val typeMapper: KotlinTypeMapper val typeMapper: KotlinTypeMapper
val moduleDescriptor: ModuleDescriptor val moduleDescriptor: ModuleDescriptor
val languageVersionSettings: LanguageVersionSettings val languageVersionSettings: LanguageVersionSettings
val jvmTarget: JvmTarget
val jvmDefaultMode: JvmDefaultMode get() = languageVersionSettings.getFlag(JvmAnalysisFlags.jvmDefaultMode)
fun possiblyHasAlias(file: KtFile, shortName: Name): Boolean fun possiblyHasAlias(file: KtFile, shortName: Name): Boolean
} }
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightUtils.kt
+1 -1
View File
@@ -330,7 +330,7 @@ private fun KtUltraLightClass.lightMethod(
descriptor, descriptor,
OwnerKind.IMPLEMENTATION, OwnerKind.IMPLEMENTATION,
support.deprecationResolver, support.deprecationResolver,
support.jvmDefaultMode, support.typeMapper.jvmDefaultMode,
) )
packMethodFlags(asmFlags, JvmCodegenUtil.isJvmInterface(kotlinOrigin.resolve() as? ClassDescriptor)) packMethodFlags(asmFlags, JvmCodegenUtil.isJvmInterface(kotlinOrigin.resolve() as? ClassDescriptor))
} }
compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtToJvmAnnotationsConverter.kt
+1 -1
View File
@@ -87,7 +87,7 @@ internal fun PsiAnnotation.tryConvertAsTarget(support: KtUltraLightSupport): KtL
attributeValues ?: return null attributeValues ?: return null
val targetMapping = targetMappings.getValue(support.jvmTarget) val targetMapping = targetMappings.getValue(support.typeMapper.jvmTarget)
val convertedValues = attributeValues.mapNotNull { targetMapping[it] }.distinct() val convertedValues = attributeValues.mapNotNull { targetMapping[it] }.distinct()
val targetAttributes = "value" to ArrayValue(convertedValues) { module -> module.builtIns.array.defaultType } val targetAttributes = "value" to ArrayValue(convertedValues) { module -> module.builtIns.array.defaultType }