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

Remove "legacy" mode of jvm-abi-gen plugin

Browse Source 
#KT-55375 Fixed
This commit is contained in:
Alexander Udalov
2023-03-03 23:52:42 +01:00
committed by Space Team
parent 77c68fc809
commit 9f269b83aa
35 changed files with 10 additions and 864 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
+1 -11
View File
@@ -461,10 +461,7 @@ public class FunctionCodegen {
boolean staticInCompanionObject
) {
OwnerKind contextKind = methodContext.getContextKind();
if (!state.getClassBuilderMode().generateBodies
|| isAbstractMethod(functionDescriptor, contextKind, state.getJvmDefaultMode())
|| shouldSkipMethodBodyInAbiMode(state.getClassBuilderMode(), origin)
) {
if (!state.getClassBuilderMode().generateBodies || isAbstractMethod(functionDescriptor, contextKind, state.getJvmDefaultMode())) {
generateLocalVariableTable(
mv,
jvmSignature,
@@ -497,13 +494,6 @@ public class FunctionCodegen {
endVisit(mv, null, origin.getElement());
}
private static boolean shouldSkipMethodBodyInAbiMode(@NotNull ClassBuilderMode classBuilderMode, @NotNull JvmDeclarationOrigin origin) {
if (classBuilderMode != ClassBuilderMode.ABI) return false;
DeclarationDescriptor descriptor = origin.getDescriptor();
return descriptor != null && !InlineUtil.isInlineOrContainingInline(descriptor);
}
public static void generateParameterAnnotations(
@NotNull FunctionDescriptor functionDescriptor,
@NotNull MethodVisitor mv,