Kotlin: Stop useValueDeclaration returning fakeLabel

igfoo · igfoo · commit 05c062da9996 · 2022-05-10T19:51:26.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -2401,7 +2401,9 @@ open class KotlinFileExtractor(
                             useValueParameter(owner, useFunction(owner.parent as IrFunction))
                         else
                             useValueDeclaration(owner)
-                        tw.writeVariableBinding(id, vId)
+                        if (vId != null) {
+                            tw.writeVariableBinding(id, vId)
+                        }
                     }
                 }
                 is IrGetField -> {
@@ -2489,7 +2491,9 @@ open class KotlinFileExtractor(
                             tw.writeExprs_varaccess(lhsId, lhsType.javaResult.id, id, 0)
                             tw.writeExprsKotlinType(lhsId, lhsType.kotlinResult.id)
                             val vId = useValueDeclaration(e.symbol.owner)
-                            tw.writeVariableBinding(lhsId, vId)
+                            if (vId != null) {
+                                tw.writeVariableBinding(lhsId, vId)
+                            }
                             extractExpressionExpr(inPlaceUpdateRhs ?: rhsValue, callable, id, 1, exprParent.enclosingStmt)
                         }
                         is IrSetField -> {
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
@@ -1036,13 +1036,13 @@ open class KotlinUsesExtractor(
         }
     }
 
-    fun useValueDeclaration(d: IrValueDeclaration): Label<out DbVariable> =
+    fun useValueDeclaration(d: IrValueDeclaration): Label<out DbVariable>? =
         when(d) {
             is IrValueParameter -> useValueParameter(d, null)
             is IrVariable -> useVariable(d)
             else -> {
                 logger.error("Unrecognised IrValueDeclaration: " + d.javaClass)
-                fakeLabel()
+                null
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1036,13 +1036,13 @@ open class KotlinUsesExtractor(`
`1036`	`1036`	`}`
`1037`	`1037`	`}`
`1038`	`1038`
`1039`		`- fun useValueDeclaration(d: IrValueDeclaration): Label<out DbVariable> =`
	`1039`	`+ fun useValueDeclaration(d: IrValueDeclaration): Label<out DbVariable>? =`
`1040`	`1040`	`when(d) {`
`1041`	`1041`	`is IrValueParameter -> useValueParameter(d, null)`
`1042`	`1042`	`is IrVariable -> useVariable(d)`
`1043`	`1043`	`else -> {`
`1044`	`1044`	`logger.error("Unrecognised IrValueDeclaration: " + d.javaClass)`
`1045`		`- fakeLabel()`
	`1045`	`+ null`
`1046`	`1046`	`}`
`1047`	`1047`	`}`
`1048`	`1048`