Revert "Kotlin: Extract fake overrides for now"

This reverts commit a1ffa7b66b6bc1a9b6fd93da60e7a16c0dc2fb21.
This commit is contained in:
Chris Smowton
2022-01-26 16:27:05 +00:00
committed by Ian Lynagh
parent 16a27f5258
commit 8c9c37ca47

View File

@@ -520,11 +520,8 @@ open class KotlinFileExtractor(
fun extractFunctionIfReal(f: IrFunction, parentId: Label<out DbReftype>, extractBody: Boolean, typeSubstitution: TypeSubstitution?, classTypeArgsIncludingOuterClasses: List<IrTypeArgument>?) {
with("function if real", f) {
// TODO: We want to skip these, and use `.target` for
// functions, but that causes our type parameter mapping
// to go wrong and gives us IndexOutOfBoundsExceptions
// if (f.origin == IrDeclarationOrigin.FAKE_OVERRIDE)
// return
if (f.origin == IrDeclarationOrigin.FAKE_OVERRIDE)
return
extractFunction(f, parentId, extractBody, typeSubstitution, classTypeArgsIncludingOuterClasses)
}
}
@@ -983,11 +980,7 @@ open class KotlinFileExtractor(
}
fun extractMethodAccess(syntacticCallTarget: IrFunction, extractMethodTypeArguments: Boolean = true, extractClassTypeArguments: Boolean = false) {
// TODO: We want to say
// callTarget = syntacticCallTarget.target
// but that causes our type parameter mapping
// to go wrong and gives us IndexOutOfBoundsExceptions
val callTarget = syntacticCallTarget // .target
val callTarget = syntacticCallTarget.target
val id = tw.getFreshIdLabel<DbMethodaccess>()
val type = useType(c.type)
val locId = tw.getLocation(c)