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

Disallow non-local break/continue in crossinline lambdas

Browse Source
This commit is contained in:
Pavel Mikhailovskii
2022-09-09 19:24:02 +02:00
committed by Space
parent 79885c770d
commit fe5a6fd511
20 changed files with 137 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
Generated
+12
View File
@@ -6290,6 +6290,18 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/controlStructures"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
}
@Test
@TestMetadata("breakContinueInCrossInlineLambda.kt")
public void testBreakContinueInCrossInlineLambda() throws Exception {
runTest("compiler/testData/diagnostics/tests/controlStructures/breakContinueInCrossInlineLambda.kt");
}
@Test
@TestMetadata("breakContinueInNoInlineLambda.kt")
public void testBreakContinueInNoInlineLambda() throws Exception {
runTest("compiler/testData/diagnostics/tests/controlStructures/breakContinueInNoInlineLambda.kt");
}
@Test
@TestMetadata("breakToLabel.kt")
public void testBreakToLabel() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
Generated
+12
View File
@@ -6290,6 +6290,18 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/controlStructures"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
}
@Test
@TestMetadata("breakContinueInCrossInlineLambda.kt")
public void testBreakContinueInCrossInlineLambda() throws Exception {
runTest("compiler/testData/diagnostics/tests/controlStructures/breakContinueInCrossInlineLambda.kt");
}
@Test
@TestMetadata("breakContinueInNoInlineLambda.kt")
public void testBreakContinueInNoInlineLambda() throws Exception {
runTest("compiler/testData/diagnostics/tests/controlStructures/breakContinueInNoInlineLambda.kt");
}
@Test
@TestMetadata("breakToLabel.kt")
public void testBreakToLabel() throws Exception {
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirBreakOrContinueJumpsAcrossFunctionBoundaryChecker.kt
+3 -1
View File
@@ -67,7 +67,9 @@ object FirBreakOrContinueJumpsAcrossFunctionBoundaryChecker : FirLoopJumpChecker
val symbol = if (allowInlined) element.calleeReference.resolvedSymbol as? FirFunctionSymbol else null
element.arguments.forEachIndexed { i, argument ->
val expressionToCheck =
if (symbol?.resolvedStatus?.isInline == true && !symbol.valueParameterSymbols[i].isNoinline) argument.tryInline() else argument
if (symbol?.resolvedStatus?.isInline == true
&& !symbol.valueParameterSymbols[i].run { isNoinline || isCrossinline }
) argument.tryInline() else argument
if (findPathAndCheck(expressionToCheck)) {
return true
}
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/Fir2IrTextTestGenerated.java
Generated
-6
View File
@@ -1250,12 +1250,6 @@ public class Fir2IrTextTestGenerated extends AbstractFir2IrTextTest {
runTest("compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.kt");
}
@Test
@TestMetadata("breakContinueInNoInlineLambda.kt")
public void testBreakContinueInNoInlineLambda() throws Exception {
runTest("compiler/testData/ir/irText/expressions/breakContinueInNoInlineLambda.kt");
}
@Test
@TestMetadata("breakContinueInWhen.kt")
public void testBreakContinueInWhen() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/LightTreeFir2IrTextTestGenerated.java
Generated
-6
View File
@@ -1250,12 +1250,6 @@ public class LightTreeFir2IrTextTestGenerated extends AbstractLightTreeFir2IrTex
runTest("compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.kt");
}
@Test
@TestMetadata("breakContinueInNoInlineLambda.kt")
public void testBreakContinueInNoInlineLambda() throws Exception {
runTest("compiler/testData/ir/irText/expressions/breakContinueInNoInlineLambda.kt");
}
@Test
@TestMetadata("breakContinueInWhen.kt")
public void testBreakContinueInWhen() throws Exception {