Kotlin: Add do/while loops

igfoo · igfoo · commit 97722faee9ae · 2022-05-10T18:45:52.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
@@ -35,6 +35,7 @@ import org.jetbrains.kotlin.ir.expressions.IrWhen
 import org.jetbrains.kotlin.ir.expressions.IrElseBranch
 import org.jetbrains.kotlin.ir.expressions.IrWhileLoop
 import org.jetbrains.kotlin.ir.expressions.IrBlock
+import org.jetbrains.kotlin.ir.expressions.IrDoWhileLoop
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol
 
@@ -357,6 +358,16 @@ class KotlinFileExtractor(val tw: TrapWriter) {
                 if(body != null) {
                     extractExpression(body, callable, id, 1) // TODO: The QLLs think this is a Stmt
                 }
+            } is IrDoWhileLoop -> {
+                val id = tw.getFreshIdLabel<DbDostmt>()
+                val locId = tw.getLocation(e.startOffset, e.endOffset)
+                tw.writeStmts_dostmt(id, parent, idx, callable)
+                tw.writeHasLocation(id, locId)
+                extractExpression(e.condition, callable, id, 0)
+                val body = e.body
+                if(body != null) {
+                    extractExpression(body, callable, id, 1) // TODO: The QLLs think this is a Stmt
+                }
             } is IrWhen -> {
                 if(e.origin == IF) {
                     var branchParent = parent
diff --git a/java/ql/test/kotlin/library-tests/stmts/stmts.kt b/java/ql/test/kotlin/library-tests/stmts/stmts.kt
@@ -9,6 +9,9 @@ fun topLevelMethod(x: Int, y: Int): Int {
     while(x < y) {
         return y
     }
+    do {
+        return y
+    } while(x < y)
     return x + y
 }
 

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,9 @@ fun topLevelMethod(x: Int, y: Int): Int {`
`9`	`9`	`while(x < y) {`
`10`	`10`	`return y`
`11`	`11`	`}`
	`12`	`+ do {`
	`13`	`+ return y`
	`14`	`+ } while(x < y)`
`12`	`15`	`return x + y`
`13`	`16`	`}`
`14`	`17`