From fc70c416ed24c2b55d2249c97e0cda38346f71ea Mon Sep 17 00:00:00 2001
From: Stanislav Erokhin <Stanislav.Erokhin@jetbrains.com>
Date: Tue, 2 Dec 2014 14:23:58 +0300
Subject: [PATCH] Fix blinking test

---
 .../jetbrains/jet/lang/resolve/TopDownAnalysisContext.java    | 2 +-
 compiler/testData/diagnostics/tests/regressions/Jet81.kt      | 4 ++--
 compiler/testData/diagnostics/tests/regressions/Jet81.txt     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java
index 7680ceef114..90b3d0ad981 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java
@@ -176,7 +176,7 @@ public class TopDownAnalysisContext implements BodiesResolveContext {
     @NotNull
     public Map<JetCallableDeclaration, CallableMemberDescriptor> getMembers() {
         if (members == null) {
-            members = Maps.newHashMap();
+            members = Maps.newLinkedHashMap();
             members.putAll(functions);
             members.putAll(properties);
             members.putAll(primaryConstructorParameterProperties);
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet81.kt b/compiler/testData/diagnostics/tests/regressions/Jet81.kt
index dfb6a09746b..f57756e51fc 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet81.kt
+++ b/compiler/testData/diagnostics/tests/regressions/Jet81.kt
@@ -18,10 +18,10 @@ class Test2 {
     {
       <!UNINITIALIZED_VARIABLE, DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> 1
     }
-    val x = <!UNINITIALIZED_VARIABLE, DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b<!>
+    val x = <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM, UNINITIALIZED_VARIABLE!>b<!>
     val y = 1
   }
 
-  val b = <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>x<!>
+  val b = a.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>x<!>
   val c = a.y
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet81.txt b/compiler/testData/diagnostics/tests/regressions/Jet81.txt
index 246f7d7c101..57e6307b95d 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet81.txt
+++ b/compiler/testData/diagnostics/tests/regressions/Jet81.txt
@@ -28,7 +28,7 @@ internal final class Test {
 internal final class Test2 {
     public constructor Test2()
     private final val a: Test2.<init>.<no name provided>
-    internal final val b: [ERROR : <ERROR PROPERTY TYPE>]
+    internal final val b: [ERROR : Type for b]
     internal final val c: kotlin.Int = 1
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int