From 14121a1d9a353bc46386b5d569510e123684448d Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 16 Feb 2021 11:01:47 +0100 Subject: [PATCH] FIR: Disable java tracking in FIR IC until it is properly implemented, fixes some IC tests for now, making it less pecise --- .../IncrementalJvmCompilerRunner.kt | 2 +- .../addNestedClass/fir-build.log | 22 ++++++++++ .../changeFieldType/fir-build.log | 20 ++++++++++ .../changePropertyOverrideType/fir-build.log | 20 ++++++++++ .../changeSignature/fir-build.log | 20 ++++++++++ .../gradle-fir-build.log | 8 ++++ .../fir-build.log | 15 +++++++ .../changeSignatureStatic/fir-build.log | 20 ++++++++++ .../constantUnchanged/fir-build.log | 19 +++++++++ .../notChangeSignature/fir-build.log | 19 +++++++++ .../other/packageFacadeToClass/fir-build.log | 40 +++++++++++++++++++ 11 files changed, 204 insertions(+), 1 deletion(-) create mode 100644 jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/fir-build.log create mode 100644 jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/fir-build.log create mode 100644 jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/fir-build.log create mode 100644 jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/fir-build.log create mode 100644 jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/gradle-fir-build.log create mode 100644 jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/fir-build.log create mode 100644 jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/fir-build.log create mode 100644 jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/fir-build.log create mode 100644 jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/fir-build.log create mode 100644 jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/fir-build.log diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt index 9c5da3b4972..78b0811b9f8 100644 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt +++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt @@ -75,7 +75,7 @@ fun makeIncrementally( cachesDir, buildReporter, // Use precise setting in case of non-Gradle build - usePreciseJavaTracking = true, + usePreciseJavaTracking = !args.useFir, // TODO: add fir-based java classes tracker when available and set this to true outputFiles = emptyList(), buildHistoryFile = buildHistoryFile, modulesApiHistory = EmptyModulesApiHistory, diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/fir-build.log b/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/fir-build.log new file mode 100644 index 00000000000..476f0317c03 --- /dev/null +++ b/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/fir-build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/JavaClass.class +End of files +Exit code: NOTHING_DONE +------------------------------------------ +Compiling files: + src/JavaClass.java +End of files +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/UsageKt.class +End of files +Compiling files: + src/notUsage.kt + src/usage.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Unresolved reference: Nested diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/fir-build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/fir-build.log new file mode 100644 index 00000000000..c3401798a52 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/fir-build.log @@ -0,0 +1,20 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/JavaClass.class +End of files +Exit code: NOTHING_DONE +------------------------------------------ +Compiling files: + src/JavaClass.java +End of files +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/UsageKt.class +End of files +Compiling files: + src/notUsage.kt + src/usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/fir-build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/fir-build.log new file mode 100644 index 00000000000..1a89b669b01 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/fir-build.log @@ -0,0 +1,20 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/JavaClass.class +End of files +Exit code: NOTHING_DONE +------------------------------------------ +Compiling files: + src/JavaClass.java +End of files +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/UsageKt.class +End of files +Compiling files: + src/usage.kt + src/notUsage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/fir-build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/fir-build.log new file mode 100644 index 00000000000..1a89b669b01 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/fir-build.log @@ -0,0 +1,20 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/JavaClass.class +End of files +Exit code: NOTHING_DONE +------------------------------------------ +Compiling files: + src/JavaClass.java +End of files +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/UsageKt.class +End of files +Compiling files: + src/usage.kt + src/notUsage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/gradle-fir-build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/gradle-fir-build.log new file mode 100644 index 00000000000..ce36458a102 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/gradle-fir-build.log @@ -0,0 +1,8 @@ +================ Step #1 ================= + +Compiling files: + src/notUsage.kt + src/usage.kt +End of files +Exit code: OK + diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/fir-build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/fir-build.log new file mode 100644 index 00000000000..87c512db88a --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/fir-build.log @@ -0,0 +1,15 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/JavaClass.class +End of files +Exit code: NOTHING_DONE +------------------------------------------ +Compiling files: + src/notUsage.kt + src/usage.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Symbol /JavaClass.foo is invisible diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/fir-build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/fir-build.log new file mode 100644 index 00000000000..1a89b669b01 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/fir-build.log @@ -0,0 +1,20 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/JavaClass.class +End of files +Exit code: NOTHING_DONE +------------------------------------------ +Compiling files: + src/JavaClass.java +End of files +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/UsageKt.class +End of files +Compiling files: + src/usage.kt + src/notUsage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/fir-build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/fir-build.log new file mode 100644 index 00000000000..6acfcd2c480 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/fir-build.log @@ -0,0 +1,19 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/JavaClass.class +End of files +Exit code: NOTHING_DONE +------------------------------------------ +Compiling files: + src/JavaClass.java +End of files +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/fir-build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/fir-build.log new file mode 100644 index 00000000000..6acfcd2c480 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/fir-build.log @@ -0,0 +1,19 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/JavaClass.class +End of files +Exit code: NOTHING_DONE +------------------------------------------ +Compiling files: + src/JavaClass.java +End of files +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/fir-build.log b/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/fir-build.log new file mode 100644 index 00000000000..d36b2cede11 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/fir-build.log @@ -0,0 +1,40 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/A.class + out/production/module/A__APartFKt.class + out/production/module/META-INF/module.kotlin_module +End of files +Cleaning output files: + out/production/module/A__APartGKt.class +End of files +Cleaning output files: + out/production/module/UseFJava.class + out/production/module/UseFKt.class + out/production/module/UseGKt.class +End of files +Compiling files: + src/A.kt + src/useAA.kt + src/useF.kt + src/useG.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Unresolved reference: f +Unresolved reference: g + +================ Step #2 ================= + +Compiling files: + src/A.kt + src/useAA.kt + src/useF.kt + src/useG.kt +End of files +Exit code: OK +------------------------------------------ +Compiling files: + src/UseFJava.java +End of files