Use stable order when generating stubs for scope members

compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/KotlinUtils.kt

@@ -82,4 +82,6 @@ fun KotlinBuiltIns.findSingleFunction(name: Name): FunctionDescriptor =
         builtInsPackageScope.findSingleFunction(name)
 
 val PsiElement?.startOffsetOrUndefined get() = this?.startOffset ?: UNDEFINED_OFFSET
-val PsiElement?.endOffsetOrUndefined get() = this?.endOffset ?: UNDEFINED_OFFSET
+val PsiElement?.endOffsetOrUndefined get() = this?.endOffset ?: UNDEFINED_OFFSET
+
+

compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/StableDescriptorsComparator.kt

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.psi2ir
+
+import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
+import org.jetbrains.kotlin.renderer.ClassifierNamePolicy
+import org.jetbrains.kotlin.renderer.DescriptorRenderer
+import org.jetbrains.kotlin.renderer.DescriptorRendererModifier
+import org.jetbrains.kotlin.renderer.OverrideRenderingPolicy
+import java.util.*
+
+object StableDescriptorsComparator : Comparator<DeclarationDescriptor> {
+    override fun compare(member1: DeclarationDescriptor?, member2: DeclarationDescriptor?): Int {
+        if (member1 == member2) return 0
+        if (member1 == null) return -1
+        if (member2 == null) return 1
+
+        val image1 = DESCRIPTOR_RENDERER.render(member1)
+        val image2 = DESCRIPTOR_RENDERER.render(member2)
+        return image1.compareTo(image2)
+    }
+
+    private val DESCRIPTOR_RENDERER = DescriptorRenderer.withOptions {
+        withDefinedIn = false
+        overrideRenderingPolicy = OverrideRenderingPolicy.RENDER_OPEN_OVERRIDE
+        includePropertyConstant = true
+        classifierNamePolicy = ClassifierNamePolicy.FULLY_QUALIFIED
+        verbose = true
+        modifiers = DescriptorRendererModifier.ALL
+    }
+}

compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt

@@ -28,16 +28,12 @@ import org.jetbrains.kotlin.psi.KtDelegatedSuperTypeEntry
 import org.jetbrains.kotlin.psi.KtEnumEntry
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
-import org.jetbrains.kotlin.renderer.ClassifierNamePolicy
-import org.jetbrains.kotlin.renderer.DescriptorRenderer
-import org.jetbrains.kotlin.renderer.DescriptorRendererModifier
-import org.jetbrains.kotlin.renderer.OverrideRenderingPolicy
+import org.jetbrains.kotlin.psi2ir.StableDescriptorsComparator
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 import java.lang.AssertionError
-import java.util.*
 
 class ClassGenerator(declarationGenerator: DeclarationGenerator) : DeclarationGeneratorExtension(declarationGenerator) {
     fun generateClass(ktClassOrObject: KtClassOrObject): IrClass {
@@ -84,40 +80,19 @@ class ClassGenerator(declarationGenerator: DeclarationGenerator) : DeclarationGe
                         it?.kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE
                     }
                 }
-                .sortedWith(StableCallableMembersComparator)
+                .sortedWith(StableDescriptorsComparator)
                 .forEach { fakeOverride ->
                     irClass.addMember(declarationGenerator.generateFakeOverrideDeclaration(fakeOverride, ktClassOrObject))
                 }
     }
 
-    private object StableCallableMembersComparator : Comparator<CallableMemberDescriptor> {
-        override fun compare(member1: CallableMemberDescriptor?, member2: CallableMemberDescriptor?): Int {
-            if (member1 == member2) return 0
-            if (member1 == null) return -1
-            if (member2 == null) return 1
-
-            val image1 = DESCRIPTOR_RENDERER.render(member1)
-            val image2 = DESCRIPTOR_RENDERER.render(member2)
-            return image1.compareTo(image2)
-        }
-
-        private val DESCRIPTOR_RENDERER = DescriptorRenderer.withOptions {
-            withDefinedIn = false
-            overrideRenderingPolicy = OverrideRenderingPolicy.RENDER_OPEN_OVERRIDE
-            includePropertyConstant = true
-            classifierNamePolicy = ClassifierNamePolicy.FULLY_QUALIFIED
-            verbose = true
-            modifiers = DescriptorRendererModifier.ALL
-        }
-    }
-
     private fun generateMembersDeclaredInSupertypeList(irClass: IrClass, ktClassOrObject: KtClassOrObject) {
         ktClassOrObject.getSuperTypeList()?.let { ktSuperTypeList ->
             val delegatedMembers = irClass.descriptor.unsubstitutedMemberScope
                     .getContributedDescriptors(DescriptorKindFilter.CALLABLES)
                     .filterIsInstance<CallableMemberDescriptor>()
                     .filter { it.kind == CallableMemberDescriptor.Kind.DELEGATION }
-                    .sortedWith(StableCallableMembersComparator)
+                    .sortedWith(StableDescriptorsComparator)
             if (delegatedMembers.isEmpty()) return
 
             for (ktEntry in ktSuperTypeList.entries) {

compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ModuleDependenciesGenerator.kt

@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.ir.declarations.impl.IrPropertyImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrTypeParameterImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrValueParameterImpl
 import org.jetbrains.kotlin.ir.symbols.IrSymbol
+import org.jetbrains.kotlin.psi2ir.StableDescriptorsComparator
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
 
@@ -124,7 +125,7 @@ class ModuleDependenciesGenerator(override val context: GeneratorContext) : Gene
             }
 
     private fun MemberScope.generateChildStubs(irParent: IrDeclarationContainer) {
-        getContributedDescriptors().generateChildStubs(irParent)
+        getContributedDescriptors().sortedWith(StableDescriptorsComparator).generateChildStubs (irParent)
     }
 
     private fun Collection<DeclarationDescriptor>.generateChildStubs(irParent: IrDeclarationContainer) {