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

[RAW FIR] Use range as source of desugared loop-related statements

Browse Source
This commit is contained in:
Kirill Rakhman
2023-08-24 16:37:41 +02:00
committed by Space Team
parent 61259ef34b
commit 411210b520
8 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolveWithStdlib/diagnostics/forLoopChecker.kt
Vendored
+2 -2
View File
@@ -101,9 +101,9 @@ fun test(
for (i in <!HAS_NEXT_MISSING, NEXT_MISSING!>notRange2<!>); for (i in <!HAS_NEXT_MISSING, NEXT_MISSING!>notRange2<!>);
for (i in <!NEXT_MISSING!>notRange3<!>); for (i in <!NEXT_MISSING!>notRange3<!>);
for (i in <!HAS_NEXT_MISSING!>notRange4<!>); for (i in <!HAS_NEXT_MISSING!>notRange4<!>);
<!CONDITION_TYPE_MISMATCH!>for (i in notRange5)<!>; for (i in <!CONDITION_TYPE_MISMATCH!>notRange5<!>);
for (i in notRange6); for (i in notRange6);
<!CONDITION_TYPE_MISMATCH!>for (i in notRange7)<!>; for (i in <!CONDITION_TYPE_MISMATCH!>notRange7<!>);
for (i in <!HAS_NEXT_MISSING!>notRange8<!>); for (i in <!HAS_NEXT_MISSING!>notRange8<!>);
for (i in <!OPERATOR_MODIFIER_REQUIRED, OPERATOR_MODIFIER_REQUIRED, OPERATOR_MODIFIER_REQUIRED!>notRange9<!>); for (i in <!OPERATOR_MODIFIER_REQUIRED, OPERATOR_MODIFIER_REQUIRED, OPERATOR_MODIFIER_REQUIRED!>notRange9<!>);
for (i in range0); for (i in range0);
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
+3 -3
View File
@@ -477,13 +477,13 @@ internal fun FirReference.statementOrigin(): IrStatementOrigin? = when (this) {
symbol.callableId.isInvoke() -> symbol.callableId.isInvoke() ->
IrStatementOrigin.INVOKE IrStatementOrigin.INVOKE
source?.elementType == KtNodeTypes.FOR && symbol.callableId.isIteratorNext() -> source?.kind == KtFakeSourceElementKind.DesugaredForLoop && symbol.callableId.isIteratorNext() ->
IrStatementOrigin.FOR_LOOP_NEXT IrStatementOrigin.FOR_LOOP_NEXT
source?.elementType == KtNodeTypes.FOR && symbol.callableId.isIteratorHasNext() -> source?.kind == KtFakeSourceElementKind.DesugaredForLoop && symbol.callableId.isIteratorHasNext() ->
IrStatementOrigin.FOR_LOOP_HAS_NEXT IrStatementOrigin.FOR_LOOP_HAS_NEXT
source?.elementType == KtNodeTypes.FOR && symbol.callableId.isIterator() -> source?.kind == KtFakeSourceElementKind.DesugaredForLoop && symbol.callableId.isIterator() ->
IrStatementOrigin.FOR_LOOP_ITERATOR IrStatementOrigin.FOR_LOOP_ITERATOR
source?.elementType == KtNodeTypes.OPERATION_REFERENCE -> source?.elementType == KtNodeTypes.OPERATION_REFERENCE ->
compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/LightTreeRawFirExpressionBuilder.kt
+10 -9
View File
@@ -1123,18 +1123,19 @@ class LightTreeRawFirExpressionBuilder(
val calculatedRangeExpression = val calculatedRangeExpression =
rangeExpression ?: buildErrorExpression(null, ConeSyntaxDiagnostic("No range in for loop")) rangeExpression ?: buildErrorExpression(null, ConeSyntaxDiagnostic("No range in for loop"))
val fakeSource = forLoop.toFirSourceElement(KtFakeSourceElementKind.DesugaredForLoop) val fakeSource = forLoop.toFirSourceElement(KtFakeSourceElementKind.DesugaredForLoop)
val rangeSource = calculatedRangeExpression.source?.fakeElement(KtFakeSourceElementKind.DesugaredForLoop)
val target: FirLoopTarget val target: FirLoopTarget
// NB: FirForLoopChecker relies on this block existence and structure // NB: FirForLoopChecker relies on this block existence and structure
return buildBlock { return buildBlock {
source = fakeSource source = fakeSource
val iteratorVal = generateTemporaryVariable( val iteratorVal = generateTemporaryVariable(
baseModuleData, baseModuleData,
calculatedRangeExpression.source?.fakeElement(KtFakeSourceElementKind.DesugaredForLoop), rangeSource,
SpecialNames.ITERATOR, SpecialNames.ITERATOR,
buildFunctionCall { buildFunctionCall {
source = fakeSource source = rangeSource
calleeReference = buildSimpleNamedReference { calleeReference = buildSimpleNamedReference {
source = fakeSource source = rangeSource ?: fakeSource
name = OperatorNameConventions.ITERATOR name = OperatorNameConventions.ITERATOR
} }
explicitReceiver = calculatedRangeExpression explicitReceiver = calculatedRangeExpression
@@ -1144,12 +1145,12 @@ class LightTreeRawFirExpressionBuilder(
statements += FirWhileLoopBuilder().apply { statements += FirWhileLoopBuilder().apply {
source = fakeSource source = fakeSource
condition = buildFunctionCall { condition = buildFunctionCall {
source = fakeSource source = rangeSource
calleeReference = buildSimpleNamedReference { calleeReference = buildSimpleNamedReference {
source = fakeSource source = rangeSource ?: fakeSource
name = OperatorNameConventions.HAS_NEXT name = OperatorNameConventions.HAS_NEXT
} }
explicitReceiver = generateResolvedAccessExpression(fakeSource, iteratorVal) explicitReceiver = generateResolvedAccessExpression(rangeSource, iteratorVal)
} }
// break/continue in the for loop condition will refer to an outer loop if any. // break/continue in the for loop condition will refer to an outer loop if any.
// So, prepare the loop target after building the condition. // So, prepare the loop target after building the condition.
@@ -1164,12 +1165,12 @@ class LightTreeRawFirExpressionBuilder(
valueParameter.source, valueParameter.source,
if (multiDeclaration != null) SpecialNames.DESTRUCT else valueParameter.name, if (multiDeclaration != null) SpecialNames.DESTRUCT else valueParameter.name,
buildFunctionCall { buildFunctionCall {
source = fakeSource source = rangeSource
calleeReference = buildSimpleNamedReference { calleeReference = buildSimpleNamedReference {
source = fakeSource source = rangeSource ?: fakeSource
name = OperatorNameConventions.NEXT name = OperatorNameConventions.NEXT
} }
explicitReceiver = generateResolvedAccessExpression(fakeSource, iteratorVal) explicitReceiver = generateResolvedAccessExpression(rangeSource, iteratorVal)
}, },
valueParameter.returnTypeRef valueParameter.returnTypeRef
) )
compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt
+10 -9
View File
@@ -2563,17 +2563,18 @@ open class PsiRawFirBuilder(
val rangeExpression = expression.loopRange.toFirExpression("No range in for loop") val rangeExpression = expression.loopRange.toFirExpression("No range in for loop")
val ktParameter = expression.loopParameter val ktParameter = expression.loopParameter
val fakeSource = expression.toKtPsiSourceElement(KtFakeSourceElementKind.DesugaredForLoop) val fakeSource = expression.toKtPsiSourceElement(KtFakeSourceElementKind.DesugaredForLoop)
val rangeSource = expression.loopRange?.toFirSourceElement(KtFakeSourceElementKind.DesugaredForLoop)
val target: FirLoopTarget val target: FirLoopTarget
// NB: FirForLoopChecker relies on this block existence and structure // NB: FirForLoopChecker relies on this block existence and structure
return buildBlock { return buildBlock {
source = fakeSource source = fakeSource
val rangeSource = expression.loopRange?.toFirSourceElement(KtFakeSourceElementKind.DesugaredForLoop)
val iteratorVal = generateTemporaryVariable( val iteratorVal = generateTemporaryVariable(
baseModuleData, rangeSource, SpecialNames.ITERATOR, baseModuleData, rangeSource, SpecialNames.ITERATOR,
buildFunctionCall { buildFunctionCall {
source = fakeSource source = rangeSource
calleeReference = buildSimpleNamedReference { calleeReference = buildSimpleNamedReference {
source = fakeSource source = rangeSource ?: fakeSource
name = OperatorNameConventions.ITERATOR name = OperatorNameConventions.ITERATOR
} }
explicitReceiver = rangeExpression explicitReceiver = rangeExpression
@@ -2583,12 +2584,12 @@ open class PsiRawFirBuilder(
statements += FirWhileLoopBuilder().apply { statements += FirWhileLoopBuilder().apply {
source = expression.toFirSourceElement() source = expression.toFirSourceElement()
condition = buildFunctionCall { condition = buildFunctionCall {
source = fakeSource source = rangeSource
calleeReference = buildSimpleNamedReference { calleeReference = buildSimpleNamedReference {
source = fakeSource source = rangeSource ?: fakeSource
name = OperatorNameConventions.HAS_NEXT name = OperatorNameConventions.HAS_NEXT
} }
explicitReceiver = generateResolvedAccessExpression(fakeSource, iteratorVal) explicitReceiver = generateResolvedAccessExpression(rangeSource, iteratorVal)
} }
// break/continue in the for loop condition will refer to an outer loop if any. // break/continue in the for loop condition will refer to an outer loop if any.
// So, prepare the loop target after building the condition. // So, prepare the loop target after building the condition.
@@ -2604,12 +2605,12 @@ open class PsiRawFirBuilder(
source = expression.loopParameter?.toFirSourceElement(), source = expression.loopParameter?.toFirSourceElement(),
name = if (multiDeclaration != null) SpecialNames.DESTRUCT else ktParameter.nameAsSafeName, name = if (multiDeclaration != null) SpecialNames.DESTRUCT else ktParameter.nameAsSafeName,
initializer = buildFunctionCall { initializer = buildFunctionCall {
source = fakeSource source = rangeSource ?: fakeSource
calleeReference = buildSimpleNamedReference { calleeReference = buildSimpleNamedReference {
source = fakeSource source = rangeSource
name = OperatorNameConventions.NEXT name = OperatorNameConventions.NEXT
} }
explicitReceiver = generateResolvedAccessExpression(fakeSource, iteratorVal) explicitReceiver = generateResolvedAccessExpression(rangeSource, iteratorVal)
}, },
typeRef = ktParameter.typeReference.toFirOrImplicitType(), typeRef = ktParameter.typeReference.toFirOrImplicitType(),
) )
compiler/testData/diagnostics/tests/ForRangeConventions.fir.kt
Vendored
+3 -3
View File
@@ -82,12 +82,12 @@ fun test(notRange1: NotRange1, notRange2: NotRange2, notRange3: NotRange3, notRa
for (i in <!HAS_NEXT_MISSING, NEXT_MISSING!>notRange2<!>); for (i in <!HAS_NEXT_MISSING, NEXT_MISSING!>notRange2<!>);
for (i in <!NEXT_MISSING!>notRange3<!>); for (i in <!NEXT_MISSING!>notRange3<!>);
for (i in <!HAS_NEXT_MISSING!>notRange4<!>); for (i in <!HAS_NEXT_MISSING!>notRange4<!>);
<!CONDITION_TYPE_MISMATCH!>for (i in notRange5)<!>; for (i in <!CONDITION_TYPE_MISMATCH!>notRange5<!>);
for (i in notRange6); for (i in notRange6);
<!CONDITION_TYPE_MISMATCH!>for (i in notRange7)<!>; for (i in <!CONDITION_TYPE_MISMATCH!>notRange7<!>);
for (i in <!HAS_NEXT_MISSING!>notRange8<!>); for (i in <!HAS_NEXT_MISSING!>notRange8<!>);
for (i in range0); for (i in range0);
for (i in range1); for (i in range1);
for (i in (checkSubtype<List<Int>>(ArrayList<Int>()))); for (i in (checkSubtype<List<Int>>(ArrayList<Int>())));
} }
compiler/testData/diagnostics/tests/deprecated/iteratorUsage.fir.kt
Vendored
+2 -2
View File
@@ -19,6 +19,6 @@ class Iter2 {
} }
fun use() { fun use() {
<!DEPRECATION!>for (x in Iter()) {}<!> for (x in <!DEPRECATION!>Iter<!>()) {}
<!DEPRECATION, DEPRECATION!>for (x in Iter2()) {}<!> for (x in <!DEPRECATION, DEPRECATION!>Iter2<!>()) {}
} }
compiler/testData/diagnostics/testsWithStdLib/experimental/implicitUsages.fir.kt
Vendored
+1 -1
View File
@@ -120,5 +120,5 @@ fun operatorContainerUsage(s: String, a: AnotherContainer) {
val res1 = s <!OPT_IN_USAGE_ERROR!>-<!> s val res1 = s <!OPT_IN_USAGE_ERROR!>-<!> s
val res2 = <!OPT_IN_USAGE_ERROR!>s<!>() val res2 = <!OPT_IN_USAGE_ERROR!>s<!>()
val res3 = <!OPT_IN_USAGE_ERROR!>res1<!> <!OPT_IN_USAGE_ERROR!>><!> <!OPT_IN_USAGE_ERROR!>res2<!> val res3 = <!OPT_IN_USAGE_ERROR!>res1<!> <!OPT_IN_USAGE_ERROR!>><!> <!OPT_IN_USAGE_ERROR!>res2<!>
<!OPT_IN_USAGE_ERROR, OPT_IN_USAGE_ERROR, OPT_IN_USAGE_ERROR, OPT_IN_USAGE_ERROR, OPT_IN_USAGE_ERROR!>for (c in a) {}<!> for (c in <!OPT_IN_USAGE_ERROR, OPT_IN_USAGE_ERROR, OPT_IN_USAGE_ERROR, OPT_IN_USAGE_ERROR, OPT_IN_USAGE_ERROR!>a<!>) {}
} }
compiler/testData/diagnostics/testsWithStdLib/experimental/implicitUsagesFuture.fir.kt
Vendored
+1 -1
View File
@@ -120,5 +120,5 @@ fun operatorContainerUsage(s: String, a: AnotherContainer) {
val res1 = s <!OPT_IN_USAGE_ERROR!>-<!> s val res1 = s <!OPT_IN_USAGE_ERROR!>-<!> s
val res2 = <!OPT_IN_USAGE_ERROR!>s<!>() val res2 = <!OPT_IN_USAGE_ERROR!>s<!>()
val res3 = <!OPT_IN_USAGE_ERROR!>res1<!> <!OPT_IN_USAGE_ERROR!>><!> <!OPT_IN_USAGE_ERROR!>res2<!> val res3 = <!OPT_IN_USAGE_ERROR!>res1<!> <!OPT_IN_USAGE_ERROR!>><!> <!OPT_IN_USAGE_ERROR!>res2<!>
<!OPT_IN_USAGE_ERROR, OPT_IN_USAGE_ERROR, OPT_IN_USAGE_ERROR, OPT_IN_USAGE_ERROR, OPT_IN_USAGE_ERROR!>for (c in a) {}<!> for (c in <!OPT_IN_USAGE_ERROR, OPT_IN_USAGE_ERROR, OPT_IN_USAGE_ERROR, OPT_IN_USAGE_ERROR, OPT_IN_USAGE_ERROR!>a<!>) {}
} }