[FIR] Don't resolve already resolved qualified access

^KT-30507 Fixed

analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java

@@ -40198,6 +40198,12 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
                 runTest("compiler/testData/diagnostics/testsWithStdLib/smartcasts/listOfGeneric.kt");
             }
 
+            @Test
+            @TestMetadata("unsoundSmartcast.kt")
+            public void testUnsoundSmartcast() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithStdLib/smartcasts/unsoundSmartcast.kt");
+            }
+
             @Test
             @TestMetadata("withChangesToNull.kt")
             public void testWithChangesToNull() throws Exception {

compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.dot

@@ -138,51 +138,48 @@ digraph delegateWithAnonymousObject_kt {
             }
             53 [label="Postponed exit from lambda"];
             54 [label="Function call: this@R|/IssuesListUserProfile|.R|/delegate|<R|IssuesListUserProfile|, R|IssuesListUserProfile|, R|IssueListView|>(...)" style="filled" fillcolor=yellow];
-            55 [label="Access variable this@R|/IssuesListUserProfile|"];
+            55 [label="Function call: this@R|/IssuesListUserProfile|.R|/delegate|<R|IssuesListUserProfile|, R|IssuesListUserProfile|, R|IssueListView|>(...).<Unresolved name: provideDelegate>#(...)" style="filled" fillcolor=yellow];
-            56 [label="Function call: this@R|/IssuesListUserProfile|.R|/delegate|<R|IssuesListUserProfile|, R|IssuesListUserProfile|, R|IssueListView|>(...).<Unresolved name: provideDelegate>#(...)" style="filled" fillcolor=yellow];
+            56 [label="Exit property delegate" style="filled" fillcolor=yellow];
-            57 [label="Exit property delegate" style="filled" fillcolor=yellow];
+            57 [label="Exit property" style="filled" fillcolor=red];
-            58 [label="Exit property" style="filled" fillcolor=red];
         }
         subgraph cluster_18 {
             color=blue
-            59 [label="Enter function <init>" style="filled" fillcolor=red];
+            58 [label="Enter function <init>" style="filled" fillcolor=red];
-            60 [label="Delegated constructor call: super<R|DelegateProvider<IssuesListUserProfile>|>()" style="filled" fillcolor=yellow];
+            59 [label="Delegated constructor call: super<R|DelegateProvider<IssuesListUserProfile>|>()" style="filled" fillcolor=yellow];
-            61 [label="Exit function <init>" style="filled" fillcolor=red];
+            60 [label="Exit function <init>" style="filled" fillcolor=red];
         }
-        62 [label="Exit class IssuesListUserProfile" style="filled" fillcolor=red];
+        61 [label="Exit class IssuesListUserProfile" style="filled" fillcolor=red];
     }
     subgraph cluster_19 {
         color=blue
-        63 [label="Enter function <setter>" style="filled" fillcolor=red];
+        62 [label="Enter function <setter>" style="filled" fillcolor=red];
         subgraph cluster_20 {
             color=blue
-            64 [label="Enter block"];
+            63 [label="Enter block"];
-            65 [label="Access variable D|/IssuesListUserProfile.issueListView|"];
+            64 [label="Access variable D|/IssuesListUserProfile.issueListView|"];
-            66 [label="Access variable this@R|/IssuesListUserProfile|"];
+            65 [label="Access variable R|<local>/issueListView|"];
-            67 [label="Access variable R|<local>/issueListView|"];
+            66 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(...)" style="filled" fillcolor=yellow];
-            68 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(...)" style="filled" fillcolor=yellow];
+            67 [label="Exit block"];
-            69 [label="Exit block"];
         }
-        70 [label="Exit function <setter>" style="filled" fillcolor=red];
+        68 [label="Exit function <setter>" style="filled" fillcolor=red];
     }
     subgraph cluster_21 {
         color=blue
-        71 [label="Enter function <getter>" style="filled" fillcolor=red];
+        69 [label="Enter function <getter>" style="filled" fillcolor=red];
         subgraph cluster_22 {
             color=blue
-            72 [label="Enter block"];
+            70 [label="Enter block"];
-            73 [label="Access variable D|/IssuesListUserProfile.issueListView|"];
+            71 [label="Access variable D|/IssuesListUserProfile.issueListView|"];
-            74 [label="Access variable this@R|/IssuesListUserProfile|"];
+            72 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|Stub (chain inference): TypeVariable(_Target)|>|(...)" style="filled" fillcolor=yellow];
-            75 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|Stub (chain inference): TypeVariable(_Target)|>|(...)" style="filled" fillcolor=yellow];
+            73 [label="Jump: ^ this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|Stub (chain inference): TypeVariable(_Target)|>|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|)"];
-            76 [label="Jump: ^ this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|Stub (chain inference): TypeVariable(_Target)|>|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|)"];
+            74 [label="Stub" style="filled" fillcolor=gray];
-            77 [label="Stub" style="filled" fillcolor=gray];
+            75 [label="Exit block" style="filled" fillcolor=gray];
-            78 [label="Exit block" style="filled" fillcolor=gray];
         }
-        79 [label="Exit function <getter>" style="filled" fillcolor=red];
+        76 [label="Exit function <getter>" style="filled" fillcolor=red];
     }
     23 -> {24} [color=green];
-    23 -> {62} [style=dotted];
+    23 -> {61} [style=dotted];
-    23 -> {24 59} [style=dashed];
+    23 -> {24 58} [style=dashed];
     24 -> {25};
     25 -> {26 53 54};
     25 -> {26} [style=dashed];
@@ -220,32 +217,29 @@ digraph delegateWithAnonymousObject_kt {
     50 -> {51} [style=dotted];
     51 -> {52} [style=dotted];
     53 -> {54} [color=green];
-    53 -> {57} [color=red];
+    53 -> {56} [color=red];
     54 -> {55};
     55 -> {56};
     56 -> {57};
-    57 -> {58};
+    57 -> {58} [color=green];
-    58 -> {59} [color=green];
+    58 -> {59};
     59 -> {60};
-    60 -> {61};
+    60 -> {61} [color=green];
-    61 -> {62} [color=green];
+    61 -> {62 69} [color=green];
-    62 -> {63 71} [color=green];
+    61 -> {62 69} [style=dashed];
-    62 -> {63 71} [style=dashed];
+    62 -> {63};
     63 -> {64};
     64 -> {65};
     65 -> {66};
     66 -> {67};
     67 -> {68};
-    68 -> {69};
     69 -> {70};
+    70 -> {71};
     71 -> {72};
     72 -> {73};
-    73 -> {74};
+    73 -> {76};
-    74 -> {75};
+    73 -> {74} [style=dotted];
-    75 -> {76};
+    74 -> {75} [style=dotted];
-    76 -> {79};
+    75 -> {76} [style=dotted];
-    76 -> {77} [style=dotted];
-    77 -> {78} [style=dotted];
-    78 -> {79} [style=dotted];
 
 }

compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java

@@ -40262,6 +40262,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
                 runTest("compiler/testData/diagnostics/testsWithStdLib/smartcasts/listOfGeneric.kt");
             }
 
+            @Test
+            @TestMetadata("unsoundSmartcast.kt")
+            public void testUnsoundSmartcast() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithStdLib/smartcasts/unsoundSmartcast.kt");
+            }
+
             @Test
             @TestMetadata("withChangesToNull.kt")
             public void testWithChangesToNull() throws Exception {

compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java

@@ -40358,6 +40358,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
                 runTest("compiler/testData/diagnostics/testsWithStdLib/smartcasts/listOfGeneric.kt");
             }
 
+            @Test
+            @TestMetadata("unsoundSmartcast.kt")
+            public void testUnsoundSmartcast() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithStdLib/smartcasts/unsoundSmartcast.kt");
+            }
+
             @Test
             @TestMetadata("withChangesToNull.kt")
             public void testWithChangesToNull() throws Exception {

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirAbstractBodyResolveTransformerDispatcher.kt

@@ -257,6 +257,10 @@ abstract class FirAbstractBodyResolveTransformerDispatcher(
         return expressionsTransformer.transformArrayOfCall(arrayOfCall, data)
     }
 
+    override fun transformSmartCastExpression(smartCastExpression: FirSmartCastExpression, data: ResolutionMode): FirStatement {
+        return expressionsTransformer.transformSmartCastExpression(smartCastExpression, data)
+    }
+
     // ------------------------------------- Declarations -------------------------------------
 
     override fun transformDeclaration(declaration: FirDeclaration, data: ResolutionMode): FirDeclaration {

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt

@@ -80,6 +80,10 @@ open class FirExpressionsResolveTransformer(transformer: FirAbstractBodyResolveT
         return (expression.transformChildren(transformer, data) as FirStatement)
     }
 
+    override fun transformSmartCastExpression(smartCastExpression: FirSmartCastExpression, data: ResolutionMode): FirStatement {
+        return smartCastExpression
+    }
+
     override fun transformQualifiedAccessExpression(
         qualifiedAccessExpression: FirQualifiedAccessExpression,
         data: ResolutionMode,
@@ -92,6 +96,10 @@ open class FirExpressionsResolveTransformer(transformer: FirAbstractBodyResolveT
         data: ResolutionMode,
         isUsedAsReceiver: Boolean,
     ): FirStatement {
+        if (qualifiedAccessExpression.typeRef is FirResolvedTypeRef && qualifiedAccessExpression.calleeReference !is FirSimpleNamedReference) {
+            return qualifiedAccessExpression
+        }
+
         qualifiedAccessExpression.transformAnnotations(this, data)
         qualifiedAccessExpression.transformTypeArguments(transformer, ResolutionMode.ContextIndependent)
 
@@ -1420,7 +1428,8 @@ open class FirExpressionsResolveTransformer(transformer: FirAbstractBodyResolveT
                 session.moduleData,
                 source = index.source?.fakeElement(KtFakeSourceElementKind.DesugaredCompoundAssignment),
                 name = SpecialNames.subscribeOperatorIndex(i),
-                initializer = index
+                initializer = index,
+                typeRef = index.typeRef,
             )
         }
 

compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/LightTreePositioningStrategies.kt

@@ -683,6 +683,12 @@ object LightTreePositioningStrategies {
             endOffset: Int,
             tree: FlyweightCapableTreeStructure<LighterASTNode>
         ): List<TextRange> {
+            if (node.tokenType == KtNodeTypes.BINARY_EXPRESSION) {
+                tree.findDescendantByTypes(node, KtTokens.AUGMENTED_ASSIGNMENTS)?.let {
+                    return markElement(it, startOffset, endOffset, tree, node)
+                }
+            }
+
             when {
                 node.tokenType == KtNodeTypes.BINARY_EXPRESSION && tree.findDescendantByType(node, KtTokens.EQ, followFunctions = false) != null -> {
                     // Look for reference in LHS of variable assignment.

compiler/testData/diagnostics/testsWithStdLib/smartcasts/unsoundSmartcast.fir.kt

@@ -0,0 +1,41 @@
+// SKIP_TXT
+// ISSUE: KT-30507
+
+fun test1() {
+    var x: MutableList<Int>? = mutableListOf(1)
+    x!!
+    x[if (true) { x = null; 0 } else 0] <!UNRESOLVED_REFERENCE!>+=<!> <!UNSAFE_CALL!>x[0]<!>
+    <!UNSAFE_CALL!>x[0]<!>.inv()
+}
+
+fun test2() {
+    var x: MutableList<Int>? = mutableListOf(1)
+    x!!
+    x[if (true) { x = null; 0 } else 0] = 11
+    <!UNSAFE_CALL!>x[0]<!>.inv()
+}
+
+fun test3() {
+    var x: MutableList<Int>? = mutableListOf(1)
+    x!!
+    x[0] = if (true) { x = null; 0 } else 0
+    <!UNSAFE_CALL!>x[0]<!>.inv()
+}
+
+operator fun MutableList<Int>.get(i1: Int, i2: Int) {}
+operator fun MutableList<Int>.set(i1: Int, i2: Int, el: Int) = 10
+
+fun test4() {
+    var x: MutableList<Int>? = mutableListOf(1)
+    x!!
+    val y = x[if (true) { x = null; 0 } else 0, <!UNSAFE_CALL!>x[0]<!>]
+}
+
+operator fun Int.invoke(y: Int, z: Int) {}
+
+fun test5() {
+    var x: Int? = 10
+    x!!
+    <!UNSAFE_IMPLICIT_INVOKE_CALL!>x<!>(if (true) { x = null; 0 } else 0, x)
+    x<!UNSAFE_CALL!>.<!>inv()
+}

compiler/testData/diagnostics/testsWithStdLib/smartcasts/unsoundSmartcast.kt

@@ -0,0 +1,41 @@
+// SKIP_TXT
+// ISSUE: KT-30507
+
+fun test1() {
+    var x: MutableList<Int>? = mutableListOf(1)
+    x!!
+    <!DEBUG_INFO_SMARTCAST!>x<!>[if (true) { x = null; 0 } else 0] += <!DEBUG_INFO_SMARTCAST!>x<!>[0]
+    <!DEBUG_INFO_SMARTCAST!>x<!>[0].inv()
+}
+
+fun test2() {
+    var x: MutableList<Int>? = mutableListOf(1)
+    x!!
+    <!DEBUG_INFO_SMARTCAST!>x<!>[if (true) { x = null; 0 } else 0] = 11
+    <!UNSAFE_CALL!>x[0]<!>.inv()
+}
+
+fun test3() {
+    var x: MutableList<Int>? = mutableListOf(1)
+    x!!
+    <!DEBUG_INFO_SMARTCAST!>x<!>[0] = if (true) { x = null; 0 } else 0
+    <!UNSAFE_CALL!>x[0]<!>.inv()
+}
+
+operator fun MutableList<Int>.get(i1: Int, i2: Int) {}
+operator fun MutableList<Int>.set(i1: Int, i2: Int, el: Int) = 10
+
+fun test4() {
+    var x: MutableList<Int>? = mutableListOf(1)
+    x!!
+    val y = <!DEBUG_INFO_SMARTCAST!>x<!>[if (true) { x = null; 0 } else 0, <!DEBUG_INFO_SMARTCAST!>x<!>[0]]
+}
+
+operator fun Int.invoke(y: Int, z: Int) {}
+
+fun test5() {
+    var x: Int? = 10
+    x!!
+    <!DEBUG_INFO_SMARTCAST!>x<!>(if (true) { x = null; 0 } else 0, <!DEBUG_INFO_SMARTCAST!>x<!>)
+    <!DEBUG_INFO_SMARTCAST!>x<!>.inv()
+}

compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java

@@ -40358,6 +40358,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                 runTest("compiler/testData/diagnostics/testsWithStdLib/smartcasts/listOfGeneric.kt");
             }
 
+            @Test
+            @TestMetadata("unsoundSmartcast.kt")
+            public void testUnsoundSmartcast() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithStdLib/smartcasts/unsoundSmartcast.kt");
+            }
+
             @Test
             @TestMetadata("withChangesToNull.kt")
             public void testWithChangesToNull() throws Exception {

compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/13.fir.kt

@@ -4,7 +4,7 @@
 // TESTCASE NUMBER: 1
 fun case_1(x: Class?) {
     x!!
-    <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class"), DEBUG_INFO_EXPRESSION_TYPE("Class?"), DEBUG_INFO_EXPRESSION_TYPE("Class"), DEBUG_INFO_EXPRESSION_TYPE("Class")!>x<!>[if (true) {<!VAL_REASSIGNMENT!>x<!>=null;0} else 0] += <!DEBUG_INFO_EXPRESSION_TYPE("Class? & Class")!>x<!>[0]
+    <!DEBUG_INFO_EXPRESSION_TYPE("Class? & Class")!>x<!>[if (true) {<!VAL_REASSIGNMENT!>x<!>=null;0} else 0] <!UNRESOLVED_REFERENCE!>+=<!> <!DEBUG_INFO_EXPRESSION_TYPE("Class? & Class")!>x<!>[0]
     <!DEBUG_INFO_EXPRESSION_TYPE("Class? & Class")!>x<!>
     <!DEBUG_INFO_EXPRESSION_TYPE("Class? & Class")!>x<!>[0].inv()
 }