Kotlin: Add SAFE_CAST support

igfoo · igfoo · commit 03199091cd93 · 2022-05-10T19:51:07.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -1656,6 +1656,18 @@ open class KotlinFileExtractor(
                 extractTypeAccess(e.typeOperand, callable, id, 0, e, enclosingStmt)
                 extractExpressionExpr(e.argument, callable, id, 1, enclosingStmt)
             }
+            IrTypeOperator.SAFE_CAST -> {
+                // TODO: Distinguish this (e as? T) from CAST
+                val id = tw.getFreshIdLabel<DbCastexpr>()
+                val locId = tw.getLocation(e)
+                val type = useType(e.type)
+                tw.writeExprs_castexpr(id, type.javaResult.id, type.kotlinResult.id, parent, idx)
+                tw.writeHasLocation(id, locId)
+                tw.writeCallableEnclosingExpr(id, callable)
+                tw.writeStatementEnclosingExpr(id, enclosingStmt)
+                extractTypeAccess(e.typeOperand, callable, id, 0, e, enclosingStmt)
+                extractExpressionExpr(e.argument, callable, id, 1, enclosingStmt)
+            }
             IrTypeOperator.INSTANCEOF -> {
                 val id = tw.getFreshIdLabel<DbInstanceofexpr>()
                 val locId = tw.getLocation(e)
@@ -1679,7 +1691,7 @@ open class KotlinFileExtractor(
                 extractTypeAccess(e.typeOperand, callable, id, 1, e, enclosingStmt)
             }
             else -> {
-                logger.warnElement(Severity.ErrorSevere, "Unrecognised IrTypeOperatorCall: " + e.render(), e)
+                logger.warnElement(Severity.ErrorSevere, "Unrecognised IrTypeOperatorCall for ${e.operator}: " + e.render(), e)
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1656,6 +1656,18 @@ open class KotlinFileExtractor(`
`1656`	`1656`	`extractTypeAccess(e.typeOperand, callable, id, 0, e, enclosingStmt)`
`1657`	`1657`	`extractExpressionExpr(e.argument, callable, id, 1, enclosingStmt)`
`1658`	`1658`	`}`
	`1659`	`+ IrTypeOperator.SAFE_CAST -> {`
	`1660`	`+ // TODO: Distinguish this (e as? T) from CAST`
	`1661`	`+ val id = tw.getFreshIdLabel<DbCastexpr>()`
	`1662`	`+ val locId = tw.getLocation(e)`
	`1663`	`+ val type = useType(e.type)`
	`1664`	`+ tw.writeExprs_castexpr(id, type.javaResult.id, type.kotlinResult.id, parent, idx)`
	`1665`	`+ tw.writeHasLocation(id, locId)`
	`1666`	`+ tw.writeCallableEnclosingExpr(id, callable)`
	`1667`	`+ tw.writeStatementEnclosingExpr(id, enclosingStmt)`
	`1668`	`+ extractTypeAccess(e.typeOperand, callable, id, 0, e, enclosingStmt)`
	`1669`	`+ extractExpressionExpr(e.argument, callable, id, 1, enclosingStmt)`
	`1670`	`+ }`
`1659`	`1671`	`IrTypeOperator.INSTANCEOF -> {`
`1660`	`1672`	`val id = tw.getFreshIdLabel<DbInstanceofexpr>()`
`1661`	`1673`	`val locId = tw.getLocation(e)`
`@@ -1679,7 +1691,7 @@ open class KotlinFileExtractor(`
`1679`	`1691`	`extractTypeAccess(e.typeOperand, callable, id, 1, e, enclosingStmt)`
`1680`	`1692`	`}`
`1681`	`1693`	`else -> {`
`1682`		`- logger.warnElement(Severity.ErrorSevere, "Unrecognised IrTypeOperatorCall: " + e.render(), e)`
	`1694`	`+ logger.warnElement(Severity.ErrorSevere, "Unrecognised IrTypeOperatorCall for ${e.operator}: " + e.render(), e)`
`1683`	`1695`	`}`
`1684`	`1696`	`}`
`1685`	`1697`	`}`