@@ -20,6 +20,7 @@ import java.nio.file.Files
20
20
import java.nio.file.Paths
21
21
import java.util.zip.GZIPInputStream
22
22
import java.util.zip.GZIPOutputStream
23
+ import com.github.codeql.utils.versions.usesK2
23
24
import com.semmle.util.files.FileUtil
24
25
import kotlin.system.exitProcess
25
26
@@ -97,6 +98,7 @@ class KotlinExtractorExtension(
97
98
98
99
private fun runExtractor (moduleFragment : IrModuleFragment , pluginContext : IrPluginContext ) {
99
100
val startTimeMs = System .currentTimeMillis()
101
+ val usesK2 = usesK2(pluginContext)
100
102
// This default should be kept in sync with com.semmle.extractor.java.interceptors.KotlinInterceptor.initializeExtractionContext
101
103
val trapDir = File (System .getenv(" CODEQL_EXTRACTOR_JAVA_TRAP_DIR" ).takeUnless { it.isNullOrEmpty() } ? : " kotlin-extractor/trap" )
102
104
val compression_env_var = " CODEQL_EXTRACTOR_JAVA_OPTION_TRAP_COMPRESSION"
@@ -134,6 +136,7 @@ class KotlinExtractorExtension(
134
136
tw.writeCompilation_info(compilation, " Kotlin Compiler Version" , KotlinCompilerVersion .getVersion() ? : " <unknown>" )
135
137
val extractor_name = this ::class .java.getResource(" extractor.name" )?.readText() ? : " <unknown>"
136
138
tw.writeCompilation_info(compilation, " Kotlin Extractor Name" , extractor_name)
139
+ tw.writeCompilation_info(compilation, " Uses Kotlin 2" , usesK2.toString())
137
140
if (compilationStartTime != null ) {
138
141
tw.writeCompilation_compiler_times(compilation, - 1.0 , (System .currentTimeMillis()- compilationStartTime)/ 1000.0 )
139
142
}
0 commit comments