From b2c42f4cc9703037c2524404e9f06e792618a1a1 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Fri, 15 Jun 2012 15:04:10 +0400
Subject: [PATCH] fix DataFlowInfo.or

---
 .../jet/lang/resolve/calls/autocasts/DataFlowInfo.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowInfo.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowInfo.java
index ab56ec113ed..9e14dacf832 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowInfo.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowInfo.java
@@ -181,7 +181,7 @@ public class DataFlowInfo {
 
         ListMultimap<DataFlowValue, JetType> newTypeInfo = Multimaps.newListMultimap(Maps.<DataFlowValue, Collection<JetType>>newHashMap(), CommonSuppliers.<JetType>getArrayListSupplier());
 
-        Set<DataFlowValue> keys = newTypeInfo.keySet();
+        Set<DataFlowValue> keys = typeInfo.keySet();
         keys.retainAll(other.typeInfo.keySet());
 
         for (DataFlowValue key : keys) {