Kotlin: Record that DEFAULT_PROPERTY_ACCESSOR are compiler-generated

igfoo · igfoo · commit c06eb09100e5 · 2022-06-24T14:00:47.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -783,8 +783,11 @@ open class KotlinFileExtractor(
                     val methodId = id.cast<DbMethod>()
                     tw.writeMethods(methodId, shortName.nameInDB, "${shortName.nameInDB}$paramsSignature", returnType.javaResult.id, parentId, sourceDeclaration.cast<DbMethod>())
                     tw.writeMethodsKotlinType(methodId, returnType.kotlinResult.id)
-                    if (f.origin == IrDeclarationOrigin.GENERATED_DATA_CLASS_MEMBER) {
-                        tw.writeCompiler_generated(methodId, 2)
+                    when (f.origin) {
+                        IrDeclarationOrigin.GENERATED_DATA_CLASS_MEMBER ->
+                            tw.writeCompiler_generated(methodId, 2)
+                        IrDeclarationOrigin.DEFAULT_PROPERTY_ACCESSOR ->
+                            tw.writeCompiler_generated(methodId, 3)
                     }
 
                     if (extractMethodAndParameterTypeAccesses) {
diff --git a/java/ql/lib/semmle/code/java/Element.qll b/java/ql/lib/semmle/code/java/Element.qll
@@ -50,7 +50,9 @@ class Element extends @element, Top {
     exists(int i | compiler_generated(this, i) |
       i = 1 and result = "Declaring classes of adapter functions in Kotlin"
       or
-      i = 2 and result = "Generated data class members"
+      i = 2 and result = "Generated data class member"
+      or
+      i = 3 and result = "Default property accessor"
     )
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,9 @@ class Element extends @element, Top {`
`50`	`50`	`exists(int i \| compiler_generated(this, i) \|`
`51`	`51`	`i = 1 and result = "Declaring classes of adapter functions in Kotlin"`
`52`	`52`	`or`
`53`		`- i = 2 and result = "Generated data class members"`
	`53`	`+ i = 2 and result = "Generated data class member"`
	`54`	`+ or`
	`55`	`+ i = 3 and result = "Default property accessor"`
`54`	`56`	`)`
`55`	`57`	`}`
`56`	`58`	`}`