diff --git a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/DataClassUtils.kt b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/DataClassUtils.kt
new file mode 100644
index 00000000000..a1e8018cdb9
--- /dev/null
+++ b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/DataClassUtils.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.fir.builder
+
+import org.jetbrains.kotlin.descriptors.Modality
+import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.fir.FirFunctionTarget
+import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.declarations.FirClass
+import org.jetbrains.kotlin.fir.declarations.FirProperty
+import org.jetbrains.kotlin.fir.declarations.FirRegularClass
+import org.jetbrains.kotlin.fir.declarations.impl.FirClassImpl
+import org.jetbrains.kotlin.fir.declarations.impl.FirMemberFunctionImpl
+import org.jetbrains.kotlin.fir.expressions.impl.FirQualifiedAccessExpressionImpl
+import org.jetbrains.kotlin.fir.expressions.impl.FirReturnExpressionImpl
+import org.jetbrains.kotlin.fir.expressions.impl.FirSingleExpressionBlock
+import org.jetbrains.kotlin.fir.references.FirResolvedCallableReferenceImpl
+import org.jetbrains.kotlin.fir.symbols.CallableId
+import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
+import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImpl
+import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.psi.KtClassOrObject
+
+internal fun KtClassOrObject.generateComponentFunctions(
+    session: FirSession, firClass: FirClassImpl, packageFqName: FqName, classFqName: FqName
+) {
+    var componentIndex = 1
+    val zippedParameters =
+        primaryConstructorParameters.zip(firClass.declarations.filterIsInstance<FirProperty>())
+    for ((ktParameter, firProperty) in zippedParameters) {
+        if (!ktParameter.hasValOrVar()) continue
+        val name = Name.identifier("component$componentIndex")
+        componentIndex++
+        val symbol = FirFunctionSymbol(CallableId(packageFqName, classFqName, name))
+        firClass.addDeclaration(
+            FirMemberFunctionImpl(
+                session, ktParameter, symbol, name,
+                Visibilities.PUBLIC, Modality.FINAL,
+                isExpect = false, isActual = false,
+                isOverride = false, isOperator = false,
+                isInfix = false, isInline = false,
+                isTailRec = false, isExternal = false,
+                isSuspend = false, receiverTypeRef = null,
+                returnTypeRef = FirImplicitTypeRefImpl(session, ktParameter)
+            ).apply {
+                val componentFunction = this
+                body = FirSingleExpressionBlock(
+                    session,
+                    FirReturnExpressionImpl(
+                        session, ktParameter,
+                        FirQualifiedAccessExpressionImpl(session, ktParameter).apply {
+                            val parameterName = ktParameter.nameAsSafeName
+                            calleeReference = FirResolvedCallableReferenceImpl(
+                                session, ktParameter,
+                                parameterName, firProperty.symbol
+                            )
+                        }
+                    ).apply {
+                        target = FirFunctionTarget(null)
+                        target.bind(componentFunction)
+                    }
+                )
+            }
+        )
+    }
+}
\ No newline at end of file
diff --git a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
index b3b6a513bf8..c8b7130017c 100644
--- a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
+++ b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.fir.symbols.CallableId
 import org.jetbrains.kotlin.fir.symbols.impl.*
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.fir.types.impl.*
-import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.lexer.KtTokens.*
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
@@ -452,8 +451,6 @@ class RawFirBuilder(val session: FirSession, val stubMode: Boolean) {
             )
         }
 
-
-
         override fun visitEnumEntry(enumEntry: KtEnumEntry, data: Unit): FirElement {
             return withChildClassName(enumEntry.nameAsSafeName) {
                 val firEnumEntry = FirEnumEntryImpl(
@@ -548,46 +545,8 @@ class RawFirBuilder(val session: FirSession, val stubMode: Boolean) {
                     )
                 }
 
-                if (classOrObject.hasModifier(KtTokens.DATA_KEYWORD) && firPrimaryConstructor != null) {
-                    var componentIndex = 1
-                    val zippedParameters =
-                        classOrObject.primaryConstructorParameters.zip(firClass.declarations.filterIsInstance<FirProperty>())
-                    for ((ktParameter, firProperty) in zippedParameters) {
-                        if (!ktParameter.hasValOrVar()) continue
-                        val name = Name.identifier("component$componentIndex")
-                        componentIndex++
-                        val symbol = FirFunctionSymbol(callableIdForName(name))
-                        firClass.addDeclaration(
-                            FirMemberFunctionImpl(
-                                session, ktParameter, symbol, name,
-                                Visibilities.PUBLIC, Modality.FINAL,
-                                isExpect = false, isActual = false,
-                                isOverride = false, isOperator = false,
-                                isInfix = false, isInline = false,
-                                isTailRec = false, isExternal = false,
-                                isSuspend = false, receiverTypeRef = null,
-                                returnTypeRef = FirImplicitTypeRefImpl(session, ktParameter)
-                            ).apply {
-                                val componentFunction = this
-                                body = FirSingleExpressionBlock(
-                                    this@RawFirBuilder.session,
-                                    FirReturnExpressionImpl(
-                                        this@RawFirBuilder.session, ktParameter,
-                                        FirQualifiedAccessExpressionImpl(this@RawFirBuilder.session, ktParameter).apply {
-                                            val parameterName = ktParameter.nameAsSafeName
-                                            calleeReference = FirResolvedCallableReferenceImpl(
-                                                this@RawFirBuilder.session, ktParameter,
-                                                parameterName, firProperty.symbol
-                                            )
-                                        }
-                                    ).apply {
-                                        target = FirFunctionTarget(null)
-                                        target.bind(componentFunction)
-                                    }
-                                )
-                            }
-                        )
-                    }
+                if (classOrObject.hasModifier(DATA_KEYWORD) && firPrimaryConstructor != null) {
+                    classOrObject.generateComponentFunctions(session, firClass, packageFqName, className)
                 }
 
                 firClass
@@ -711,7 +670,7 @@ class RawFirBuilder(val session: FirSession, val stubMode: Boolean) {
                         ) { toFirOrImplicitType() }
                         multiParameter
                     } else {
-                        valueParameter.toFirValueParameter(FirImplicitTypeRefImpl(session, psi))
+                        valueParameter.toFirValueParameter(FirImplicitTypeRefImpl(this@RawFirBuilder.session, psi))
                     }
                 }
                 label = firLabels.pop() ?: firFunctionCalls.lastOrNull()?.calleeReference?.name?.let {