azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Invalidate usages of removed classes before round

Browse Source 
#KT-23165 fixed
This commit is contained in:
Alexey Tsvetkov
2018-03-27 16:29:09 +03:00
parent 8cd0f13f2b
commit 3eb968807e
43 changed files with 610 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/A.kt
Vendored
+6
View File
@@ -0,0 +1,6 @@
open class A {
}
open class X {
open fun f() {}
}
jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/A.kt.new
Vendored
+6
View File
@@ -0,0 +1,6 @@
open class A {
open class X {
open fun g() {}
}
}
jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/B.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
open class B : A() {
open inner class Y : X()
}
jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/C.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
open class C : B() {
open inner class Z : Y() {
override fun f() {}
}
}
jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/C.kt.new
Vendored
+5
View File
@@ -0,0 +1,5 @@
open class C : B() {
open inner class Z : Y() {
override fun g() {}
}
}
jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/build.log
Vendored
+21
View File
@@ -0,0 +1,21 @@
================ Step #1 =================
Marked as dirty by Kotlin:
src/A.kt
src/B.kt
src/C.kt
Cleaning output files:
out/production/module/A.class
out/production/module/B$Y.class
out/production/module/B.class
out/production/module/C$Z.class
out/production/module/C.class
out/production/module/X.class
End of files
Compiling files:
src/A.kt
src/B.kt
src/C.kt
End of files
Exit code: OK
------------------------------------------
jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/build.log
Vendored
+22 -21
View File
@@ -3,16 +3,35 @@
Cleaning output files:
out/production/module/foo/A.class
End of files
Marked as dirty by Kotlin:
src/B.kt
src/C.kt
src/createA.kt
src/createB.kt
src/createC.kt
src/useAfoo.kt
src/useBbar.kt
src/useCbaz.kt
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/B.class
out/production/module/foo/C.class
out/production/module/use/CreateAKt.class
out/production/module/use/CreateBKt.class
out/production/module/use/CreateCKt.class
out/production/module/use/UseAfooKt.class
out/production/module/use/UseBbarKt.class
out/production/module/use/UseCbazKt.class
End of files
Compiling files:
src/B.kt
src/C.kt
src/createA.kt
src/createB.kt
src/createC.kt
src/useAfoo.kt
src/useBbar.kt
src/useCbaz.kt
End of files
Exit code: ABORT
------------------------------------------
@@ -24,30 +43,12 @@ Unresolved reference: A
Compiling files:
src/B.kt
src/C.kt
src/createA.kt
src/createB.kt
src/createC.kt
src/funA.kt
src/useAfoo.kt
End of files
Marked as dirty by Kotlin:
src/C.kt
src/createB.kt
src/createC.kt
src/useBbar.kt
src/useCbaz.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/C.class
out/production/module/use/CreateBKt.class
out/production/module/use/CreateCKt.class
out/production/module/use/UseBbarKt.class
out/production/module/use/UseCbazKt.class
End of files
Compiling files:
src/C.kt
src/createB.kt
src/createC.kt
src/useBbar.kt
src/useCbaz.kt
End of files
jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/build.log
Vendored
+12
View File
@@ -3,16 +3,26 @@
Cleaning output files:
out/production/module/foo/A.class
End of files
Marked as dirty by Kotlin:
src/B.kt
src/createA.kt
src/createB.kt
src/useAfoo.kt
src/useBbar.kt
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/B.class
out/production/module/use/CreateAKt.class
out/production/module/use/CreateBKt.class
out/production/module/use/UseAfooKt.class
out/production/module/use/UseBbarKt.class
End of files
Compiling files:
src/B.kt
src/createA.kt
src/createB.kt
src/useAfoo.kt
src/useBbar.kt
End of files
Exit code: ABORT
------------------------------------------
@@ -26,7 +36,9 @@ Compiling files:
src/A.kt
src/B.kt
src/createA.kt
src/createB.kt
src/useAfoo.kt
src/useBbar.kt
End of files
Exit code: OK
------------------------------------------
jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log
Vendored
+13 -16
View File
@@ -1,28 +1,19 @@
================ Step #1 =================
Cleaning output files:
out/production/module/A$Companion.class
out/production/module/A.class
End of files
Compiling files:
src/A.kt
End of files
Marked as dirty by Kotlin:
src/companionExtension.kt
src/companionReferenceExplicit.kt
src/companionReferenceImplicit.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/A$Companion.class
out/production/module/A.class
out/production/module/CompanionExtensionKt.class
out/production/module/CompanionReferenceExplicitKt.class
out/production/module/CompanionReferenceImplicitKt.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
End of files
Exit code: ABORT
------------------------------------------
@@ -32,14 +23,20 @@ Unresolved reference: Companion
================ Step #2 =================
Cleaning output files:
out/production/module/A$AA.class
out/production/module/A.class
End of files
Compiling files:
src/A.kt
src/companionExtension.kt
src/companionReferenceExplicit.kt
End of files
Marked as dirty by Kotlin:
src/companionReferenceImplicit.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/CompanionReferenceImplicitKt.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/companionReferenceImplicit.kt
End of files
Exit code: OK
jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/gradle-build.log
Vendored
-22
View File
@@ -1,22 +0,0 @@
================ Step #1 =================
Compiling files:
src/A.kt
src/companionExtension.kt
src/companionReferenceExplicit.kt
src/companionReferenceImplicit.kt
End of files
Exit code: ABORT
------------------------------------------
COMPILATION FAILED
Unresolved reference: Companion
Unresolved reference: Companion
================ Step #2 =================
Compiling files:
src/companionExtension.kt
src/companionReferenceExplicit.kt
src/companionReferenceImplicit.kt
End of files
Exit code: OK
jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/js-build.log
Vendored
+20
View File
@@ -0,0 +1,20 @@
================ Step #1 =================
Compiling files:
src/Enum.kt
src/use.kt
End of files
Exit code: ABORT
------------------------------------------
COMPILATION FAILED
Unresolved reference: C
================ Step #2 =================
Compiling files:
src/Enum.kt
src/getRandomEnumEntry.kt
src/use.kt
src/useEnumImplicitly.kt
End of files
Exit code: OK