From ee393955c42726742a539c52162a98cdd90b6769 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 9 Sep 2015 17:28:04 +0300 Subject: [PATCH] Use correct codegen for creating light classes for file facade --- .../jetbrains/kotlin/codegen/ClassFileFactory.java | 12 ------------ .../kotlin/asJava/KotlinJavaFileStubProvider.java | 3 ++- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java index 0146d059c37..c962798fec8 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java @@ -192,18 +192,6 @@ public class ClassFileFactory implements OutputFileCollection { return codegen; } - @NotNull - public PackageCodegen forFacadeLightClass(@NotNull FqName facadeFqName, @NotNull Collection files) { - assert !isDone : "Already done!"; - PackageCodegen codegen = package2codegen.get(facadeFqName); - if (codegen == null) { - codegen = new PackageCodegen(state, files, facadeFqName.parent()); - package2codegen.put(facadeFqName, codegen); - } - - return codegen; - } - @NotNull public MultifileClassCodegen forMultifileClass(@NotNull FqName facadeFqName, @NotNull Collection files) { assert !isDone : "Already done!"; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java index b12d0acf0b4..05cd8a558a4 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java @@ -42,6 +42,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.CompilationErrorHandler; import org.jetbrains.kotlin.codegen.KotlinCodegenFacade; +import org.jetbrains.kotlin.codegen.MultifileClassCodegen; import org.jetbrains.kotlin.codegen.PackageCodegen; import org.jetbrains.kotlin.codegen.binding.CodegenBinding; import org.jetbrains.kotlin.codegen.state.GenerationState; @@ -214,7 +215,7 @@ public class KotlinJavaFileStubProvider files) { - PackageCodegen codegen = state.getFactory().forFacadeLightClass(facadeFqName, files); + MultifileClassCodegen codegen = state.getFactory().forMultifileClass(facadeFqName, files); codegen.generate(CompilationErrorHandler.THROW_EXCEPTION); state.getFactory().asList(); }