From bdb1e289127f34985a97ea09b3ace5b4dbad41b7 Mon Sep 17 00:00:00 2001 From: "Denis.Zharkov" Date: Mon, 20 Feb 2023 13:07:33 +0100 Subject: [PATCH] K2: Minor. Simplify condition at FirDeclarationsResolveTransformer Just to avoid double negation at !hasNonDefaultAccessors --- .../body/resolve/FirDeclarationsResolveTransformer.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt index 92893ca972a..fecf2599363 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt @@ -29,7 +29,6 @@ import org.jetbrains.kotlin.fir.resolve.* import org.jetbrains.kotlin.fir.resolve.calls.FirNamedReferenceWithCandidate import org.jetbrains.kotlin.fir.resolve.calls.candidate import org.jetbrains.kotlin.fir.resolve.dfa.FirControlFlowGraphReferenceImpl -import org.jetbrains.kotlin.fir.expressions.unwrapSmartcastExpression import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeLocalVariableNoTypeOrInitializer import org.jetbrains.kotlin.fir.resolve.inference.FirStubTypeTransformer import org.jetbrains.kotlin.fir.resolve.inference.ResolvedLambdaAtom @@ -127,7 +126,6 @@ open class FirDeclarationsResolveTransformer(transformer: FirAbstractBodyResolve if (bodyResolveState == FirPropertyBodyResolveState.EVERYTHING_RESOLVED) return property val canHaveDeepImplicitTypeRefs = property.hasExplicitBackingField - if (returnTypeRefBeforeResolve !is FirImplicitTypeRef && implicitTypeOnly && !canHaveDeepImplicitTypeRefs) { return property } @@ -164,9 +162,10 @@ open class FirDeclarationsResolveTransformer(transformer: FirAbstractBodyResolve } property.replaceBodyResolveState(FirPropertyBodyResolveState.EVERYTHING_RESOLVED) } else { - val hasNonDefaultAccessors = property.getter != null && property.getter !is FirDefaultPropertyAccessor || - property.setter != null && property.setter !is FirDefaultPropertyAccessor - val mayResolveSetter = shouldResolveEverything || !hasNonDefaultAccessors + val hasDefaultAccessors = + (property.getter == null || property.getter is FirDefaultPropertyAccessor) && + (property.setter == null || property.setter is FirDefaultPropertyAccessor) + val mayResolveSetter = shouldResolveEverything || hasDefaultAccessors val propertyTypeRefAfterResolve = property.returnTypeRef val propertyTypeIsKnown = propertyTypeRefAfterResolve is FirResolvedTypeRef val mayResolveGetter = mayResolveSetter || !propertyTypeIsKnown