Merge pull request #2 from github/igfoo/lazyKt

igfoo · web-flow · commit 8952295cb0b9 · 2021-09-02T13:57:32.000+01:00
Kotlin: Don't make a *Kt class unless we need one
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
@@ -8,6 +8,7 @@ import java.nio.file.Files
 import java.nio.file.Paths
 import java.text.SimpleDateFormat
 import java.util.Date
+import java.util.Optional
 import kotlin.system.exitProcess
 import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
@@ -167,8 +168,8 @@ fun doFile(logger: Logger, trapDir: File, srcDir: File, declaration: IrFile) {
         val tw = TrapWriter(fileLabel, trapFileBW, declaration.fileEntry)
         val id: Label<DbFile> = tw.getLabelFor(fileLabel)
         tw.writeFiles(id, filePath, basename, extension, 0)
-        val fileExtractor = KotlinFileExtractor(logger, tw)
-        fileExtractor.extractFile(id, declaration)
+        val fileExtractor = KotlinFileExtractor(logger, tw, declaration)
+        fileExtractor.extractFile(id)
     }
 }
 
@@ -179,14 +180,16 @@ fun <T> fakeLabel(): Label<T> {
     return Label(0)
 }
 
-class KotlinFileExtractor(val logger: Logger, val tw: TrapWriter) {
-    fun extractFile(id: Label<DbFile>, f: IrFile) {
-        val pkg = f.fqName.asString()
+class KotlinFileExtractor(val logger: Logger, val tw: TrapWriter, val file: IrFile) {
+    val fileClass by lazy {
+        extractFileClass(file)
+    }
+
+    fun extractFile(id: Label<DbFile>) {
+        val pkg = file.fqName.asString()
         val pkgId = extractPackage(pkg)
         tw.writeCupackage(id, pkgId)
-        // TODO: This shouldn't really exist if there is nothing to go on it
-        val fileClass = extractFileClass(f)
-        f.declarations.map { extractDeclaration(it, fileClass) }
+        file.declarations.map { extractDeclaration(it, Optional.empty()) }
     }
 
   fun extractFileClass(f: IrFile): Label<out DbClass> {
@@ -233,11 +236,11 @@ class KotlinFileExtractor(val logger: Logger, val tw: TrapWriter) {
         return id
     }
 
-    fun extractDeclaration(declaration: IrDeclaration, parentid: Label<out DbReftype>) {
+    fun extractDeclaration(declaration: IrDeclaration, optParentid: Optional<Label<out DbReftype>>) {
         when (declaration) {
             is IrClass -> extractClass(declaration)
-            is IrFunction -> extractFunction(declaration, parentid)
-            is IrProperty -> extractProperty(declaration, parentid)
+            is IrFunction -> extractFunction(declaration, if (optParentid.isPresent()) optParentid.get() else fileClass)
+            is IrProperty -> extractProperty(declaration, if (optParentid.isPresent()) optParentid.get() else fileClass)
             else -> logger.warn("Unrecognised IrDeclaration: " + declaration.javaClass)
         }
     }
@@ -309,7 +312,7 @@ class KotlinFileExtractor(val logger: Logger, val tw: TrapWriter) {
         val pkgId = extractPackage(pkg)
         tw.writeClasses(id, cls, pkgId, id)
         tw.writeHasLocation(id, locId)
-        c.declarations.map { extractDeclaration(it, id) }
+        c.declarations.map { extractDeclaration(it, Optional.of(id)) }
         return id
     }
 
diff --git a/java/ql/test/kotlin/library-tests/classes/classes.expected b/java/ql/test/kotlin/library-tests/classes/classes.expected
@@ -1,5 +1,4 @@
 | classes.kt:0:0:0:0 | Any |
-| classes.kt:0:0:0:0 | ClassesKt |
 | classes.kt:0:0:0:0 | Unit |
 | classes.kt:2:1:2:18 | ClassOne |
 | classes.kt:4:1:6:1 | ClassTwo |
diff --git a/java/ql/test/kotlin/library-tests/multiple_files/classes.expected b/java/ql/test/kotlin/library-tests/multiple_files/classes.expected
@@ -1,8 +1,6 @@
 | file1.kt:0:0:0:0 | Any |
-| file1.kt:0:0:0:0 | File1Kt |
 | file1.kt:2:1:2:16 | Class1 |
 | file2.kt:0:0:0:0 | Any |
-| file2.kt:0:0:0:0 | File2Kt |
 | file2.kt:2:1:2:16 | Class2 |
 | file3.kt:0:0:0:0 | Any |
 | file3.kt:0:0:0:0 | MyJvmName |
diff --git a/java/ql/test/kotlin/library-tests/types/types.expected b/java/ql/test/kotlin/library-tests/types/types.expected
@@ -8,5 +8,4 @@
 | file://:0:0:0:0 | short | PrimitiveType |
 | file://:0:0:0:0 | string | ??? |
 | types.kt:0:0:0:0 | Any | Class |
-| types.kt:0:0:0:0 | TypesKt | Class |
 | types.kt:2:1:33:1 | Foo | Class |

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`\| classes.kt:0:0:0:0 \| Any \|`
`2`		`-\| classes.kt:0:0:0:0 \| ClassesKt \|`
`3`	`2`	`\| classes.kt:0:0:0:0 \| Unit \|`
`4`	`3`	`\| classes.kt:2:1:2:18 \| ClassOne \|`
`5`	`4`	`\| classes.kt:4:1:6:1 \| ClassTwo \|`