From fbe3f1537f388c845449298fff8db50ac1341b10 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Thu, 13 Oct 2016 16:01:28 +0300 Subject: [PATCH] Make static initializer classes for inheriting multifile class parts annotated as SYNTHETIC_CLASS. --- .../src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt | 2 +- .../org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt index df5b5461165..406a8ba6aa5 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt @@ -78,7 +78,7 @@ class MultifileClassCodegen( state.fileClassesProvider.getFileClassInfo(this).fileClassFqName private val shouldGeneratePartHierarchy = - state.inheritMultifileParts // TODO support incremental compilation + state.inheritMultifileParts private val partInternalNamesSorted = run { val partInternalNamesSet = hashSetOf() diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt index ca6726322a4..cda0dd6d777 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt @@ -115,6 +115,8 @@ class MultifileClassPartCodegen( visitMaxs(1, 0) visitEnd() } + + writeSyntheticClassMetadata(this) } } }