From 82e4985aa02061f6ff1b6584201ae723a2c43c48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steven=20Sch=C3=A4fer?= <stevenschaefer@google.com>
Date: Fri, 10 May 2019 11:09:28 +0200
Subject: [PATCH] Fix dispatch receiver in JvmStaticAnnotationLowering

---
 .../jvm/lower/JvmStaticAnnotationLowering.kt       | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmStaticAnnotationLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmStaticAnnotationLowering.kt
index b15ee05c3fe..ae2ca4d02ec 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmStaticAnnotationLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmStaticAnnotationLowering.kt
@@ -132,12 +132,14 @@ private class CompanionObjectJvmStaticLowering(val context: JvmBackendContext) :
 
         call.passTypeArgumentsFrom(proxy)
 
-        call.dispatchReceiver = IrGetFieldImpl(
-            UNDEFINED_OFFSET,
-            UNDEFINED_OFFSET,
-            companionInstanceFieldSymbol,
-            companion.defaultType
-        )
+        target.dispatchReceiverParameter?.let { _ ->
+            call.dispatchReceiver = IrGetFieldImpl(
+                UNDEFINED_OFFSET,
+                UNDEFINED_OFFSET,
+                companionInstanceFieldSymbol,
+                companion.defaultType
+            )
+        }
         proxy.extensionReceiverParameter?.let { extensionReceiver ->
             call.extensionReceiver = IrGetValueImpl(
                 UNDEFINED_OFFSET,