Drop package facades: fix incremental compilation tests & proto comparison tests

(package facades are no longer generated)
2015-10-17 17:26:17 +03:00
parent 300aeb83b0
commit 621d26aeeb
74 changed files with 84 additions and 176 deletions
@@ -21,6 +21,7 @@ import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.fileClasses.JvmFileClassInfo;
+import org.jetbrains.kotlin.load.kotlin.PackageClassUtils;
 import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.psi.JetFile;
@@ -112,6 +113,8 @@ public class KotlinCodegenFacade {
            @NotNull Collection<JetFile> jetFiles,
            @NotNull CompilationErrorHandler errorHandler
    ) {
+        // We do not really generate package class, but use old package fqName to identify package in module-info.
+        //FqName packageClassFqName = PackageClassUtils.getPackageClassFqName(packageFqName);
        PackageCodegen codegen = state.getFactory().forPackage(packageFqName, jetFiles);
        codegen.generate(errorHandler);
    }
@@ -49,12 +49,12 @@ public class PackageCodegen {
    public PackageCodegen(
            @NotNull GenerationState state,
            @NotNull Collection<JetFile> files,
-            @NotNull FqName fqName
+            @NotNull FqName packageFqName
    ) {
        this.state = state;
        this.files = files;
-        this.packageFragment = getOnlyPackageFragment(fqName);
-        packageParts = new PackageParts(fqName.asString());
+        this.packageFragment = getOnlyPackageFragment(packageFqName);
+        packageParts = new PackageParts(packageFqName.asString());
    }

    public void generate(@NotNull CompilationErrorHandler errorHandler) {
@@ -124,14 +124,14 @@ public class PackageCodegen {
    }

    @Nullable
-    private PackageFragmentDescriptor getOnlyPackageFragment(@NotNull FqName expectedFqName) {
+    private PackageFragmentDescriptor getOnlyPackageFragment(@NotNull FqName expectedPackageFqName) {
        SmartList<PackageFragmentDescriptor> fragments = new SmartList<PackageFragmentDescriptor>();
        for (JetFile file : files) {
            PackageFragmentDescriptor fragment = state.getBindingContext().get(BindingContext.FILE_TO_PACKAGE_FRAGMENT, file);
            assert fragment != null : "package fragment is null for " + file + "\n" + file.getText();

-            assert expectedFqName.equals(fragment.getFqName()) :
-                    "expected package fq name: " + expectedFqName + ", actual: " + fragment.getFqName();
+            assert expectedPackageFqName.equals(fragment.getFqName()) :
+                    "expected package fq name: " + expectedPackageFqName + ", actual: " + fragment.getFqName();

            if (!fragments.contains(fragment)) {
                fragments.add(fragment);
@@ -56,7 +56,7 @@ public fun FunctionDescriptor.getClassFilePath(typeMapper: JetTypeMapper, cache:
            kotlinClass.file.canonicalPath!!
        }
        else -> {
-            val implementationOwnerType = typeMapper.mapOwner(this)
+            val implementationOwnerType = typeMapper.mapImplementationOwner(this)
            val className = implementationOwnerType.internalName
            cache.getClassFilePath(className)
        }
@@ -147,13 +147,23 @@ public class JetTypeMapper {

    @NotNull
    public Type mapOwner(@NotNull DeclarationDescriptor descriptor) {
+        return mapOwner(descriptor, true);
+    }
+
+    public Type mapImplementationOwner(@NotNull DeclarationDescriptor descriptor) {
+        return mapOwner(descriptor, false);
+    }
+
+    @NotNull
+    public Type mapOwner(@NotNull DeclarationDescriptor descriptor, boolean publicFacade) {
        if (isLocalFunction(descriptor)) {
            return asmTypeForAnonymousClass(bindingContext, (FunctionDescriptor) descriptor);
        }

        DeclarationDescriptor container = descriptor.getContainingDeclaration();
        if (container instanceof PackageFragmentDescriptor) {
-            return Type.getObjectType(internalNameForPackageMemberOwner((CallableMemberDescriptor) descriptor));
+            String packageMemberOwner = internalNameForPackageMemberOwner((CallableMemberDescriptor) descriptor, publicFacade);
+            return Type.getObjectType(packageMemberOwner);
        }
        else if (container instanceof ClassDescriptor) {
            return mapClass((ClassDescriptor) container);
@@ -190,7 +200,7 @@ public class JetTypeMapper {
        CallableMemberDescriptor directMember = getDirectMember(descriptor);

        if (directMember instanceof DeserializedCallableMemberDescriptor) {
-            String facadeFqName = getPackageMemberOwnerInternalName((DeserializedCallableMemberDescriptor) directMember);
+            String facadeFqName = getPackageMemberOwnerInternalName((DeserializedCallableMemberDescriptor) directMember, publicFacade);
            if (facadeFqName != null) return facadeFqName;
        }

@@ -261,7 +271,7 @@ public class JetTypeMapper {
    }

    @Nullable
-    private String getPackageMemberOwnerInternalName(@NotNull DeserializedCallableMemberDescriptor descriptor) {
+    private String getPackageMemberOwnerInternalName(@NotNull DeserializedCallableMemberDescriptor descriptor, boolean publicFacade) {
        DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration();
        assert containingDeclaration instanceof PackageFragmentDescriptor : "Not a top-level member: " + descriptor;

@@ -270,7 +280,9 @@ public class JetTypeMapper {
            return null;
        }

-        return JvmClassName.byClassId(containingClasses.getFacadeClassId()).getInternalName();
+        ClassId ownerClassId = publicFacade ? containingClasses.getFacadeClassId()
+                                            : containingClasses.getImplClassId();
+        return JvmClassName.byClassId(ownerClassId).getInternalName();
    }

    private static final ClassId FAKE_CLASS_ID_FOR_BUILTINS = ClassId.topLevel(new FqName("kotlin.KotlinPackage"));
@@ -23,16 +23,8 @@
@kotlin.annotation.Target @java.lang.annotation.Retention @java.lang.annotation.Target @kotlin.jvm.internal.KotlinClass Anno

@kotlin.jvm.internal.KotlinFileFacade DefaultTargetsKt {
-    @Anno field p2: int
-    public method getP(): int
-    public method getP2(): int
+    final @Anno field p2: int
    method <clinit>(): void
-}
-
-@java.lang.Deprecated @kotlin.jvm.internal.KotlinPackage _DefaultPackage {
-    public synthetic field $kotlinPackage: kotlin.reflect.KPackage
-    public synthetic field $moduleName: java.lang.String
-    method <clinit>(): void
-    public @kotlin.jvm.internal.KotlinDelegatedMethod method getP(): int
-    public @kotlin.jvm.internal.KotlinDelegatedMethod method getP2(): int
-}
+    public final method getP(): int
+    public final method getP2(): int
+}
@@ -52,9 +52,4 @@ public final class PackageClassUtils {
    public static ClassId getPackageClassId(@NotNull FqName packageFQN) {
        return new ClassId(packageFQN, Name.identifier(getPackageClassName(packageFQN)));
    }
-
-    @NotNull
-    public static String getPackageClassInternalName(@NotNull FqName packageFQN) {
-        return JvmClassName.byFqNameWithoutInnerClasses(getPackageClassFqName(packageFQN)).getInternalName();
-    }
 }
@@ -67,6 +67,7 @@ public class IncrementalCacheImpl(
        val PROTO_MAP = "proto"
        val CONSTANTS_MAP = "constants"
        val INLINE_FUNCTIONS = "inline-functions"
+        val PACKAGE_PARTS = "package-parts"
        val MULTIFILE_CLASS_FACADES = "multifile-class-facades"
        val MULTIFILE_CLASS_PARTS = "multifile-class-parts"
        val SOURCE_TO_CLASSES = "source-to-classes"
@@ -91,11 +92,11 @@ public class IncrementalCacheImpl(
    private val protoMap = registerMap(ProtoMap(PROTO_MAP.storageFile))
    private val constantsMap = registerMap(ConstantsMap(CONSTANTS_MAP.storageFile))
    private val inlineFunctionsMap = registerMap(InlineFunctionsMap(INLINE_FUNCTIONS.storageFile))
+    private val packagePartMap = registerMap(PackagePartMap(PACKAGE_PARTS.storageFile))
    private val multifileClassFacadeMap = registerMap(MultifileClassFacadeMap(MULTIFILE_CLASS_FACADES.storageFile))
    private val multifileClassPartMap = registerMap(MultifileClassPartMap(MULTIFILE_CLASS_PARTS.storageFile))
    private val sourceToClassesMap = registerMap(SourceToClassesMap(SOURCE_TO_CLASSES.storageFile))
    private val dirtyOutputClassesMap = registerMap(DirtyOutputClassesMap(DIRTY_OUTPUT_CLASSES.storageFile))
-    // TODO: can be removed?
    private val dirtyInlineFunctionsMap = registerMap(DirtyInlineFunctionsMap(DIRTY_INLINE_FUNCTIONS.storageFile))
    private val inlinedTo = registerMap(InlineFunctionsFilesMap(INLINED_TO.storageFile))

@@ -177,7 +178,8 @@ public class IncrementalCacheImpl(
            header.isCompatiblePackageFacadeKind() ->
                protoMap.process(kotlinClass, isPackage = true)
            header.isCompatibleFileFacadeKind() -> {
-                assert(sourceFiles.size == 1) { "Package part from several source files: $sourceFiles" }
+                assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" }
+                packagePartMap.addPackagePart(className)

                protoMap.process(kotlinClass, isPackage = true) +
                constantsMap.process(kotlinClass) +
@@ -193,7 +195,8 @@ public class IncrementalCacheImpl(
                inlineFunctionsMap.process(kotlinClass)
            }
            header.isCompatibleMultifileClassPartKind() -> {
-                assert(sourceFiles.size == 1) { "Multifile class part from several source files: $sourceFiles" }
+                assert(sourceFiles.size() == 1) { "Multifile class part from several source files: $sourceFiles" }
+                packagePartMap.addPackagePart(className)
                multifileClassPartMap.add(className.internalName, header.multifileClassName!!)

                protoMap.process(kotlinClass, isPackage = true) +
@@ -233,6 +236,7 @@ public class IncrementalCacheImpl(

        dirtyClasses.forEach {
            protoMap.remove(it)
+            packagePartMap.remove(it)
            multifileClassFacadeMap.remove(it)
            multifileClassPartMap.remove(it)
            constantsMap.remove(it)
@@ -243,11 +247,10 @@ public class IncrementalCacheImpl(
    }

    override fun getObsoletePackageParts(): Collection<String> {
-        return emptyList()
-//        val obsoletePackageParts =
-//                dirtyOutputClassesMap.getDirtyOutputClasses().filter { packagePartMap.isPackagePart(JvmClassName.byInternalName(it)) }
-//        KotlinBuilder.LOG.debug("Obsolete package parts: ${obsoletePackageParts}")
-//        return obsoletePackageParts
+        val obsoletePackageParts =
+                dirtyOutputClassesMap.getDirtyOutputClasses().filter { packagePartMap.isPackagePart(JvmClassName.byInternalName(it)) }
+        KotlinBuilder.LOG.debug("Obsolete package parts: ${obsoletePackageParts}")
+        return obsoletePackageParts
    }

    override fun getPackagePartData(fqName: String): JvmPackagePartProto? {
@@ -520,6 +523,21 @@ public class IncrementalCacheImpl(
                value.dumpMap { java.lang.Long.toHexString(it) }
    }

+    private inner class PackagePartMap(storageFile: File) : BasicStringMap<Boolean>(storageFile, BooleanDataDescriptor.INSTANCE) {
+        public fun addPackagePart(className: JvmClassName) {
+            storage[className.internalName] = true
+        }
+
+        public fun remove(className: JvmClassName) {
+            storage.remove(className.internalName)
+        }
+
+        public fun isPackagePart(className: JvmClassName): Boolean =
+                className.internalName in storage
+
+        override fun dumpValue(value: Boolean) = ""
+    }
+
    private inner class MultifileClassFacadeMap(storageFile: File) : BasicStringMap<List<String>>(storageFile, StringListExternalizer) {
        public fun add(facadeName: JvmClassName, partNames: List<String>) {
            storage[facadeName.internalName] = partNames
@@ -59,13 +59,13 @@ internal class LazyStorage<K, V>(
    val keys: Collection<K>
        get() = getStorageIfExists()?.allKeysWithExistingMapping ?: listOf()

-    fun contains(key: K): Boolean =
+    operator fun contains(key: K): Boolean =
            getStorageIfExists()?.containsMapping(key) ?: false

-    fun get(key: K): V? =
+    operator fun get(key: K): V? =
            getStorageIfExists()?.get(key)

-    fun set(key: K, value: V) {
+    operator fun set(key: K, value: V) {
        getStorageOrCreateNew().put(key, value)
    }

@@ -43,9 +43,9 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest {
            doTest(fileName);
        }

-        @TestMetadata("classToPackageFacade")
-        public void testClassToPackageFacade() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/");
+        @TestMetadata("classToFileFacade")
+        public void testClassToFileFacade() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/");
            doTest(fileName);
        }

@@ -1,3 +1,3 @@
 REMOVED: class MainKt$Companion.class
+REMOVED: class TestPackage.class
 changes in test/MainKt: CLASS_SIGNATURE
-changes in test/TestPackage: CLASS_SIGNATURE
@@ -1,3 +1,3 @@
 ADDED: class MainKt$Companion.class
+ADDED: class TestPackage.class
 changes in test/MainKt: CLASS_SIGNATURE
-changes in test/TestPackage: CLASS_SIGNATURE
@@ -1,4 +1,3 @@
-changes in test/TestPackage: NONE
 skip test/Utils
 changes in test/Utils__Main1Kt: MEMBERS
    [publicAddedFun1]
@@ -1,2 +1 @@
 changes in test/MainKt: NONE
-changes in test/TestPackage: NONE
@@ -1,3 +1,2 @@
 changes in test/MainKt: MEMBERS
    [addedFun, addedVal, changedFun, changedVal, removedFun, removedVal]
-changes in test/TestPackage: NONE
@@ -1,2 +1 @@
 changes in test/MainKt: NONE
-changes in test/TestPackage: NONE
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module1/META-INF/module1.kotlin_module
 out/production/module1/test/Module1_aKt.class
-out/production/module1/test/TestPackage.class
 End of files
 Compiling files:
 module1/src/module1_a.kt
@@ -1,6 +1,5 @@
 Cleaning output files:
 out/production/module2/META-INF/module2.kotlin_module
-out/production/module2/b/BPackage.class
 out/production/module2/b/Module2_bKt.class
 End of files
 Compiling files:
@@ -9,7 +8,6 @@ End of files
 Cleaning output files:
 out/production/module1/META-INF/module1.kotlin_module
 out/production/module1/a/A.class
-out/production/module1/a/APackage.class
 out/production/module1/a/Module1_aKt.class
 End of files
 Compiling files:
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module1/META-INF/module1.kotlin_module
 out/production/module1/test/Module1_constKt.class
-out/production/module1/test/TestPackage.class
 End of files
 Compiling files:
 module1/src/module1_const.kt
@@ -1,6 +1,5 @@
 Cleaning output files:
 out/production/module1/META-INF/module1.kotlin_module
-out/production/module1/inline/InlinePackage.class
 out/production/module1/inline/Module1_inlineKt.class
 End of files
 Compiling files:
@@ -9,7 +8,6 @@ End of files
 Cleaning output files:
 out/production/module2/META-INF/module2.kotlin_module
 out/production/module2/usage/Module2_usageKt.class
-out/production/module2/usage/UsagePackage.class
 End of files
 Compiling files:
 module2/src/module2_usage.kt
@@ -1,6 +1,5 @@
 Cleaning output files:
 out/production/module1/META-INF/module1.kotlin_module
-out/production/module1/inline/InlinePackage.class
 out/production/module1/inline/Module1_inlineFKt.class
 End of files
 Compiling files:
@@ -9,7 +8,6 @@ End of files
 Cleaning output files:
 out/production/module2/META-INF/module2.kotlin_module
 out/production/module2/usage/Module2_usageFKt.class
-out/production/module2/usage/UsagePackage.class
 End of files
 Compiling files:
 module2/src/module2_usageF.kt
@@ -18,7 +16,6 @@ End of files

 Cleaning output files:
 out/production/module1/META-INF/module1.kotlin_module
-out/production/module1/inline/InlinePackage.class
 out/production/module1/inline/Module1_inlineGKt.class
 End of files
 Compiling files:
@@ -27,7 +24,6 @@ End of files
 Cleaning output files:
 out/production/module2/META-INF/module2.kotlin_module
 out/production/module2/usage/Module2_usageGKt.class
-out/production/module2/usage/UsagePackage.class
 End of files
 Compiling files:
 module2/src/module2_usageG.kt
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module1/META-INF/module1.kotlin_module
 out/production/module1/a/A.class
-out/production/module1/a/APackage.class
 out/production/module1/a/Module1_aKt.class
 End of files
 Compiling files:
@@ -9,7 +8,6 @@ module1/src/module1_a.kt
 End of files
 Cleaning output files:
 out/production/module2/META-INF/module2.kotlin_module
-out/production/module2/b/BPackage.class
 out/production/module2/b/Module2_bKt.class
 End of files
 Compiling files:
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module1/META-INF/module1.kotlin_module
 out/production/module1/a/A.class
-out/production/module1/a/APackage.class
 out/production/module1/a/Module1_aKt.class
 End of files
 Compiling files:
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module1/META-INF/module1.kotlin_module
 out/production/module1/a/A.class
-out/production/module1/a/APackage.class
 out/production/module1/a/Module1_aKt.class
 End of files
 Compiling files:
@@ -9,7 +8,6 @@ module1/src/module1_a.kt
 End of files
 Cleaning output files:
 out/production/module2/META-INF/module2.kotlin_module
-out/production/module2/b/BPackage.class
 out/production/module2/b/Module2_bKt.class
 End of files
 Compiling files:
@@ -1,6 +1,5 @@
 Cleaning output files:
 out/production/module1/META-INF/module1.kotlin_module
-out/production/module1/a/APackage.class
 out/production/module1/a/Module1_aKt.class
 End of files
 Compiling files:
@@ -8,7 +7,6 @@ module1/src/module1_a.kt
 End of files
 Cleaning output files:
 out/production/module2/META-INF/module2.kotlin_module
-out/production/module2/b/BPackage.class
 out/production/module2/b/Module2_bKt.class
 End of files
 Compiling files:
@@ -16,7 +14,6 @@ module2/src/module2_b.kt
 End of files
 Cleaning output files:
 out/production/module3/META-INF/module3.kotlin_module
-out/production/module3/c/CPackage.class
 out/production/module3/c/Module3_cKt.class
 End of files
 Compiling files:
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module1/META-INF/module1.kotlin_module
 out/production/module1/a/A.class
-out/production/module1/a/APackage.class
 out/production/module1/a/Module1_aKt.class
 End of files
 Compiling files:
@@ -9,7 +8,6 @@ module1/src/module1_a.kt
 End of files
 Cleaning output files:
 out/production/module3/META-INF/module3.kotlin_module
-out/production/module3/c/CPackage.class
 out/production/module3/c/Module3_cKt.class
 End of files
 Compiling files:
@@ -17,7 +15,6 @@ module3/src/module3_c.kt
 End of files
 Cleaning output files:
 out/production/module2/META-INF/module2.kotlin_module
-out/production/module2/b/BPackage.class
 out/production/module2/b/Module2_bKt.class
 End of files
 Compiling files:
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/BKt.class
-out/production/module/test/TestPackage.class
 out/production/module/test/UsageKt.class
 End of files
 Compiling files:
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/BKt.class
-out/production/module/test/TestPackage.class
 out/production/module/test/UsageKt.class
 End of files
 Compiling files:
@@ -11,13 +10,9 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/other/OtherKt.class
-out/production/module/other/OtherPackage.class
 out/production/module/test/AKt.class
-out/production/module/test/TestPackage.class
-out/production/module/test/UsageKt.class
 End of files
 Compiling files:
 src/a.kt
 src/other.kt
-src/usage.kt
-End of files
+End of files
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/BKt.class
-out/production/module/test/TestPackage.class
 out/production/module/test/UsageKt.class
 End of files
 Compiling files:
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/ConstKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/const.kt
@@ -11,7 +10,6 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/ConstKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/const.kt
@@ -2,7 +2,6 @@ Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/a/AKt$foo$1.class
 out/production/module/a/AKt.class
-out/production/module/a/APackage.class
 End of files
 Compiling files:
 src/a.kt
@@ -7,7 +7,6 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/usage/UsageKt.class
-out/production/module/usage/UsagePackage.class
 End of files
 Compiling files:
 src/usage.kt
@@ -6,7 +6,6 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/OtherKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/other.kt
@@ -19,7 +18,6 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/OtherKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/other.kt
@@ -6,7 +6,6 @@ src/class.kt
 End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
-out/production/module/test/TestPackage.class
 out/production/module/test/UsageKt.class
 End of files
 Compiling files:
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/usage/UsageKt.class
-out/production/module/usage/UsagePackage.class
 End of files
 Compiling files:
 src/usage.kt
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/UsageKt.class
-out/production/module/_DefaultPackage.class
 End of files
 Compiling files:
 src/usage.kt
@@ -10,10 +9,6 @@ COMPILATION FAILED
 Expecting an expression


-Cleaning output files:
-out/production/module/FunKt.class
-End of files
 Compiling files:
-src/fun.kt
 src/usage.kt
 End of files
@@ -12,10 +12,13 @@ COMPILATION FAILED
 Expecting an expression


+Compiling files:
+src/usage.kt
+End of files
 Cleaning output files:
 out/production/module/FunKt.class
+out/production/module/META-INF/module.kotlin_module
 End of files
 Compiling files:
 src/fun.kt
-src/usage.kt
 End of files
@@ -2,7 +2,6 @@ Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/OtherKt.class
 out/production/module/UsageKt.class
-out/production/module/_DefaultPackage.class
 End of files
 Compiling files:
 src/other.kt
@@ -12,24 +11,14 @@ COMPILATION FAILED
 Expecting an expression


-Cleaning output files:
-out/production/module/FunKt.class
-End of files
 Compiling files:
-src/fun.kt
 src/other.kt
 src/usage.kt
 End of files
 Cleaning output files:
 out/production/module/FunKt.class
 out/production/module/META-INF/module.kotlin_module
-out/production/module/UsageKt.class
-out/production/module/_DefaultPackage.class
-out/production/module/new/NewPackage.class
-out/production/module/new/OtherKt.class
 End of files
 Compiling files:
 src/fun.kt
-src/other.kt
-src/usage.kt
 End of files
@@ -2,7 +2,6 @@ Cleaning output files:
 out/production/module/B.class
 out/production/module/META-INF/module.kotlin_module
 out/production/module/UsageKt.class
-out/production/module/_DefaultPackage.class
 End of files
 Compiling files:
 src/other.kt
@@ -20,9 +19,7 @@ Cleaning output files:
 out/production/module/A.class
 out/production/module/META-INF/module.kotlin_module
 out/production/module/UsageKt.class
-out/production/module/_DefaultPackage.class
 out/production/module/new/LikePartKt.class
-out/production/module/new/NewPackage.class
 End of files
 Compiling files:
 src/fun.kt
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/ConstKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/const.kt
@@ -3,7 +3,6 @@ out/production/module/META-INF/module.kotlin_module
 out/production/module/test/ConstKt.class
 out/production/module/test/Klass$Companion.class
 out/production/module/test/Klass.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/const.kt
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/AKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/a.kt
@@ -1,14 +1,12 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/ConstKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/usage/UsageKt.class
-out/production/module/usage/UsagePackage.class
 End of files
 Compiling files:
 src/usage.kt
@@ -5,7 +5,10 @@ End of files
 Compiling files:
 src/fun2.kt
 End of files
-COMPILATION FAILED
-Platform declaration clash: The following declarations have the same JVM signature (function()V):
-    fun function(): kotlin.Unit
-    fun function(): kotlin.Unit
+Cleaning output files:
+out/production/module/META-INF/module.kotlin_module
+out/production/module/test/Fun1Kt.class
+End of files
+Compiling files:
+src/fun1.kt
+End of files
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/inline/InlineKt.class
-out/production/module/inline/InlinePackage.class
 End of files
 Compiling files:
 src/inline.kt
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/AKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/a.kt
@@ -9,7 +8,6 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/BKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/b.kt
@@ -17,7 +15,6 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/AKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/a.kt
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/inline/InlineKt.class
-out/production/module/inline/InlinePackage.class
 out/production/module/inline/Klass.class
 End of files
 Compiling files:
@@ -1,14 +1,12 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/inline/InlineKt.class
-out/production/module/inline/InlinePackage.class
 End of files
 Compiling files:
 src/inline.kt
 End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
-out/production/module/usage/UsagePackage.class
 out/production/module/usage/UseGKt.class
 End of files
 Compiling files:
@@ -1,14 +1,12 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/inline/InlineKt.class
-out/production/module/inline/InlinePackage.class
 End of files
 Compiling files:
 src/inline.kt
 End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
-out/production/module/usage/UsagePackage.class
 out/production/module/usage/UsesGKt.class
 End of files
 Compiling files:
@@ -2,7 +2,6 @@ Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/AKt$foo$X.class
 out/production/module/test/AKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/a.kt
@@ -4,7 +4,6 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/Test.class
-out/production/module/test/TestPackage.class
 out/production/module/test/Test__AKt.class
 out/production/module/test/Test__BKt.class
 End of files
@@ -15,7 +14,6 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/Test.class
-out/production/module/test/TestPackage.class
 out/production/module/test/Test__AKt.class
 End of files
 Compiling files:
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/Test.class
-out/production/module/test/TestPackage.class
 out/production/module/test/Test__BKt.class
 End of files
 Compiling files:
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/Test.class
-out/production/module/test/TestPackage.class
 out/production/module/test/Test__BKt.class
 End of files
 Compiling files:
@@ -10,7 +9,6 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/Test.class
-out/production/module/test/TestPackage.class
 out/production/module/test/Test__AKt.class
 End of files
 Compiling files:
@@ -1,6 +1,5 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
-out/production/module/test/TestPackage.class
 out/production/module/test/UsageKt.class
 End of files
 Compiling files:
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/Test.class
-out/production/module/test/TestPackage.class
 out/production/module/test/Test__AKt.class
 End of files
 Compiling files:
@@ -15,7 +14,6 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test2/Test2.class
-out/production/module/test2/Test2Package.class
 out/production/module/test2/Test2__AKt.class
 End of files
 Compiling files:
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/AKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/a.kt
@@ -12,7 +11,6 @@ Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/klass/Klass.class
 out/production/module/test/AKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/Klass.kt
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/ConstKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/const.kt
@@ -4,7 +4,6 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/AKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/a.kt
@@ -1,19 +1,14 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/BKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/b.kt
 End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
-out/production/module/newName/BKt.class
-out/production/module/newName/NewNamePackage.class
 out/production/module/test/AKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/a.kt
-src/b.kt
 End of files
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/AKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/a.kt
@@ -11,14 +10,12 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/BKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/AKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/a.kt
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/AKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/a.kt
@@ -11,7 +10,6 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/BKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/b.kt
@@ -21,7 +19,6 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/AKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/a.kt
@@ -1,6 +1,5 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
-out/production/module/test/TestPackage.class
 out/production/module/test/UsageKt.class
 End of files
 Compiling files:
@@ -1,6 +1,5 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
-out/production/module/test/TestPackage.class
 out/production/module/test/Utils.class
 out/production/module/test/Utils__Pkg1Kt.class
 out/production/module/test/Utils__Pkg2Kt.class
@@ -1,6 +1,5 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
-out/production/module/test/TestPackage.class
 out/production/module/test/Utils.class
 out/production/module/test/Utils__Pkg1Kt.class
 out/production/module/test/Utils__Pkg2Kt.class
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/PkgKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/pkg.kt
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/AKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 End of files
@@ -1,15 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/AKt.class
-out/production/module/test/TestPackage.class
-End of files
-Compiling files:
-src/a.kt
-End of files
-Cleaning output files:
-out/production/module/META-INF/module.kotlin_module
-out/production/module/test2/AKt.class
-out/production/module/test2/Test2Package.class
 End of files
 Compiling files:
 src/a.kt
@@ -22,7 +13,6 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test2/AKt.class
-out/production/module/test2/Test2Package.class
 End of files
 Compiling files:
 src/a.kt
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/AKt.class
-out/production/module/test/TestPackage.class
 End of files
 Cleaning output files:
 out/production/module/test/BKt.class
@@ -5,7 +5,10 @@ End of files
 Compiling files:
 src/prop2.kt
 End of files
-COMPILATION FAILED
-Platform declaration clash: The following declarations have the same JVM signature (getProperty()I):
-    fun <get-property>(): kotlin.Int
-    fun <get-property>(): kotlin.Int
+Cleaning output files:
+out/production/module/META-INF/module.kotlin_module
+out/production/module/test/Prop1Kt.class
+End of files
+Compiling files:
+src/prop1.kt
+End of files
@@ -2,7 +2,6 @@ Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/outer/nested/NestedKt$main$1.class
 out/production/module/outer/nested/NestedKt.class
-out/production/module/outer/nested/NestedPackage.class
 End of files
 Compiling files:
 src/nested.kt
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/FunKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/fun.kt
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/AKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/a.kt
@@ -1,6 +1,5 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
-out/production/module/test/TestPackage.class
 out/production/module/test/UsageKt.class
 End of files
 Compiling files:
@@ -10,10 +9,6 @@ COMPILATION FAILED
 Cannot access 'foo': it is 'private' in file


-Cleaning output files:
-out/production/module/test/FooKt.class
-End of files
 Compiling files:
-src/foo.kt
 src/usage.kt
-End of files
+End of files