From a2385b5edd1ab0b6f9fa71df908ad590e014740b Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Thu, 17 Jun 2021 14:10:22 +0200
Subject: [PATCH] [minor] FIR: Fix Fir2ir jvmmappedscope functions origins

---
 .../kotlin/fir/backend/Fir2IrDeclarationStorage.kt   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 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 239aea03dc0..140bc064e73 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
@@ -1200,11 +1200,13 @@ class Fir2IrDeclarationStorage(
     private fun computeDeclarationOrigin(
         symbol: FirCallableSymbol<*>,
         parentOrigin: IrDeclarationOrigin
-    ): IrDeclarationOrigin {
-        return if (symbol.fir.isIntersectionOverride || symbol.fir.isSubstitutionOverride)
-            IrDeclarationOrigin.FAKE_OVERRIDE
-        else
-            parentOrigin
+    ): IrDeclarationOrigin = when {
+        symbol.fir.isIntersectionOverride || symbol.fir.isSubstitutionOverride -> IrDeclarationOrigin.FAKE_OVERRIDE
+        parentOrigin == IrDeclarationOrigin.IR_EXTERNAL_DECLARATION_STUB &&
+                (symbol.fir.origin is FirDeclarationOrigin.Enhancement || symbol.fir.origin is FirDeclarationOrigin.Java) -> {
+            IrDeclarationOrigin.IR_EXTERNAL_JAVA_DECLARATION_STUB
+        }
+        else -> parentOrigin
     }
 
     fun getIrFieldSymbol(firFieldSymbol: FirFieldSymbol): IrSymbol {