ra/fernflower
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addressed review comments + additional test

Browse Source
This commit is contained in:
upnotes
2018-09-28 15:54:51 +02:00
committed by Roman Shevchenko
parent 44bfa867e5
commit eaa2830596
6 changed files with 171 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
View File

@@ -245,30 +245,33 @@ public class ClassesProcessor implements CodeConstants {
mt.expandData();
InstructionSequence seq = mt.getInstructionSequence();
int len = seq.length();
for (int i = 0; i < len; i++) {
Instruction instr = seq.getInstr(i);
switch(instr.opcode) {
case opc_checkcast:
case opc_instanceof:
if(cl.qualifiedName.equals(pool.getPrimitiveConstant(instr.operand(0)).getString())) {
ref_counter++;
ref_not_new = true;
}
break;
case opc_new:
case opc_anewarray:
case opc_multianewarray:
if(cl.qualifiedName.equals(pool.getPrimitiveConstant(instr.operand(0)).getString())) {
ref_counter++;
}
break;
case opc_getstatic:
case opc_putstatic:
if(cl.qualifiedName.equals(pool.getLinkConstant(instr.operand(0)).classname)) {
ref_counter++;
ref_not_new = true;
if(seq != null) {
int len = seq.length();
for (int i = 0; i < len; i++) {
Instruction instr = seq.getInstr(i);
switch(instr.opcode) {
case opc_checkcast:
case opc_instanceof:
if(cl.qualifiedName.equals(pool.getPrimitiveConstant(instr.operand(0)).getString())) {
ref_counter++;
ref_not_new = true;
}
break;
case opc_new:
case opc_anewarray:
case opc_multianewarray:
if(cl.qualifiedName.equals(pool.getPrimitiveConstant(instr.operand(0)).getString())) {
ref_counter++;
}
break;
case opc_getstatic:
case opc_putstatic:
if(cl.qualifiedName.equals(pool.getLinkConstant(instr.operand(0)).classname)) {
ref_counter++;
ref_not_new = true;
}
}
}
}

1
test/org/jetbrains/java/decompiler/SingleClassesTest.java
View File

@@ -123,6 +123,7 @@ public class SingleClassesTest {
@Test public void testGroovyClass() { doTest("pkg/TestGroovyClass"); }
@Test public void testGroovyTrait() { doTest("pkg/TestGroovyTrait"); }
@Test public void testPrivateClasses() { doTest("pkg/PrivateClasses"); }
@Test public void testSuspendLambdaKt() { doTest("pkg/TestSuspendLambdaKt"); }
private void doTest(String testFile, String... companionFiles) {
ConsoleDecompiler decompiler = fixture.getDecompiler();

BIN
testData/classes/pkg/TestSuspendLambdaKt$sl1$1.class Normal file
View File

Binary file not shown.

BIN
testData/classes/pkg/TestSuspendLambdaKt.class Normal file
View File

Binary file not shown.

139
testData/results/TestSuspendLambdaKt.dec Normal file
View File

@@ -0,0 +1,139 @@
import kotlin.Metadata;
import kotlin.Unit;
import kotlin.SuccessOrFailure.Failure;
import kotlin.coroutines.Continuation;
import kotlin.coroutines.intrinsics.IntrinsicsKt;
import kotlin.coroutines.jvm.internal.SuspendLambda;
import kotlin.jvm.functions.Function1;
import kotlin.jvm.internal.Intrinsics;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@Metadata(
mv = {1, 1, 11},
bv = {1, 0, 2},
k = 2,
xi = 2,
d1 = {"\u0000\u0016\n\u0000\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\u0010\u0002\n\u0002\u0010\u0000\n\u0002\b\u0003\",\u0010\u0000\u001a\u0018\b\u0001\u0012\n\u0012\b\u0012\u0004\u0012\u00020\u00030\u0002\u0012\u0006\u0012\u0004\u0018\u00010\u00040\u0001ø\u0001\u0000¢\u0006\n\n\u0002\u0010\u0007\u001a\u0004\b\u0005\u0010\u0006\u0082\u0002\u0004\n\u0002\b\u0019"},
d2 = {"sl1", "Lkotlin/Function1;", "Lkotlin/coroutines/Continuation;", "", "", "getSl1", "()Lkotlin/jvm/functions/Function1;", "Lkotlin/jvm/functions/Function1;"}
)
public final class TestSuspendLambdaKt {
@NotNull
private static final Function1<Continuation<? super Unit>, Object> sl1;
@NotNull
public static final Function1<Continuation<? super Unit>, Object> getSl1() {
return sl1;
}
static {
@Metadata(
mv = {1, 1, 11},
bv = {1, 0, 2},
k = 3,
xi = 2,
d1 = {"\u0000\n\n\u0000\n\u0002\u0010\u0002\n\u0002\b\u0002\u0010\u0000\u001a\u00020\u0001H\u008a@ø\u0001\u0000¢\u0006\u0004\b\u0002\u0010\u0003"},
d2 = {"<anonymous>", "", "invoke", "(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;"}
)
final class NamelessClass_1 extends SuspendLambda implements Function1<Continuation<? super Unit>, Object> {
int label;
@Nullable
public final Object invokeSuspend(@NotNull Object var1) {
Object var3 = IntrinsicsKt.getCOROUTINE_SUSPENDED();
switch(this.label) {
case 0:
if (var1 instanceof Failure) {
throw ((Failure)var1).exception;
}
String var2 = "SL1";// 3
System.out.println(var2);
return Unit.INSTANCE;// 4
default:
throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine");
}
}
NamelessClass_1(Continuation var1) {
super(1, var1);
}
@NotNull
public final Continuation<Unit> create(@NotNull Continuation<? super Unit> continuation) {
Intrinsics.checkParameterIsNotNull(continuation, "continuation");
NamelessClass_1 var2 = new NamelessClass_1(continuation);
return var2;
}
@Nullable
public final Object invoke(@NotNull Continuation<? super Unit> continuation) {
return ((NamelessClass_1)this.create(continuation)).invokeSuspend(Unit.INSTANCE);
}
}
sl1 = (Function1)(new NamelessClass_1((Continuation)null));// 2
}
}
class 'TestSuspendLambdaKt' {
method 'getSl1 ()Lkotlin/jvm/functions/Function1;' {
0 25
3 25
}
method '<clinit> ()V' {
4 74
8 74
b 74
e 75
}
}
class 'TestSuspendLambdaKt$sl1$1' {
method 'invokeSuspend (Ljava/lang/Object;)Ljava/lang/Object;' {
0 42
3 42
5 43
8 43
1e 45
21 45
24 46
27 46
2a 46
2c 49
2e 49
2f 50
33 50
36 51
39 51
3e 53
43 53
}
method '<init> (Lkotlin/coroutines/Continuation;)V' {
1 58
3 58
6 59
}
method 'create (Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;' {
1 63
3 63
e 64
10 65
}
method 'invoke (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;' {
2 70
5 70
8 70
b 70
e 70
}
}
Lines mapping:
2 <-> 75
3 <-> 50
4 <-> 52

4
testData/src/pkg/TestSuspendLambda.kt Normal file
View File

@@ -0,0 +1,4 @@
val sl1: suspend () -> Unit = {
println("SL1")
}