Recompile subtypes when class member is changed

Original commit: a474165a8f
2016-01-22 15:47:35 +03:00
parent 26debc1dec
commit 08e62d3303
24 changed files with 127 additions and 5 deletions
@@ -744,6 +744,7 @@ private fun CompilationResult.doProcessChangesUsingLookups(
        caches: Collection<IncrementalCacheImpl<*>>
 ) {
    val dirtyLookupSymbols = HashSet<LookupSymbol>()
+    val dirtyClassesFqNames = HashSet<FqName>()
    val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, JpsLookupStorageProvider)
    val allCaches: Sequence<IncrementalCacheImpl<*>> = caches.asSequence().flatMap { it.dependentsWithThis }

@@ -764,10 +765,12 @@ private fun CompilationResult.doProcessChangesUsingLookups(
            }
        }
        else if (change is ChangeInfo.MembersChanged) {
-            val scopes = withSubtypes(change.fqName, allCaches).map { it.asString() }
+            val fqNames = withSubtypes(change.fqName, allCaches)
+            // need to recompile subtypes because changed member might break override
+            dirtyClassesFqNames.addAll(fqNames)

-            change.names.forAllPairs(scopes) { name, scope ->
-                dirtyLookupSymbols.add(LookupSymbol(name, scope))
+            change.names.forAllPairs(fqNames) { name, fqName ->
+                dirtyLookupSymbols.add(LookupSymbol(name, fqName.asString()))
            }
        }
    }
@@ -782,6 +785,13 @@ private fun CompilationResult.doProcessChangesUsingLookups(
        dirtyFiles.addAll(affectedFiles)
    }

+    for (cache in allCaches) {
+        for (dirtyClassFqName in dirtyClassesFqNames) {
+            val srcFile = cache.getSourceFileIfClass(dirtyClassFqName) ?: continue
+            dirtyFiles.add(srcFile)
+        }
+    }
+
    fsOperations.markFiles(dirtyFiles.asIterable(), excludeFiles = compiledFiles)
    KotlinBuilder.LOG.debug("End of processing changes")
 }
@@ -1213,6 +1213,18 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta
            doTest(fileName);
        }

+        @TestMetadata("overrideExplicit")
+        public void testOverrideExplicit() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("overrideImplicit")
+        public void testOverrideImplicit() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/");
+            doTest(fileName);
+        }
+
        @TestMetadata("packageFacadeToClass")
        public void testPackageFacadeToClass() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/");
@@ -7,12 +7,14 @@ kotlin-data-container
 Module 'module1' production
    experimental-format-version.txt
    format-version.txt
+    class-fq-name-to-source.tab
    proto.tab
    source-to-classes.tab
 Module 'module1' tests
 Module 'module2' production
    experimental-format-version.txt
    format-version.txt
+    class-fq-name-to-source.tab
    package-parts.tab
    proto.tab
    source-to-classes.tab
@@ -22,12 +24,14 @@ Module 'module2' tests
 Module 'module3' production
    experimental-format-version.txt
    format-version.txt
+    class-fq-name-to-source.tab
    proto.tab
    source-to-classes.tab
 Module 'module3' tests
 Module 'module4' production
    experimental-format-version.txt
    format-version.txt
+    class-fq-name-to-source.tab
    proto.tab
    source-to-classes.tab
 Module 'module4' tests
@@ -5,6 +5,8 @@ Compiling files:
 src/B.kt
 End of files
 Cleaning output files:
+out/production/module/A$AA.class
+out/production/module/A.class
 out/production/module/CompanionExtensionKt.class
 out/production/module/CompanionReferenceExplicitKt.class
 out/production/module/CompanionReferenceImplicitKt.class
@@ -12,6 +14,7 @@ out/production/module/ImportedMemberKt.class
 out/production/module/META-INF/module.kotlin_module
 End of files
 Compiling files:
+src/A.kt
 src/companionExtension.kt
 src/companionReferenceExplicit.kt
 src/companionReferenceImplicit.kt
@@ -28,6 +31,7 @@ Cleaning output files:
 out/production/module/B.class
 End of files
 Compiling files:
+src/A.kt
 src/B.kt
 src/companionExtension.kt
 src/companionReferenceExplicit.kt
@@ -6,8 +6,10 @@ src/A.kt
 End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
+out/production/module/foo/AChild.class
 out/production/module/foo/UseAChildKt.class
 End of files
 Compiling files:
+src/AChild.kt
 src/useAChild.kt
 End of files
@@ -6,8 +6,10 @@ src/A.kt
 End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
+out/production/module/foo/AChild.class
 out/production/module/foo/UseAChildKt.class
 End of files
 Compiling files:
+src/AChild.kt
 src/useAChild.kt
 End of files
@@ -6,9 +6,11 @@ src/A.kt
 End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
+out/production/module/foo/AChild.class
 out/production/module/foo/UseAChildKt.class
 End of files
 Compiling files:
+src/AChild.kt
 src/useAChild.kt
 End of files
 COMPILATION FAILED
@@ -20,5 +22,6 @@ out/production/module/foo/A.class
 End of files
 Compiling files:
 src/A.kt
+src/AChild.kt
 src/useAChild.kt
 End of files
@@ -0,0 +1,3 @@
+open class A {
+    open fun f(c: C<Any>) {}
+}
@@ -0,0 +1,3 @@
+open class A {
+    open fun f(c: C<Any?>) {}
+}
@@ -0,0 +1,3 @@
+open class A {
+    open fun f(c: C<Any>) {}
+}
@@ -0,0 +1,3 @@
+class B : A() {
+    override fun f(c: C<Any>) {}
+}
@@ -0,0 +1 @@
+class C<out T>
@@ -0,0 +1,23 @@
+Cleaning output files:
+out/production/module/A.class
+End of files
+Compiling files:
+src/A.kt
+End of files
+Cleaning output files:
+out/production/module/B.class
+End of files
+Compiling files:
+src/B.kt
+End of files
+COMPILATION FAILED
+'f' overrides nothing
+
+
+Cleaning output files:
+out/production/module/A.class
+End of files
+Compiling files:
+src/A.kt
+src/B.kt
+End of files
@@ -0,0 +1,3 @@
+interface A {
+    fun f(c: C<Any>)
+}
@@ -0,0 +1,3 @@
+open class B {
+    fun f(c: C<Any>) {}
+}
@@ -0,0 +1,3 @@
+open class B {
+    fun f(c: C<Int>) {}
+}
@@ -0,0 +1,3 @@
+open class B {
+    fun f(c: C<Any>) {}
+}
@@ -0,0 +1 @@
+open class BA : B(), A
@@ -0,0 +1 @@
+class C<out T>
@@ -0,0 +1,23 @@
+Cleaning output files:
+out/production/module/B.class
+End of files
+Compiling files:
+src/B.kt
+End of files
+Cleaning output files:
+out/production/module/BA.class
+End of files
+Compiling files:
+src/BA.kt
+End of files
+COMPILATION FAILED
+Class 'BA' must be declared abstract or implement abstract member public abstract fun f(c: C<kotlin.Any>): kotlin.Unit defined in A
+
+
+Cleaning output files:
+out/production/module/B.class
+End of files
+Compiling files:
+src/B.kt
+src/BA.kt
+End of files
@@ -7,9 +7,11 @@ src/A.kt
 End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
+out/production/module/foo/AChild.class
 out/production/module/foo/UseAChildKt.class
 End of files
 Compiling files:
+src/AChild.kt
 src/useAChild.kt
 End of files
 COMPILATION FAILED
@@ -21,5 +23,6 @@ out/production/module/foo/A.class
 End of files
 Compiling files:
 src/A.kt
+src/AChild.kt
 src/useAChild.kt
 End of files
@@ -7,6 +7,7 @@ kotlin-data-container
 Module 'module' production
    experimental-format-version.txt
    format-version.txt
+    class-fq-name-to-source.tab
    proto.tab
    source-to-classes.tab
-Module 'module' tests
+Module 'module' tests
@@ -7,8 +7,9 @@ kotlin-data-container
 Module 'module' production
    experimental-format-version.txt
    format-version.txt
+    class-fq-name-to-source.tab
    proto.tab
    source-to-classes.tab
    subtypes.tab
    supertypes.tab
-Module 'module' tests
+Module 'module' tests
@@ -7,3 +7,10 @@ End of files
 Compiling files:
 module2/src/module2_b.kt
 End of files
+Cleaning output files:
+out/production/module1/a/A.class
+out/production/module1/a/AA.class
+End of files
+Compiling files:
+module1/src/module1_a.kt
+End of files