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

Save/restore stack in try-expressions (and statements).

Browse Source 
Parse TryCatchBlockNode's in generated bytecode, infer stack save/restore points.
Save stack to local variables before 'try'.
Restore stack after the beginning of try-block, catch-block, and default handler.
Integrate before/after inline markers rewriting (otherwise it'll break our stacks).

 #KT-3309 Fixed
This commit is contained in:
Dmitry Petrov
2015-06-26 10:18:42 +03:00
parent 534154e20d
commit 4e42cc6b81
41 changed files with 1572 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.java
+1 -1
View File
@@ -50,7 +50,7 @@ public abstract class AbstractBytecodeTextTest extends CodegenTestCase {
}
try {
assertEquals(expected.toString(), actual.toString());
assertEquals(text, expected.toString(), actual.toString());
}
catch (Throwable e) {
System.out.println(text);
compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
+1 -1
View File
@@ -246,7 +246,7 @@ public abstract class CodegenTestCase extends UsefulTestCase {
analyzer.analyze(classNode.name, method);
}
catch (Throwable e) {
System.out.println(file.asText());
System.err.println(file.asText());
System.err.println(classNode.name + "::" + method.name + method.desc);
//noinspection InstanceofCatchParameter
compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java
+123
View File
@@ -2289,6 +2289,129 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
doTest(fileName);
}
}
@TestMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class TryCatchInExpressions extends AbstractBlackBoxCodegenTest {
public void testAllFilesPresentInTryCatchInExpressions() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions"), Pattern.compile("^(.+)\\.kt$"), true);
}
@TestMetadata("catch.kt")
public void testCatch() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/catch.kt");
doTest(fileName);
}
@TestMetadata("complexChain.kt")
public void testComplexChain() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/complexChain.kt");
doTest(fileName);
}
@TestMetadata("differentTypes.kt")
public void testDifferentTypes() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/differentTypes.kt");
doTest(fileName);
}
@TestMetadata("expectException.kt")
public void testExpectException() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/expectException.kt");
doTest(fileName);
}
@TestMetadata("finally.kt")
public void testFinally() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/finally.kt");
doTest(fileName);
}
@TestMetadata("inlineTryCatch.kt")
public void testInlineTryCatch() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/inlineTryCatch.kt");
doTest(fileName);
}
@TestMetadata("inlineTryExpr.kt")
public void testInlineTryExpr() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/inlineTryExpr.kt");
doTest(fileName);
}
@TestMetadata("inlineTryFinally.kt")
public void testInlineTryFinally() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/inlineTryFinally.kt");
doTest(fileName);
}
@TestMetadata("multipleCatchBlocks.kt")
public void testMultipleCatchBlocks() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/multipleCatchBlocks.kt");
doTest(fileName);
}
@TestMetadata("splitTry.kt")
public void testSplitTry() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTry.kt");
doTest(fileName);
}
@TestMetadata("splitTryCorner1.kt")
public void testSplitTryCorner1() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner1.kt");
doTest(fileName);
}
@TestMetadata("splitTryCorner2.kt")
public void testSplitTryCorner2() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner2.kt");
doTest(fileName);
}
@TestMetadata("try.kt")
public void testTry() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/try.kt");
doTest(fileName);
}
@TestMetadata("tryAfterTry.kt")
public void testTryAfterTry() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryAfterTry.kt");
doTest(fileName);
}
@TestMetadata("tryAndBreak.kt")
public void testTryAndBreak() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryAndBreak.kt");
doTest(fileName);
}
@TestMetadata("tryAndContinue.kt")
public void testTryAndContinue() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryAndContinue.kt");
doTest(fileName);
}
@TestMetadata("tryInsideCatch.kt")
public void testTryInsideCatch() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryInsideCatch.kt");
doTest(fileName);
}
@TestMetadata("tryInsideTry.kt")
public void testTryInsideTry() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryInsideTry.kt");
doTest(fileName);
}
@TestMetadata("unmatchedInlineMarkers.kt")
public void testUnmatchedInlineMarkers() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/unmatchedInlineMarkers.kt");
doTest(fileName);
}
}
}
@TestMetadata("compiler/testData/codegen/box/deadCodeElimination")