Fix wrong deserialization order

For case when property and function have the same name or
extension and non-extension member have the same name

compiler/testData/loadJava/compiledKotlin/memberOrder/callablesNameClash.kt

@@ -0,0 +1,18 @@
+//ALLOW_AST_ACCESS
+package test
+
+val a = 0
+val c = 0
+
+fun a() = 0
+fun b() = 0
+fun c() = 0
+
+class A {
+    val a = 0
+    val c = 0
+
+    fun a() = 0
+    fun b() = 0
+    fun c() = 0
+}

compiler/testData/loadJava/compiledKotlin/memberOrder/callablesNameClash.txt

@@ -0,0 +1,20 @@
+package test
+
+internal val a: kotlin.Int = 0
+    internal fun <get-a>(): kotlin.Int
+internal val c: kotlin.Int = 0
+    internal fun <get-c>(): kotlin.Int
+internal fun a(): kotlin.Int
+internal fun b(): kotlin.Int
+internal fun c(): kotlin.Int
+
+internal final class A {
+    /*primary*/ public constructor A()
+    internal final val a: kotlin.Int = 0
+        internal final fun <get-a>(): kotlin.Int
+    internal final val c: kotlin.Int = 0
+        internal final fun <get-c>(): kotlin.Int
+    internal final fun a(): kotlin.Int
+    internal final fun b(): kotlin.Int
+    internal final fun c(): kotlin.Int
+}

compiler/testData/loadJava/compiledKotlin/memberOrder/extensionPropertiesNameClash.kt

@@ -0,0 +1,10 @@
+//ALLOW_AST_ACCESS
+package test
+
+class A {
+    val a: Int = 3
+    val c: Int = 3
+    val Int.a: Int get() = 3
+    val Int.b: Int get() = 4
+    val Int.c: Int get() = 4
+}

compiler/testData/loadJava/compiledKotlin/memberOrder/extensionPropertiesNameClash.txt

@@ -0,0 +1,15 @@
+package test
+
+internal final class A {
+    /*primary*/ public constructor A()
+    internal final val a: kotlin.Int = 3
+        internal final fun <get-a>(): kotlin.Int
+    internal final val c: kotlin.Int = 3
+        internal final fun <get-c>(): kotlin.Int
+    internal final val kotlin.Int.a: kotlin.Int
+        internal final fun kotlin.Int.<get-a>(): kotlin.Int
+    internal final val kotlin.Int.b: kotlin.Int
+        internal final fun kotlin.Int.<get-b>(): kotlin.Int
+    internal final val kotlin.Int.c: kotlin.Int
+        internal final fun kotlin.Int.<get-c>(): kotlin.Int
+}

compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java

@@ -4139,6 +4139,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/memberOrder"), Pattern.compile("^(.+)\\.kt$"), true);
             }
 
+            @TestMetadata("callablesNameClash.kt")
+            public void testCallablesNameClash() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/callablesNameClash.kt");
+                doTestCompiledKotlin(fileName);
+            }
+
             @TestMetadata("enumEntries.kt")
             public void testEnumEntries() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.kt");
@@ -4151,6 +4157,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 doTestCompiledKotlin(fileName);
             }
 
+            @TestMetadata("extensionPropertiesNameClash.kt")
+            public void testExtensionPropertiesNameClash() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionPropertiesNameClash.kt");
+                doTestCompiledKotlin(fileName);
+            }
+
             @TestMetadata("innerClasses.kt")
             public void testInnerClasses() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/innerClasses.kt");

compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveRecursiveComparingTestGenerated.java

@@ -2371,6 +2371,12 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/memberOrder"), Pattern.compile("^(.+)\\.kt$"), true);
             }
 
+            @TestMetadata("callablesNameClash.kt")
+            public void testCallablesNameClash() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/callablesNameClash.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("enumEntries.kt")
             public void testEnumEntries() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.kt");
@@ -2383,6 +2389,12 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
                 doTest(fileName);
             }
 
+            @TestMetadata("extensionPropertiesNameClash.kt")
+            public void testExtensionPropertiesNameClash() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionPropertiesNameClash.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("innerClasses.kt")
             public void testInnerClasses() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/innerClasses.kt");