From f441151eab6c6766d054b9e6a5dee0c9835d5e0e Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Mon, 24 Oct 2022 15:14:36 +0300
Subject: [PATCH] [FIR] Fix order of supertype scopes for supertypes of
 companion object

^KT-54645 Fixed
---
 .../kotlin/fir/resolve/transformers/FirSupertypesResolution.kt  | 2 +-
 compiler/testData/codegen/box/companion/kt54645.kt              | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypesResolution.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypesResolution.kt
index 43352816373..0e8b303ee7b 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypesResolution.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypesResolution.kt
@@ -200,7 +200,7 @@ private fun createOtherScopesForNestedClassesOrCompanion(
             klass,
             lookupInterfaces = false, deep = true, substituteTypes = true, useSiteSession = session,
             supertypeSupplier = supertypeComputationSession.supertypesSupplier
-        ).asReversed().mapNotNullTo(this) {
+        ).mapNotNullTo(this) {
             it.lookupTag.getNestedClassifierScope(session, scopeSession)
                 ?.wrapNestedClassifierScopeWithSubstitutionForSuperType(it, session)
         }
diff --git a/compiler/testData/codegen/box/companion/kt54645.kt b/compiler/testData/codegen/box/companion/kt54645.kt
index 1bcec7f80c7..f0a5387398d 100644
--- a/compiler/testData/codegen/box/companion/kt54645.kt
+++ b/compiler/testData/codegen/box/companion/kt54645.kt
@@ -1,5 +1,4 @@
 // TARGET_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
 // ISSUE: KT-54645
 
 abstract class Base {