From ba9f12b6179cff6716a7367c7b8f19701db0fdd7 Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Wed, 27 Jun 2018 14:18:24 +0300
Subject: [PATCH] Use original descriptor for property stub generation

(cherry picked from commit 1a9f242)
---
 .../jetbrains/kotlin/ir/util/DeclarationStubGenerator.kt  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeclarationStubGenerator.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeclarationStubGenerator.kt
index 5c4c3d8850c..a8fa1a32e2e 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeclarationStubGenerator.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeclarationStubGenerator.kt
@@ -72,7 +72,13 @@ class DeclarationStubGenerator(
             val getterDescriptor = descriptor.getter
             if (getterDescriptor == null) {
                 irProperty.backingField =
-                        symbolTable.declareField(UNDEFINED_OFFSET, UNDEFINED_OFFSET, origin, descriptor, descriptor.type.toIrType())
+                        symbolTable.declareField(
+                            UNDEFINED_OFFSET,
+                            UNDEFINED_OFFSET,
+                            origin,
+                            descriptor.original,
+                            descriptor.type.toIrType()
+                        )
             } else {
                 irProperty.getter = generateFunctionStub(getterDescriptor)
             }