Merge pull request github#167 from github/kotlin-cleanup-anon-class-decl-stmt

tamasvajk · web-flow · commit 0d6dbc603948 · 2021-12-07T23:12:42.000+01:00
Remove and replace @anonymousclassdeclstmt with @localtypedeclstmt
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -131,17 +131,16 @@ open class KotlinFileExtractor(
         return id
     }
 
-    private fun extractAnonymousClassStmt(c: IrClass, callable: Label<out DbCallable>, parent: Label<out DbStmtparent>, idx: Int) {
+    private fun extracLocalTypeDeclStmt(c: IrClass, callable: Label<out DbCallable>, parent: Label<out DbStmtparent>, idx: Int) {
         @Suppress("UNCHECKED_CAST")
         val id = extractClassSource(c) as Label<out DbClass>
-        extractAnonymousClassStmt(id, c, callable, parent, idx)
+        extracLocalTypeDeclStmt(id, c, callable, parent, idx)
     }
 
-    private fun extractAnonymousClassStmt(id: Label<out DbClass>, locElement: IrElement, callable: Label<out DbCallable>, parent: Label<out DbStmtparent>, idx: Int) {
-        // TODO: is this the same as @localtypedeclstmt
-        val stmtId = tw.getFreshIdLabel<DbAnonymousclassdeclstmt>()
-        tw.writeStmts_anonymousclassdeclstmt(stmtId, parent, idx, callable)
-        tw.writeKtAnonymousClassDeclarationStmts(stmtId, id)
+    private fun extracLocalTypeDeclStmt(id: Label<out DbClass>, locElement: IrElement, callable: Label<out DbCallable>, parent: Label<out DbStmtparent>, idx: Int) {
+        val stmtId = tw.getFreshIdLabel<DbLocaltypedeclstmt>()
+        tw.writeStmts_localtypedeclstmt(stmtId, parent, idx, callable)
+        tw.writeIsLocalClassOrInterface(id, stmtId)
         val locId = tw.getLocation(locElement)
         tw.writeHasLocation(stmtId, locId)
     }
@@ -533,15 +532,15 @@ open class KotlinFileExtractor(
             }
             is IrClass -> {
                 if (s.isAnonymousObject) {
-                    extractAnonymousClassStmt(s, callable, parent, idx)
+                    extracLocalTypeDeclStmt(s, callable, parent, idx)
                 } else {
                     logger.warnElement(Severity.ErrorSevere, "Found non anonymous IrClass as IrStatement: " + s.javaClass, s)
                 }
             }
             is IrFunction -> {
                 if (s.isLocalFunction()) {
                     val classId =  extractGeneratedClass(s, listOf(pluginContext.irBuiltIns.anyType))
-                    extractAnonymousClassStmt(classId, s, callable, parent, idx)
+                    extracLocalTypeDeclStmt(classId, s, callable, parent, idx)
                 } else {
                     logger.warnElement(Severity.ErrorSevere, "Expected to find local function", s)
                 }
diff --git a/java/ql/lib/config/semmlecode.dbscheme b/java/ql/lib/config/semmlecode.dbscheme
@@ -588,7 +588,6 @@ case @stmt.kind of
 | 21 = @case
 | 22 = @catchclause
 | 23 = @yieldstmt
-| 24 = @anonymousclassdeclstmt
 ;
 
 #keyset[parent,idx]
@@ -1135,11 +1134,6 @@ ktPropertyBackingFields(
   int backingField: @field ref
 )
 
-ktAnonymousClassDeclarationStmts(
-  unique int id: @anonymousclassdeclstmt ref,
-  int classId: @class ref
-)
-
 ktSyntheticBody(
   unique int id: @callable ref,
   int kind: int ref
diff --git a/java/ql/lib/semmle/code/java/ControlFlowGraph.qll b/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
@@ -987,10 +987,6 @@ private module ControlFlowGraphImpl {
         completion = YieldCompletion(branchCompletion)
       )
     )
-    or
-    n instanceof KtAnonymousClassDeclarationStmt and
-    last = n and
-    completion = NormalCompletion()
   }
 
   /**
diff --git a/java/ql/lib/semmle/code/java/Statement.qll b/java/ql/lib/semmle/code/java/Statement.qll
@@ -922,16 +922,3 @@ class KtBreakStmt extends BreakStmt, KtBreakContinueStmt { }
 
 /** A Kotlin `continue` statement. */
 class KtContinueStmt extends ContinueStmt, KtBreakContinueStmt { }
-
-class KtAnonymousClassDeclarationStmt extends Stmt, @anonymousclassdeclstmt {
-  Class c;
-
-  KtAnonymousClassDeclarationStmt() { ktAnonymousClassDeclarationStmts(this, c) }
-
-  /** Gets the class declaration belonging to this declaration statement. */
-  AnonymousClass getDeclaration() { result = c }
-
-  override string getAPrimaryQlClass() { result = "KtAnonymousClassDeclarationStmt" }
-
-  override string toString() { result = "{ ... }" }
-}
diff --git a/java/ql/test/kotlin/library-tests/classes/anonymousClasses.expected b/java/ql/test/kotlin/library-tests/classes/anonymousClasses.expected
@@ -1,7 +1,7 @@
-| classes.kt:66:20:66:54 | new Object(...) { ... } | classes.kt:66:20:66:54 | new (...) |  | file://:0:0:0:0 | Object | classes.kt:66:20:66:54 | { ... } |
-| classes.kt:68:20:68:74 | new Object(...) { ... } | classes.kt:68:20:68:74 | new (...) |  | file://:0:0:0:0 | Object | classes.kt:68:20:68:74 | { ... } |
-| classes.kt:72:16:77:10 | new Object(...) { ... } | classes.kt:72:16:77:10 | new (...) |  | file://:0:0:0:0 | Object | classes.kt:72:16:77:10 | { ... } |
-| classes.kt:75:24:75:33 | new Object(...) { ... } | classes.kt:75:24:75:33 | new (...) |  | file://:0:0:0:0 | Object | classes.kt:75:24:75:33 | { ... } |
-| classes.kt:81:16:81:38 | new Interface1(...) { ... } | classes.kt:81:16:81:38 | new (...) |  | file://:0:0:0:0 | Interface1 | classes.kt:81:16:81:38 | { ... } |
-| classes.kt:85:16:85:25 | new Object(...) { ... } | classes.kt:85:16:85:25 | new (...) |  | file://:0:0:0:0 | Object | classes.kt:85:16:85:25 | { ... } |
-| classes.kt:89:16:89:44 | new Interface3<Integer>(...) { ... } | classes.kt:89:16:89:44 | new (...) |  | file://:0:0:0:0 | Interface3<Integer> | classes.kt:89:16:89:44 | { ... } |
+| classes.kt:66:20:66:54 | new Object(...) { ... } | classes.kt:66:20:66:54 | new (...) |  | file://:0:0:0:0 | Object | classes.kt:66:20:66:54 | class ... |
+| classes.kt:68:20:68:74 | new Object(...) { ... } | classes.kt:68:20:68:74 | new (...) |  | file://:0:0:0:0 | Object | classes.kt:68:20:68:74 | class ... |
+| classes.kt:72:16:77:10 | new Object(...) { ... } | classes.kt:72:16:77:10 | new (...) |  | file://:0:0:0:0 | Object | classes.kt:72:16:77:10 | class ... |
+| classes.kt:75:24:75:33 | new Object(...) { ... } | classes.kt:75:24:75:33 | new (...) |  | file://:0:0:0:0 | Object | classes.kt:75:24:75:33 | class ... |
+| classes.kt:81:16:81:38 | new Interface1(...) { ... } | classes.kt:81:16:81:38 | new (...) |  | file://:0:0:0:0 | Interface1 | classes.kt:81:16:81:38 | class ... |
+| classes.kt:85:16:85:25 | new Object(...) { ... } | classes.kt:85:16:85:25 | new (...) |  | file://:0:0:0:0 | Object | classes.kt:85:16:85:25 | class ... |
+| classes.kt:89:16:89:44 | new Interface3<Integer>(...) { ... } | classes.kt:89:16:89:44 | new (...) |  | file://:0:0:0:0 | Interface3<Integer> | classes.kt:89:16:89:44 | class ... |
diff --git a/java/ql/test/kotlin/library-tests/classes/anonymousClasses.ql b/java/ql/test/kotlin/library-tests/classes/anonymousClasses.ql
@@ -1,7 +1,7 @@
 import java
 
-from AnonymousClass c, KtAnonymousClassDeclarationStmt stmt
-where c.fromSource() and stmt.getDeclaration() = c
+from AnonymousClass c, LocalTypeDeclStmt stmt
+where c.fromSource() and stmt.getLocalType() = c
 select c, c.getClassInstanceExpr(),
   c.getClassInstanceExpr().getConstructor().getDeclaringType().getName(),
   c.getClassInstanceExpr().getTypeName(), stmt

Original file line number	Diff line number	Diff line change
`@@ -131,17 +131,16 @@ open class KotlinFileExtractor(`
`131`	`131`	`return id`
`132`	`132`	`}`
`133`	`133`
`134`		`- private fun extractAnonymousClassStmt(c: IrClass, callable: Label<out DbCallable>, parent: Label<out DbStmtparent>, idx: Int) {`
	`134`	`+ private fun extracLocalTypeDeclStmt(c: IrClass, callable: Label<out DbCallable>, parent: Label<out DbStmtparent>, idx: Int) {`
`135`	`135`	`@Suppress("UNCHECKED_CAST")`
`136`	`136`	`val id = extractClassSource(c) as Label<out DbClass>`
`137`		`- extractAnonymousClassStmt(id, c, callable, parent, idx)`
	`137`	`+ extracLocalTypeDeclStmt(id, c, callable, parent, idx)`
`138`	`138`	`}`
`139`	`139`
`140`		`- private fun extractAnonymousClassStmt(id: Label<out DbClass>, locElement: IrElement, callable: Label<out DbCallable>, parent: Label<out DbStmtparent>, idx: Int) {`
`141`		`- // TODO: is this the same as @localtypedeclstmt`
`142`		`- val stmtId = tw.getFreshIdLabel<DbAnonymousclassdeclstmt>()`
`143`		`- tw.writeStmts_anonymousclassdeclstmt(stmtId, parent, idx, callable)`
`144`		`- tw.writeKtAnonymousClassDeclarationStmts(stmtId, id)`
	`140`	`+ private fun extracLocalTypeDeclStmt(id: Label<out DbClass>, locElement: IrElement, callable: Label<out DbCallable>, parent: Label<out DbStmtparent>, idx: Int) {`
	`141`	`+ val stmtId = tw.getFreshIdLabel<DbLocaltypedeclstmt>()`
	`142`	`+ tw.writeStmts_localtypedeclstmt(stmtId, parent, idx, callable)`
	`143`	`+ tw.writeIsLocalClassOrInterface(id, stmtId)`
`145`	`144`	`val locId = tw.getLocation(locElement)`
`146`	`145`	`tw.writeHasLocation(stmtId, locId)`
`147`	`146`	`}`
`@@ -533,15 +532,15 @@ open class KotlinFileExtractor(`
`533`	`532`	`}`
`534`	`533`	`is IrClass -> {`
`535`	`534`	`if (s.isAnonymousObject) {`
`536`		`- extractAnonymousClassStmt(s, callable, parent, idx)`
	`535`	`+ extracLocalTypeDeclStmt(s, callable, parent, idx)`
`537`	`536`	`} else {`
`538`	`537`	`logger.warnElement(Severity.ErrorSevere, "Found non anonymous IrClass as IrStatement: " + s.javaClass, s)`
`539`	`538`	`}`
`540`	`539`	`}`
`541`	`540`	`is IrFunction -> {`
`542`	`541`	`if (s.isLocalFunction()) {`
`543`	`542`	`val classId = extractGeneratedClass(s, listOf(pluginContext.irBuiltIns.anyType))`
`544`		`- extractAnonymousClassStmt(classId, s, callable, parent, idx)`
	`543`	`+ extracLocalTypeDeclStmt(classId, s, callable, parent, idx)`
`545`	`544`	`} else {`
`546`	`545`	`logger.warnElement(Severity.ErrorSevere, "Expected to find local function", s)`
`547`	`546`	`}`
Original file line number	Diff line number	Diff line change
`@@ -987,10 +987,6 @@ private module ControlFlowGraphImpl {`
`987`	`987`	`completion = YieldCompletion(branchCompletion)`
`988`	`988`	`)`
`989`	`989`	`)`
`990`		`- or`
`991`		`- n instanceof KtAnonymousClassDeclarationStmt and`
`992`		`- last = n and`
`993`		`- completion = NormalCompletion()`
`994`	`990`	`}`
`995`	`991`
`996`	`992`	`/**`