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

Rework support of Iterator.iterator optimization in ForLoopsLowering

Browse Source 
- Fix the predicate used for finding the member function `next`: check
  that there's no extension receiver parameter, don't filter out
  abstract functions.
- Do not copy iterator expression, instead change the type in all
  references to the iterator variable.
- Fix some style issues.

 #KT-47171 Fixed
This commit is contained in:
Alexander Udalov
2022-02-25 23:24:35 +01:00
committed by Alexander Udalov
parent 1b776bd5b6
commit 157db778fd
15 changed files with 293 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+33 -18
View File
@@ -7173,6 +7173,39 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
}
}
@TestMetadata("compiler/testData/codegen/box/controlStructures/forInIterator")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class ForInIterator extends AbstractLightAnalysisModeTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
}
@TestMetadata("abstractNext.kt")
public void testAbstractNext() throws Exception {
runTest("compiler/testData/codegen/box/controlStructures/forInIterator/abstractNext.kt");
}
public void testAllFilesPresentInForInIterator() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/controlStructures/forInIterator"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
}
@TestMetadata("primitiveIterator.kt")
public void testPrimitiveIterator() throws Exception {
runTest("compiler/testData/codegen/box/controlStructures/forInIterator/primitiveIterator.kt");
}
@TestMetadata("uintIterator.kt")
public void testUintIterator() throws Exception {
runTest("compiler/testData/codegen/box/controlStructures/forInIterator/uintIterator.kt");
}
@TestMetadata("unrelatedExtensionFunctionNext.kt")
public void testUnrelatedExtensionFunctionNext() throws Exception {
runTest("compiler/testData/codegen/box/controlStructures/forInIterator/unrelatedExtensionFunctionNext.kt");
}
}
@TestMetadata("compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
@@ -13929,24 +13962,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
}
}
@TestMetadata("compiler/testData/codegen/box/forLoop")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class ForLoop extends AbstractLightAnalysisModeTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
}
public void testAllFilesPresentInForLoop() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/forLoop"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
}
@TestMetadata("forInIterator.kt")
public void testForInIterator() throws Exception {
runTest("compiler/testData/codegen/box/forLoop/forInIterator.kt");
}
}
@TestMetadata("compiler/testData/codegen/box/fullJdk")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)