From 41dd6250d4bb15b683fff3095d500ef9d6fc47c9 Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Fri, 14 May 2021 18:02:09 +0300 Subject: [PATCH] Implemented collecting use-old-backend flag from Gradle #KT-46689 Fixed --- .../kotlin/idea/statistics/KotlinGradleFUSLogger.kt | 3 ++- .../compilerRunner/GradleKotlinCompilerRunner.kt | 11 +++++++---- .../kotlin/statistics/metrics/StringMetrics.kt | 2 ++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/statistics/KotlinGradleFUSLogger.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/statistics/KotlinGradleFUSLogger.kt index 590d8e6fbfc..6b45e16fc10 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/statistics/KotlinGradleFUSLogger.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/statistics/KotlinGradleFUSLogger.kt @@ -129,7 +129,8 @@ class KotlinGradleFUSLogger : StartupActivity, DumbAware, Runnable { BooleanMetrics.ENABLED_COMPILER_PLUGIN_JPA_SUPPORT, BooleanMetrics.ENABLED_COMPILER_PLUGIN_SAM_WITH_RECEIVER, BooleanMetrics.JVM_COMPILER_IR_MODE, - StringMetrics.JVM_DEFAULTS + StringMetrics.JVM_DEFAULTS, + StringMetrics.USE_OLD_BACKEND ) container.log( diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt index 2fa17598156..2390b53d7d6 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt @@ -134,10 +134,13 @@ internal open class GradleCompilerRunner( // compiler would report metrics by itself via JMX KotlinBuildStatsService.applyIfInitialised { if (compilerArgs is K2JVMCompilerArguments) { - val args = K2JVMCompilerArguments() - parseCommandLineArguments(argsArray.toList(), args) - KotlinBuildStatsService.getInstance()?.report(BooleanMetrics.JVM_COMPILER_IR_MODE, args.useIR) - KotlinBuildStatsService.getInstance()?.report(StringMetrics.JVM_DEFAULTS, args.jvmDefault) + KotlinBuildStatsService.getInstance()?.apply { + val args = K2JVMCompilerArguments() + parseCommandLineArguments(argsArray.toList(), args) + report(BooleanMetrics.JVM_COMPILER_IR_MODE, args.useIR) + report(StringMetrics.JVM_DEFAULTS, args.jvmDefault) + report(StringMetrics.USE_OLD_BACKEND, args.useOldBackend.toString()) + } } } diff --git a/libraries/tools/kotlin-gradle-statistics/src/org/jetbrains/kotlin/statistics/metrics/StringMetrics.kt b/libraries/tools/kotlin-gradle-statistics/src/org/jetbrains/kotlin/statistics/metrics/StringMetrics.kt index 9457360e63e..3672d934503 100644 --- a/libraries/tools/kotlin-gradle-statistics/src/org/jetbrains/kotlin/statistics/metrics/StringMetrics.kt +++ b/libraries/tools/kotlin-gradle-statistics/src/org/jetbrains/kotlin/statistics/metrics/StringMetrics.kt @@ -46,4 +46,6 @@ enum class StringMetrics(val type: StringOverridePolicy, val anonymization: Stri // Compiler parameters JVM_DEFAULTS(CONCAT, SAFE), + USE_OLD_BACKEND(CONCAT, SAFE) + }