Kotlin: Add KotlinType to localvars

igfoo · igfoo · commit 6cf0b755f080 · 2022-05-10T19:51:00.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
@@ -1061,7 +1061,7 @@ open class KotlinFileExtractor(
         val exprId = tw.getFreshIdLabel<DbLocalvariabledeclexpr>()
         val locId = tw.getLocation(v)
         val type = useType(v.type)
-        tw.writeLocalvars(varId, v.name.asString(), type.javaResult.id, exprId) // TODO: KT type
+        tw.writeLocalvars(varId, v.name.asString(), type.javaResult.id, type.kotlinResult.id, exprId)
         tw.writeHasLocation(varId, locId)
         tw.writeExprs_localvariabledeclexpr(exprId, type.javaResult.id, type.kotlinResult.id, parent, idx)
         tw.writeHasLocation(exprId, locId)
diff --git a/java/ql/lib/config/semmlecode.dbscheme b/java/ql/lib/config/semmlecode.dbscheme
@@ -785,6 +785,7 @@ localvars(
   unique int id: @localvar,
   string nodeName: string ref,
   int typeid: @type ref,
+  int kttypeid: @kt_type ref,
   int parentid: @localvariabledeclexpr ref
 );
 
diff --git a/java/ql/lib/semmle/code/Location.qll b/java/ql/lib/semmle/code/Location.qll
@@ -34,7 +34,7 @@ predicate hasName(Element e, string name) {
     name = "p" + pos
   )
   or
-  localvars(e, name, _, _)
+  localvars(e, name, _, _, _)
   or
   typeVars(e, name, _, _, _)
   or
diff --git a/java/ql/lib/semmle/code/java/Expr.qll b/java/ql/lib/semmle/code/java/Expr.qll
@@ -1490,7 +1490,7 @@ class LocalVariableDeclExpr extends Expr, @localvariabledeclexpr {
   VarAccess getAnAccess() { variableBinding(result, this.getVariable()) }
 
   /** Gets the local variable declared by this local variable declaration expression. */
-  LocalVariableDecl getVariable() { localvars(result, _, _, this) }
+  LocalVariableDecl getVariable() { localvars(result, _, _, _, this) }
 
   /** Gets the type access of this local variable declaration expression. */
   Expr getTypeAccess() {
diff --git a/java/ql/lib/semmle/code/java/Variable.qll b/java/ql/lib/semmle/code/java/Variable.qll
@@ -38,13 +38,16 @@ class LocalScopeVariable extends Variable, @localscopevariable {
 /** A local variable declaration */
 class LocalVariableDecl extends @localvar, LocalScopeVariable {
   /** Gets the type of this local variable. */
-  override Type getType() { localvars(this, _, result, _) }
+  override Type getType() { localvars(this, _, result, _, _) }
+
+  /** Gets the Kotlin type of this local variable. */
+  override KotlinType getKotlinType() { localvars(this, _, _, result, _) }
 
   /** Gets the expression declaring this variable. */
-  LocalVariableDeclExpr getDeclExpr() { localvars(this, _, _, result) }
+  LocalVariableDeclExpr getDeclExpr() { localvars(this, _, _, _, result) }
 
   /** Gets the parent of this declaration. */
-  Expr getParent() { localvars(this, _, _, result) }
+  Expr getParent() { localvars(this, _, _, _, result) }
 
   /** Gets the callable in which this declaration occurs. */
   override Callable getCallable() { result = this.getParent().getEnclosingCallable() }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ predicate hasName(Element e, string name) {`
`34`	`34`	`name = "p" + pos`
`35`	`35`	`)`
`36`	`36`	`or`
`37`		`- localvars(e, name, _, _)`
	`37`	`+ localvars(e, name, _, _, _)`
`38`	`38`	`or`
`39`	`39`	`typeVars(e, name, _, _, _)`
`40`	`40`	`or`