From 1afb844e1a84cd1983617a737b9f84b5f71d6c39 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Thu, 22 Apr 2021 17:36:42 +0300
Subject: [PATCH] [FIR] Fix FirExpressionWithSmartcastImpl.acceptChildren

---
 .../fir/expressions/impl/FirExpressionWithSmartcastImpl.kt | 2 +-
 .../test/frontend/fir/handlers/FirDiagnosticsHandler.kt    | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionWithSmartcastImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionWithSmartcastImpl.kt
index b7844ffd1f3..19b1cac569c 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionWithSmartcastImpl.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionWithSmartcastImpl.kt
@@ -44,7 +44,7 @@ internal class FirExpressionWithSmartcastImpl(
     }
 
     override fun <R, D> acceptChildren(visitor: FirVisitor<R, D>, data: D) {
-        originalExpression.acceptChildren(visitor, data)
+        originalExpression.accept(visitor, data)
     }
 
     override fun <D> transformCalleeReference(transformer: FirTransformer<D>, data: D): FirExpressionWithSmartcast {
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt
index a41275f6ced..ae39f31b772 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt
@@ -146,8 +146,11 @@ class FirDiagnosticsHandler(testServices: TestServices) : FirAnalysisHandler(tes
                         )
                     )
                 }
-
-                element.acceptChildren(this)
+                if (element is FirExpressionWithSmartcast) {
+                    element.originalExpression.acceptChildren(this)
+                } else {
+                    element.acceptChildren(this)
+                }
             }
 
             override fun visitFunctionCall(functionCall: FirFunctionCall) {