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

jvm-abi-gen: Strip inline functions in private classes

Browse Source 
Inline functions in private classes can only be accessed from Java and
we do not need to preserve their bodies for the abi.
This commit is contained in:
Steven Schäfer
2021-08-06 10:27:13 +02:00
committed by Alexander Udalov
parent 3ffe495346
commit 5059513106
12 changed files with 111 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineUtil.java
+6 -2
View File
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils;
import org.jetbrains.kotlin.resolve.DescriptorUtils;
import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt;
import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext;
import org.jetbrains.kotlin.resolve.calls.model.ArgumentMapping;
@@ -78,8 +79,11 @@ public class InlineUtil {
if (descriptor == null) return false;
if (isInline(descriptor) && descriptor instanceof DeclarationDescriptorWithVisibility) {
DescriptorVisibility visibility = ((DeclarationDescriptorWithVisibility) descriptor).getVisibility();
if (!DescriptorVisibilities.isPrivate(visibility))
return true;
if (!DescriptorVisibilities.isPrivate(visibility)) {
ClassDescriptor containingClass = DescriptorUtils.getContainingClass(descriptor);
if (containingClass == null || !DescriptorVisibilities.isPrivate(containingClass.getVisibility()))
return true;
}
}
return isInPublicInlineScope(descriptor.getContainingDeclaration());
}