diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/fragments/FragmentModuleGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/fragments/FragmentModuleGenerator.kt
index 4bd087f..505ffcc 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/fragments/FragmentModuleGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/fragments/FragmentModuleGenerator.kt
@@ -31,7 +31,7 @@
             ktFiles.forEach { ktFile ->
                 irModule.files.add(
                     if (ktFile is KtBlockCodeFragment) {
-                        createEmptyIrFile(ktFile).apply {
+                        createEmptyIrFile(ktFile, irModule).apply {
                             declarations.add(
                                 irDeclarationGenerator.generateClassForCodeFragment(ktFile)
                             )
@@ -61,9 +61,9 @@
         }
     }
 
-    private fun createEmptyIrFile(ktFile: KtFile): IrFileImpl {
+    private fun createEmptyIrFile(ktFile: KtFile, irModule: IrModuleFragment): IrFileImpl {
         val fileEntry = PsiIrFileEntry(ktFile)
         val packageFragmentDescriptor = context.moduleDescriptor.findPackageFragmentForFile(ktFile)!!
-        return IrFileImpl(fileEntry, packageFragmentDescriptor)
+        return IrFileImpl(fileEntry, packageFragmentDescriptor, irModule)
     }
 }
\ No newline at end of file
