hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-18 01:33:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix temporary variable locations

Browse Source
This commit is contained in:
Tamas Vajk
2021-12-16 10:32:09 +01:00
committed by Ian Lynagh
parent 5c77131637
commit 9d7794185e
7 changed files with 53 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
View File

@@ -605,9 +605,16 @@ open class KotlinFileExtractor(
}
}
private fun getVariableLocationProvider(v: IrVariable): IrElement {
if (v.origin == IrDeclarationOrigin.IR_TEMPORARY_VARIABLE) {
return v.initializer ?: v
}
return v
}
fun extractVariable(v: IrVariable, callable: Label<out DbCallable>, parent: Label<out DbStmtparent>, idx: Int) {
val stmtId = tw.getFreshIdLabel<DbLocalvariabledeclstmt>()
val locId = tw.getLocation(v)
val locId = tw.getLocation(getVariableLocationProvider(v))
tw.writeStmts_localvariabledeclstmt(stmtId, parent, idx, callable)
tw.writeHasLocation(stmtId, locId)
extractVariableExpr(v, callable, stmtId, 1, stmtId)
@@ -616,7 +623,7 @@ open class KotlinFileExtractor(
fun extractVariableExpr(v: IrVariable, callable: Label<out DbCallable>, parent: Label<out DbExprparent>, idx: Int, enclosingStmt: Label<out DbStmt>) {
val varId = useVariable(v)
val exprId = tw.getFreshIdLabel<DbLocalvariabledeclexpr>()
val locId = tw.getLocation(v)
val locId = tw.getLocation(getVariableLocationProvider(v))
val type = useType(v.type)
tw.writeLocalvars(varId, v.name.asString(), type.javaResult.id, type.kotlinResult.id, exprId)
tw.writeHasLocation(varId, locId)