Don't add Enum.entries to scope if it can't be called
^KT-53929 Fixed
This commit is contained in:
+16
@@ -0,0 +1,16 @@
|
||||
/*
|
||||
* Copyright 2010-2023 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.resolve.jvm
|
||||
|
||||
import org.jetbrains.kotlin.platform.TargetPlatform
|
||||
import org.jetbrains.kotlin.platform.jvm.isJvm
|
||||
import org.jetbrains.kotlin.serialization.deserialization.EnumEntriesDeserializationSupport
|
||||
|
||||
class EnumEntriesDeserializationSupportImpl(
|
||||
private val platform: TargetPlatform?,
|
||||
) : EnumEntriesDeserializationSupport {
|
||||
override fun canSynthesizeEnumEntries(): Boolean = platform.isJvm()
|
||||
}
|
||||
+3
-1
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.load.kotlin.PackagePartProvider
|
||||
import org.jetbrains.kotlin.name.ClassId
|
||||
import org.jetbrains.kotlin.name.FqName
|
||||
import org.jetbrains.kotlin.name.Name
|
||||
import org.jetbrains.kotlin.resolve.jvm.EnumEntriesDeserializationSupportImpl
|
||||
import org.jetbrains.kotlin.resolve.jvm.JvmCompilerDeserializationConfiguration
|
||||
import org.jetbrains.kotlin.resolve.sam.SamConversionResolver
|
||||
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
|
||||
@@ -61,7 +62,8 @@ class OptionalAnnotationPackageFragmentProvider(
|
||||
notFoundClasses,
|
||||
ContractDeserializer.DEFAULT,
|
||||
extensionRegistryLite = serializerProtocol.extensionRegistry,
|
||||
samConversionResolver = SamConversionResolver.Empty
|
||||
samConversionResolver = SamConversionResolver.Empty,
|
||||
enumEntriesDeserializationSupport = EnumEntriesDeserializationSupportImpl(module.platform),
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -135,7 +135,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
|
||||
this.kind = classLikeInfo.getClassKind();
|
||||
this.staticScope = kind == ClassKind.ENUM_CLASS ?
|
||||
new StaticScopeForKotlinEnum(
|
||||
storageManager, this
|
||||
storageManager, this, /* enumEntriesCanBeUsed = */ true
|
||||
) : MemberScope.Empty.INSTANCE;
|
||||
|
||||
this.typeConstructor = new LazyClassTypeConstructor();
|
||||
|
||||
+7
-1
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.library.unresolvedDependencies
|
||||
import org.jetbrains.kotlin.name.FqName
|
||||
import org.jetbrains.kotlin.name.Name
|
||||
import org.jetbrains.kotlin.name.parentOrNull
|
||||
import org.jetbrains.kotlin.platform.jvm.isJvm
|
||||
import org.jetbrains.kotlin.resolve.CompilerDeserializationConfiguration
|
||||
import org.jetbrains.kotlin.resolve.sam.SamConversionResolverImpl
|
||||
import org.jetbrains.kotlin.serialization.deserialization.*
|
||||
@@ -152,6 +153,10 @@ class KlibMetadataModuleDescriptorFactoryImpl(
|
||||
KlibMetadataSerializerProtocol
|
||||
)
|
||||
|
||||
val enumEntriesDeserializationSupport = object : EnumEntriesDeserializationSupport {
|
||||
override fun canSynthesizeEnumEntries(): Boolean = moduleDescriptor.platform.isJvm()
|
||||
}
|
||||
|
||||
val components = DeserializationComponents(
|
||||
storageManager,
|
||||
moduleDescriptor,
|
||||
@@ -168,7 +173,8 @@ class KlibMetadataModuleDescriptorFactoryImpl(
|
||||
ContractDeserializerImpl(configuration, storageManager),
|
||||
extensionRegistryLite = KlibMetadataSerializerProtocol.extensionRegistry,
|
||||
samConversionResolver = SamConversionResolverImpl(storageManager, samWithReceiverResolvers = emptyList()),
|
||||
platformDependentTypeTransformer = platformDependentTypeTransformer
|
||||
platformDependentTypeTransformer = platformDependentTypeTransformer,
|
||||
enumEntriesDeserializationSupport = enumEntriesDeserializationSupport,
|
||||
)
|
||||
|
||||
fragmentsToInitialize.forEach {
|
||||
|
||||
Reference in New Issue
Block a user