From a2f722437069eafb854350ac27b4390b22615b15 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 18 Nov 2022 13:12:20 +0100 Subject: [PATCH] K2 opt-in: check callable parent class only in case of constructor call --- .../checkers/expression/FirOptInUsageBaseChecker.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInUsageBaseChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInUsageBaseChecker.kt index 9750c2661f9..1c3562a2226 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInUsageBaseChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInUsageBaseChecker.kt @@ -169,12 +169,12 @@ object FirOptInUsageBaseChecker { ProcessorAction.NEXT } } - } else if (dispatchReceiverType == null) { + } + if (fir is FirConstructor) { parentClassSymbol?.loadExperimentalities( context, result, visited, fromSetter = false, dispatchReceiverType = null, fromSupertype = false ) - } - if (fir !is FirConstructor) { + } else { // Without coneTypeSafe v fails in MT test (FirRenderer.kt) fir.returnTypeRef.coneTypeSafe().addExperimentalities(context, result, visited) fir.receiverParameter?.typeRef?.coneType.addExperimentalities(context, result, visited)