From ba386f031bfb5b0742caf7745ecedbaa16d7c25f Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 19 Feb 2016 16:00:09 +0300 Subject: [PATCH] Pass isPackage = false when processing class proto KT-8487 --- .../jetbrains/kotlin/incremental/IncrementalCacheImpl.kt | 2 +- .../pureKotlin/classObjectConstantChanged/build.log | 2 +- .../classObjectConstantChanged/experimental-ic-build.log | 6 ++++-- .../incremental/pureKotlin/objectConstantChanged/build.log | 2 +- .../objectConstantChanged/experimental-ic-build.log | 4 +++- .../pureKotlin/traitClassObjectConstantChanged/build.log | 2 +- .../experimental-ic-build.log | 4 +++- 7 files changed, 14 insertions(+), 8 deletions(-) diff --git a/build-common/src/org/jetbrains/kotlin/incremental/IncrementalCacheImpl.kt b/build-common/src/org/jetbrains/kotlin/incremental/IncrementalCacheImpl.kt index dbe875954de..903cb95971a 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/IncrementalCacheImpl.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/IncrementalCacheImpl.kt @@ -191,7 +191,7 @@ open class IncrementalCacheImpl( addToClassStorage(kotlinClass, sourceFiles.first()) protoMap.process(kotlinClass, isPackage = false) + - constantsMap.process(kotlinClass, isPackage = true) + + constantsMap.process(kotlinClass, isPackage = false) + inlineFunctionsMap.process(kotlinClass, isPackage = false) } else -> CompilationResult.NO_CHANGES diff --git a/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log index 9709f96d08e..fb1d8a2567e 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log @@ -16,4 +16,4 @@ Compiling files: src/usage.kt End of files Exit code: OK ------------------------------------------- +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/experimental-ic-build.log index bf455b07c77..8b4f21d7ead 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/experimental-ic-build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/experimental-ic-build.log @@ -7,7 +7,9 @@ End of files Compiling files: src/const.kt End of files -Exit code: OK +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/test/Klass$Companion.class @@ -19,4 +21,4 @@ Compiling files: src/usage.kt End of files Exit code: OK ------------------------------------------- +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log index 5ef732c6a6f..144b5ab2934 100644 --- a/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log @@ -15,4 +15,4 @@ Compiling files: src/usage.kt End of files Exit code: OK ------------------------------------------- +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/experimental-ic-build.log index 1b6aab2fc85..4c041f2743b 100644 --- a/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/experimental-ic-build.log +++ b/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/experimental-ic-build.log @@ -6,7 +6,9 @@ End of files Compiling files: src/const.kt End of files -Exit code: OK +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/test/Object.class diff --git a/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log index c4ae0d3901e..ff93496f568 100644 --- a/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log @@ -16,4 +16,4 @@ Compiling files: src/usage.kt End of files Exit code: OK ------------------------------------------- +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/experimental-ic-build.log index 33d35483270..ebb5d82b894 100644 --- a/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/experimental-ic-build.log +++ b/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/experimental-ic-build.log @@ -7,7 +7,9 @@ End of files Compiling files: src/const.kt End of files -Exit code: OK +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/test/Trait$Companion.class