From 2a6355b64cfad1fef3e45b4cfd9d0ca6135c76b2 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 21 Jul 2021 20:34:05 +0300 Subject: [PATCH] FIR: use coneType instead of coneTypeSafe in OptIn checkers --- .../checkers/expression/FirOptInUsageBaseChecker.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 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 c2f8e117c66..d827b67449f 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 @@ -110,12 +110,11 @@ object FirOptInUsageBaseChecker { } } if (fir !is FirConstructor) { - // Note: coneType here crashes on overridden members - fir.returnTypeRef.coneTypeSafe().addExperimentalities(context, result, visited) - fir.receiverTypeRef?.coneTypeSafe().addExperimentalities(context, result, visited) + fir.returnTypeRef.coneType.addExperimentalities(context, result, visited) + fir.receiverTypeRef?.coneType.addExperimentalities(context, result, visited) if (fir is FirSimpleFunction) { fir.valueParameters.forEach { - it.returnTypeRef.coneTypeSafe().addExperimentalities(context, result, visited) + it.returnTypeRef.coneType.addExperimentalities(context, result, visited) } } }