Kotlin: Add IrContainerExpression

java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt

@@ -591,7 +591,7 @@ class KotlinFileExtractor(val logger: Logger, val tw: TrapWriter) {
                 tw.writeStmts_returnstmt(id, parent, idx, callable)
                 tw.writeHasLocation(id, locId)
                 extractExpression(e.value, callable, id, 0)
-            } is IrBlock -> {
+            } is IrContainerExpression -> {
                 val id = tw.getFreshIdLabel<DbBlock>()
                 val locId = tw.getLocation(e.startOffset, e.endOffset)
                 tw.writeStmts_block(id, parent, idx, callable)
@@ -639,8 +639,7 @@ class KotlinFileExtractor(val logger: Logger, val tw: TrapWriter) {
                         tw.writeWhen_branch_else(bId)
                     }
                 }
-            }
-            else -> {
+            } else -> {
                 logger.warn("Unrecognised IrExpression: " + e.javaClass)
             }
         }

java/ql/test/kotlin/library-tests/stmts/exprs.expected

@@ -21,6 +21,7 @@
 | stmts.kt:9:11:9:15 | ... < ... |
 | stmts.kt:9:15:9:15 | y |
 | stmts.kt:10:16:10:16 | y |
+| stmts.kt:13:16:13:16 | y |
 | stmts.kt:14:13:14:13 | x |
 | stmts.kt:14:13:14:17 | ... < ... |
 | stmts.kt:14:17:14:17 | y |

java/ql/test/kotlin/library-tests/stmts/stmts.expected

@@ -9,6 +9,8 @@
 | stmts.kt:10:9:10:16 | return ... |
 | stmts.kt:12:5:14:18 | do ... while (...) |
 | stmts.kt:12:5:14:18 | { ... } |
+| stmts.kt:12:8:14:5 | { ... } |
+| stmts.kt:13:9:13:16 | return ... |
 | stmts.kt:17:35:17:43 | { ... } |
 | stmts.kt:17:50:17:58 | { ... } |
 | stmts.kt:19:5:19:16 | return ... |