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

Kotlin: Remove the last uses of fakeLabel

Browse Source
This commit is contained in:
Ian Lynagh
2022-07-12 17:43:50 +01:00
parent a0636ff843
commit 83edb3b5e9
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
View File

@@ -121,14 +121,19 @@ open class KotlinUsesExtractor(
}
}
private fun extractErrorType(): TypeResults {
private fun extractJavaErrorType(): TypeResult<DbErrortype> {
val typeId = tw.getLabelFor<DbErrortype>("@\"errorType\"") {
tw.writeError_type(it)
}
return TypeResult(typeId, null, "<CodeQL error type>")
}
private fun extractErrorType(): TypeResults {
val javaResult = extractJavaErrorType()
val kotlinTypeId = tw.getLabelFor<DbKt_nullable_type>("@\"errorKotlinType\"") {
tw.writeKt_nullable_types(it, typeId)
tw.writeKt_nullable_types(it, javaResult.id)
}
return TypeResults(TypeResult(typeId, null, "<CodeQL error type>"),
return TypeResults(javaResult,
TypeResult(kotlinTypeId, null, "<CodeQL error type>"))
}
@@ -719,7 +724,7 @@ open class KotlinUsesExtractor(
}
else -> {
logger.error("Unrecognised IrSimpleType: " + s.javaClass + ": " + s.render())
return TypeResults(TypeResult(fakeLabel(), "unknown", "unknown"), TypeResult(fakeLabel(), "unknown", "unknown"))
return extractErrorType()
}
}
}
@@ -1276,7 +1281,7 @@ open class KotlinUsesExtractor(
}
else -> {
logger.error("Unexpected type argument.")
return TypeResult(fakeLabel(), "unknown", "unknown")
return extractJavaErrorType()
}
}
}