hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-25 00:27:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17695 from igfoo/igfoo/nulltype

Browse Source 
KE2: Handle null types (emit errortypes)
This commit is contained in:
Ian Lynagh
2024-10-08 15:54:20 +01:00
committed by GitHub
parent 174e7f625d 565e780285
commit 5edf520439
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt
View File

@@ -4864,13 +4864,9 @@ OLD: KE1
override fun stmt(e: KtExpression, callable: Label<out DbCallable>): StmtParent {
val id = tw.getFreshIdLabel<DbStmtexpr>()
val et = e.expressionType
if (et != null) {
val type = useType(et)
val locId = tw.getLocation(e)
tw.writeExprs_stmtexpr(id, type.javaResult.id, parent, idx)
} else {
logger.errorElement("Unexpected null type: ${e.javaClass}", e)
}
val type = useType(et)
val locId = tw.getLocation(e)
tw.writeExprs_stmtexpr(id, type.javaResult.id, parent, idx)
/*
OLD: KE1
tw.writeExprsKotlinType(id, type.kotlinResult.id)

17
java/kotlin-extractor2/src/main/kotlin/entities/Types.kt
View File

@@ -11,8 +11,12 @@ private fun KotlinUsesExtractor.useClassType(
return TypeResults(javaResult, kotlinResult)
}
fun KotlinUsesExtractor.useType(t: KaType, context: TypeContext = TypeContext.OTHER): TypeResults {
fun KotlinUsesExtractor.useType(t: KaType?, context: TypeContext = TypeContext.OTHER): TypeResults {
when (t) {
null -> {
logger.error("Unexpected null type")
return extractErrorType()
}
is KaClassType -> return useClassType(t)
else -> TODO()
}
@@ -28,14 +32,12 @@ fun KotlinUsesExtractor.useType(t: KaType, context: TypeContext = TypeContext.OT
*/
}
/*
OLD: KE1
private fun extractJavaErrorType(): TypeResult<DbErrortype> {
private fun KotlinUsesExtractor.extractJavaErrorType(): TypeResult<DbErrortype> {
val typeId = tw.getLabelFor<DbErrortype>("@\"errorType\"") { tw.writeError_type(it) }
return TypeResult(typeId, "<CodeQL error type>", "<CodeQL error type>")
return TypeResult(typeId /* TODO , "<CodeQL error type>", "<CodeQL error type>" */)
}
private fun extractErrorType(): TypeResults {
private fun KotlinUsesExtractor.extractErrorType(): TypeResults {
val javaResult = extractJavaErrorType()
val kotlinTypeId =
tw.getLabelFor<DbKt_nullable_type>("@\"errorKotlinType\"") {
@@ -43,10 +45,9 @@ private fun extractErrorType(): TypeResults {
}
return TypeResults(
javaResult,
TypeResult(kotlinTypeId, "<CodeQL error type>", "<CodeQL error type>")
TypeResult(kotlinTypeId /* TODO , "<CodeQL error type>", "<CodeQL error type>" */)
)
}
*/
// TODO
fun KotlinUsesExtractor.fakeKotlinType(): Label<out DbKt_type> {