Kotlin: Fix duplicate field entry in declaration stack

tamasvajk · tamasvajk · commit 25977778a21c · 2022-09-07T15:21:11.000+02:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -905,7 +905,6 @@ open class KotlinFileExtractor(
     private fun extractField(f: IrField, parentId: Label<out DbReftype>): Label<out DbField> {
         with("field", f) {
            DeclarationStackAdjuster(f).use {
-               declarationStack.push(f)
                val fNameSuffix = getExtensionReceiverType(f)?.let { it.classFqName?.asString()?.replace(".", "$$") } ?: ""
                return extractField(useField(f), "${f.name.asString()}$fNameSuffix", f.type, parentId, tw.getLocation(f), f.visibility, f, isExternalDeclaration(f), f.isFinal)
            }
diff --git a/java/ql/test/kotlin/library-tests/declaration-stack/test.expected b/java/ql/test/kotlin/library-tests/declaration-stack/test.expected
@@ -1 +0,0 @@
-| Test.kt:3:1:5:2 | IrInstanceInitializerCall outside constructor |

Original file line number	Diff line number	Diff line change
`@@ -905,7 +905,6 @@ open class KotlinFileExtractor(`
`905`	`905`	`private fun extractField(f: IrField, parentId: Label<out DbReftype>): Label<out DbField> {`
`906`	`906`	`with("field", f) {`
`907`	`907`	`DeclarationStackAdjuster(f).use {`
`908`		`- declarationStack.push(f)`
`909`	`908`	`val fNameSuffix = getExtensionReceiverType(f)?.let { it.classFqName?.asString()?.replace(".", "$$") } ?: ""`
`910`	`909`	`return extractField(useField(f), "${f.name.asString()}$fNameSuffix", f.type, parentId, tw.getLocation(f), f.visibility, f, isExternalDeclaration(f), f.isFinal)`
`911`	`910`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +0,0 @@`
`1`		`-\| Test.kt:3:1:5:2 \| IrInstanceInitializerCall outside constructor \|`