From 2b3162732b3557dc8a401403a4cb7aa9d73fb0ac Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Wed, 1 Aug 2018 09:47:57 +0200
Subject: [PATCH] Fix lazy parent calculation for property accessor

---
 .../kotlin/ir/declarations/lazy/IrLazyDeclarationBase.kt      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyDeclarationBase.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyDeclarationBase.kt
index 200c77685c3..37de7a61fe8 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyDeclarationBase.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyDeclarationBase.kt
@@ -55,7 +55,9 @@ abstract class IrLazyDeclarationBase(
 
     private fun createLazyParent(): IrDeclarationParent? {
         val currentDescriptor = descriptor
-        val containingDeclaration = currentDescriptor.containingDeclaration
+
+        val containingDeclaration =
+            ((currentDescriptor as? PropertyAccessorDescriptor)?.correspondingProperty ?: currentDescriptor).containingDeclaration
         return when (containingDeclaration) {
             is PackageFragmentDescriptor -> stubGenerator.generateOrGetEmptyExternalPackageFragmentStub(containingDeclaration).also {
                 it.declarations.add(this)