FIR: Fix implicit return type computation for synthetic property+intersection

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

@@ -99,17 +99,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
     }
 
     override fun transformProperty(property: FirProperty, data: ResolutionMode): CompositeTransformResult<FirProperty> {
-        if (property is FirSyntheticProperty) {
+        require(property !is FirSyntheticProperty) { "Synthetic properties should not be processed by body transfromers" }
-            val delegate = property.getter.delegate
-            if (delegate.origin == FirDeclarationOrigin.IntersectionOverride) {
-                val unwrapped = delegate.symbol.overriddenSymbol!!.fir
-                transformSimpleFunction(unwrapped, data)
-                delegate.replaceReturnTypeRef(unwrapped.returnTypeRef)
-            } else {
-                transformSimpleFunction(delegate, data)
-            }
-            return property.compose()
-        }
 
         if (property.isLocal) {
             prepareSignatureForBodyResolve(property)

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

@@ -188,6 +188,16 @@ private class ReturnTypeCalculatorWithJump(
 
         require(declaration is FirCallableMemberDeclaration<*>) { "${declaration::class}: ${declaration.render()}" }
 
+        if (declaration is FirSyntheticProperty) {
+            return tryCalculateReturnType(declaration.getter.delegate)
+        }
+
+        if (declaration.origin == FirDeclarationOrigin.IntersectionOverride) {
+            val result = tryCalculateReturnType(declaration.symbol.overriddenSymbol!!.fir)
+            declaration.replaceReturnTypeRef(result)
+            return result
+        }
+
         return when (val status = implicitBodyResolveComputationSession.getStatus(declaration.symbol)) {
             is ImplicitBodyResolveComputationStatus.Computed -> status.resolvedTypeRef
             is ImplicitBodyResolveComputationStatus.Computing ->