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

Extract expression body

Browse Source
This commit is contained in:
Tamas Vajk
2022-01-21 14:50:09 +01:00
committed by Ian Lynagh
parent 4d408159aa
commit 5c38b4e84d
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -716,13 +716,10 @@ open class KotlinFileExtractor(
fun extractBody(b: IrBody, callable: Label<out DbCallable>) {
with("body", b) {
when(b) {
when (b) {
is IrBlockBody -> extractBlockBody(b, callable)
is IrSyntheticBody -> extractSyntheticBody(b, callable)
is IrExpressionBody -> {
// TODO
logger.warnElement(Severity.ErrorSevere, "Unhandled IrExpressionBody", b)
}
is IrExpressionBody -> extractExpressionBody(b, callable)
else -> {
logger.warnElement(Severity.ErrorSevere, "Unrecognised IrBody: " + b.javaClass, b)
}
@@ -736,7 +733,7 @@ open class KotlinFileExtractor(
val locId = tw.getLocation(b)
tw.writeStmts_block(id, callable, 0, callable)
tw.writeHasLocation(id, locId)
for((sIdx, stmt) in b.statements.withIndex()) {
for ((sIdx, stmt) in b.statements.withIndex()) {
extractStatement(stmt, callable, id, sIdx)
}
}
@@ -751,6 +748,20 @@ open class KotlinFileExtractor(
}
}
fun extractExpressionBody(b: IrExpressionBody, callable: Label<out DbCallable>) {
with("expression body", b) {
val blockId = tw.getFreshIdLabel<DbBlock>()
val locId = tw.getLocation(b)
tw.writeStmts_block(blockId, callable, 0, callable)
tw.writeHasLocation(blockId, locId)
val returnId = tw.getFreshIdLabel<DbReturnstmt>()
tw.writeStmts_returnstmt(returnId, blockId, 0, callable)
tw.writeHasLocation(returnId, locId)
extractExpressionExpr(b.expression, callable, returnId, 0, returnId)
}
}
private fun getVariableLocationProvider(v: IrVariable): IrElement {
val init = v.initializer
if (v.startOffset < 0 && init != null) {