[FIR] Extract common helper for checking of (expect) default value

compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt

@@ -701,8 +701,7 @@ class FirElementSerializer private constructor(
     ): ProtoBuf.ValueParameter.Builder = whileAnalysing(session, parameter) {
         val builder = ProtoBuf.ValueParameter.newBuilder()
 
-        val declaresDefaultValue = parameter.defaultValue != null ||
+        val declaresDefaultValue = function.itOrExpectHasDefaultParameterValue(index)
-                function.symbol.getSingleExpectForActualOrNull().containsDefaultValue(index)
 
         val flags = Flags.getValueParameterFlags(
             additionalAnnotations.isNotEmpty()

compiler/fir/providers/src/org/jetbrains/kotlin/fir/declarations/declarationUtils.kt

@@ -116,7 +116,7 @@ inline val FirBasedSymbol<*>.isJavaOrEnhancement: Boolean
     get() = origin.isJavaOrEnhancement ||
             (fir as? FirCallableDeclaration)?.importedFromObjectOrStaticData?.original?.isJavaOrEnhancement == true
 
-fun FirFunctionSymbol<*>?.containsDefaultValue(index: Int): Boolean {
+private fun FirFunction.containsDefaultValue(index: Int): Boolean = valueParameters[index].defaultValue != null
-    if (this == null) return false
+
-    return this.fir.valueParameters[index].defaultValue != null
+fun FirFunction.itOrExpectHasDefaultParameterValue(index: Int): Boolean =
-}
+    containsDefaultValue(index) || symbol.getSingleExpectForActualOrNull()?.fir?.containsDefaultValue(index) == true

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/FirDefaultParametersResolver.kt

@@ -16,14 +16,11 @@ class FirDefaultParametersResolver : FirSessionComponent {
     fun declaresDefaultValue(
         session: FirSession,
         scopeSession: ScopeSession,
-        valueParameter: FirValueParameter,
         function: FirFunction,
         originScope: FirScope?,
         index: Int,
     ): Boolean {
-        if (valueParameter.defaultValue != null || function.symbol.getSingleExpectForActualOrNull().containsDefaultValue(index)) {
+        if (function.itOrExpectHasDefaultParameterValue(index)) return true
-            return true
-        }
         if (function !is FirSimpleFunction) return false
         val symbol = function.symbol
         val typeScope = when (originScope) {
@@ -44,9 +41,7 @@ class FirDefaultParametersResolver : FirSessionComponent {
         var result = false
 
         typeScope.processOverriddenFunctions(symbol) { overridden ->
-            if (overridden.containsDefaultValue(index) ||
+            if (overridden.fir.itOrExpectHasDefaultParameterValue(index)) {
-                overridden.getSingleExpectForActualOrNull().containsDefaultValue(index)
-            ) {
                 result = true
                 return@processOverriddenFunctions ProcessorAction.STOP
             }

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirArgumentsToParametersMapper.kt

@@ -304,7 +304,7 @@ private class FirCallArgumentsProcessor(
             if (!result.containsKey(parameter)) {
                 when {
                     bodyResolveComponents.session.defaultParameterResolver.declaresDefaultValue(
-                        useSiteSession, bodyResolveComponents.scopeSession, parameter, function, originScope, index
+                        useSiteSession, bodyResolveComponents.scopeSession, function, originScope, index
                     ) ->
                         result[parameter] = ResolvedCallArgument.DefaultArgument
                     parameter.isVararg ->