jvm-abi-gen: Mark all anonymous objects in inline function scope as public
Anonymous objects inside of a private inline function nested in a public inline function can still escape.
This commit is contained in:
committed by
Alexander Udalov
parent
d94817cfb6
commit
3ffe495346
+14
-3
@@ -418,9 +418,20 @@ class PsiSourceCompilerForInline(
|
||||
fun DeclarationDescriptor.isInlineOrInsideInline(): Boolean =
|
||||
getInlineCallSiteVisibility() != null
|
||||
|
||||
fun DeclarationDescriptor.getInlineCallSiteVisibility(): DescriptorVisibility? =
|
||||
if (this is FunctionDescriptor && isInline) visibility
|
||||
else containingDeclaration?.getInlineCallSiteVisibility()
|
||||
fun DeclarationDescriptor.getInlineCallSiteVisibility(): DescriptorVisibility? {
|
||||
var declaration: DeclarationDescriptor? = this
|
||||
var result: DescriptorVisibility? = null
|
||||
while (declaration != null) {
|
||||
if (declaration is FunctionDescriptor && declaration.isInline) {
|
||||
if (!DescriptorVisibilities.isPrivate(declaration.visibility)) {
|
||||
return declaration.visibility
|
||||
}
|
||||
result = declaration.visibility
|
||||
}
|
||||
declaration = declaration.containingDeclaration
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
fun getDeclarationLabels(lambdaOrFun: PsiElement?, descriptor: DeclarationDescriptor): Set<String> {
|
||||
val result = HashSet<String>()
|
||||
|
||||
@@ -76,11 +76,10 @@ public class InlineUtil {
|
||||
|
||||
public static boolean isInPublicInlineScope(@Nullable DeclarationDescriptor descriptor) {
|
||||
if (descriptor == null) return false;
|
||||
if (isInline(descriptor)) {
|
||||
if (!(descriptor instanceof DeclarationDescriptorWithVisibility))
|
||||
return false;
|
||||
if (isInline(descriptor) && descriptor instanceof DeclarationDescriptorWithVisibility) {
|
||||
DescriptorVisibility visibility = ((DeclarationDescriptorWithVisibility) descriptor).getVisibility();
|
||||
return !DescriptorVisibilities.isPrivate(visibility);
|
||||
if (!DescriptorVisibilities.isPrivate(visibility))
|
||||
return true;
|
||||
}
|
||||
return isInPublicInlineScope(descriptor.getContainingDeclaration());
|
||||
}
|
||||
|
||||
@@ -13,10 +13,7 @@ import org.jetbrains.kotlin.backend.jvm.codegen.representativeUpperBound
|
||||
import org.jetbrains.kotlin.backend.jvm.lower.inlineclasses.unboxInlineClass
|
||||
import org.jetbrains.kotlin.codegen.inline.coroutines.FOR_INLINE_SUFFIX
|
||||
import org.jetbrains.kotlin.config.JvmDefaultMode
|
||||
import org.jetbrains.kotlin.descriptors.ClassKind
|
||||
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
|
||||
import org.jetbrains.kotlin.descriptors.DescriptorVisibility
|
||||
import org.jetbrains.kotlin.descriptors.Modality
|
||||
import org.jetbrains.kotlin.descriptors.*
|
||||
import org.jetbrains.kotlin.descriptors.deserialization.PLATFORM_DEPENDENT_ANNOTATION_FQ_NAME
|
||||
import org.jetbrains.kotlin.ir.IrBuiltIns
|
||||
import org.jetbrains.kotlin.ir.IrElement
|
||||
@@ -431,13 +428,17 @@ private val IrDeclaration.original: IrDeclaration
|
||||
// (determined *before* lowering), or null if the given declaration is not in the scope of an inline function.
|
||||
val IrDeclaration.inlineScopeVisibility: DescriptorVisibility?
|
||||
get() {
|
||||
var owner = original
|
||||
while (true) {
|
||||
var owner: IrDeclaration? = original
|
||||
var result: DescriptorVisibility? = null
|
||||
while (owner != null) {
|
||||
if (owner is IrFunction && owner.isInline) {
|
||||
return owner.visibility
|
||||
if (!DescriptorVisibilities.isPrivate(owner.visibility))
|
||||
return owner.visibility
|
||||
result = owner.visibility
|
||||
}
|
||||
owner = owner.parent.safeAs<IrDeclaration>()?.original ?: return null
|
||||
owner = owner.parent.safeAs<IrDeclaration>()?.original
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
// True for declarations which are in the scope of an externally visible inline function.
|
||||
|
||||
Reference in New Issue
Block a user