Extract container of adapter function as compiler generated

tamasvajk · tamasvajk · commit 70bed04f982f · 2022-04-08T14:27:28.000+02:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -941,6 +941,10 @@ open class KotlinFileExtractor(
                         extractLocalTypeDeclStmt(classId, s, callable, parent, idx)
                         val ids = getLocallyVisibleFunctionLabels(s)
                         tw.writeKtLocalFunction(ids.function)
+
+                        if (s.origin == IrDeclarationOrigin.ADAPTER_FOR_CALLABLE_REFERENCE) {
+                            tw.writeCompiler_generated(classId, 1)
+                        }
                     } else {
                         logger.errorElement("Expected to find local function", s)
                     }
diff --git a/java/ql/lib/config/semmlecode.dbscheme b/java/ql/lib/config/semmlecode.dbscheme
@@ -1220,3 +1220,9 @@ ktPropertyDelegates(
   unique int id: @kt_property ref,
   unique int variableId: @variable ref
 )
+
+compiler_generated(
+  unique int id: @top ref,
+  int kind: int ref
+  // 1: Kotlin declaring classes of adapter functions
+);
diff --git a/java/ql/src/Violations of Best Practice/Dead Code/DeadRefTypes.ql b/java/ql/src/Violations of Best Practice/Dead Code/DeadRefTypes.ql
@@ -50,7 +50,9 @@ predicate dead(RefType dead) {
   // Exclude classes that look like they may be reflectively constructed.
   not dead.getAnAnnotation() instanceof ReflectiveAccessAnnotation and
   // Insist all source ancestors are dead as well.
-  forall(RefType t | t.fromSource() and t = getASuperTypePlus(dead) | dead(t))
+  forall(RefType t | t.fromSource() and t = getASuperTypePlus(dead) | dead(t)) and
+  // Exclude compiler generated classes (e.g. declaring type of adapter functions in Kotlin)
+  not compiler_generated(dead, _)
 }
 
 from RefType t, string kind
diff --git a/java/ql/test/kotlin/library-tests/reflection/reflection.expected b/java/ql/test/kotlin/library-tests/reflection/reflection.expected
@@ -184,3 +184,5 @@ memberVisibility
 | reflection.kt:109:17:109:27 | ...::... | reflection.kt:109:17:109:27 | set | public |
 | reflection.kt:116:40:116:44 | ...::... | reflection.kt:116:40:116:44 | invoke | public |
 | reflection.kt:126:9:126:13 | ...::... | reflection.kt:126:9:126:13 | invoke | public |
+compGenerated
+| reflection.kt:126:9:126:13 |  | 1 |
diff --git a/java/ql/test/kotlin/library-tests/reflection/reflection.ql b/java/ql/test/kotlin/library-tests/reflection/reflection.ql
@@ -86,3 +86,5 @@ query predicate memberVisibility(ClassInstanceExpr e, Method m, string modifier)
   e.getAnonymousClass().getAMethod() = m and
   m.hasModifier(modifier)
 }
+
+query predicate compGenerated(Top t, int i) { compiler_generated(t, i) }

Original file line number	Diff line number	Diff line change
`@@ -86,3 +86,5 @@ query predicate memberVisibility(ClassInstanceExpr e, Method m, string modifier)`
`86`	`86`	`e.getAnonymousClass().getAMethod() = m and`
`87`	`87`	`m.hasModifier(modifier)`
`88`	`88`	`}`
	`89`	`+`
	`90`	`+query predicate compGenerated(Top t, int i) { compiler_generated(t, i) }`