From d4076637345b8bb79c1d7ab336d5a7269067badf Mon Sep 17 00:00:00 2001
From: Juan Chen <juanch@google.com>
Date: Wed, 8 Jan 2020 10:28:22 -0800
Subject: [PATCH] Add another binding for wrapped parameter descriptors.

---
 .../kotlin/fir/backend/Fir2IrDeclarationStorage.kt        | 8 ++++++--
 compiler/testData/codegen/box/traits/inheritedVar.kt      | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
index c01615cb6d9..560a04ce495 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
@@ -303,15 +303,19 @@ class Fir2IrDeclarationStorage(
 
     private fun <T : IrFunction> T.declareDefaultSetterParameter(type: IrType): T {
         val parent = this
+        val descriptor = WrappedValueParameterDescriptor()
         valueParameters += irSymbolTable.declareValueParameter(
-            startOffset, endOffset, origin, WrappedValueParameterDescriptor(), type
+            startOffset, endOffset, origin, descriptor, type
         ) { symbol ->
             IrValueParameterImpl(
                 startOffset, endOffset, IrDeclarationOrigin.DEFINED, symbol,
                 Name.special("<set-?>"), 0, type,
                 varargElementType = null,
                 isCrossinline = false, isNoinline = false
-            ).apply { this.parent = parent }
+            ).apply {
+                this.parent = parent
+                descriptor.bind(this)
+            }
         }
         return this
     }
diff --git a/compiler/testData/codegen/box/traits/inheritedVar.kt b/compiler/testData/codegen/box/traits/inheritedVar.kt
index 04a3faf7782..887f33c2178 100644
--- a/compiler/testData/codegen/box/traits/inheritedVar.kt
+++ b/compiler/testData/codegen/box/traits/inheritedVar.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 //KT-2206
 
 interface A {