From 674effa5e2bd235aaddb930a75a89a8312e46af5 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 11 Jul 2011 17:52:11 +0200
Subject: [PATCH] some diagnostics for EA-28785 (wrong instruction passed to
 dfa)

---
 .../reachingDefs/ReachingDefinitionsDfaInstance.java        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/reachingDefs/ReachingDefinitionsDfaInstance.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/reachingDefs/ReachingDefinitionsDfaInstance.java
index a41738b927c6..b94554853e9c 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/reachingDefs/ReachingDefinitionsDfaInstance.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/reachingDefs/ReachingDefinitionsDfaInstance.java
@@ -21,17 +21,21 @@ import org.jetbrains.plugins.groovy.lang.psi.controlFlow.Instruction;
 import org.jetbrains.plugins.groovy.lang.psi.controlFlow.ReadWriteVariableInstruction;
 import org.jetbrains.plugins.groovy.lang.psi.dataFlow.DfaInstance;
 
+import java.util.Arrays;
+
 /**
  * @author ven
  */
 public class ReachingDefinitionsDfaInstance implements DfaInstance<TIntObjectHashMap<TIntHashSet>> {
   private final TObjectIntHashMap<String> myVarToIndexMap = new TObjectIntHashMap<String>();
+  private final Instruction[] myFlow;
 
   public int getVarIndex(String varName) {
     return myVarToIndexMap.get(varName);
   }
 
   public ReachingDefinitionsDfaInstance(Instruction[] flow) {
+    myFlow = flow;
     int num = 0;
     for (Instruction instruction : flow) {
       if (instruction instanceof ReadWriteVariableInstruction) {
@@ -48,7 +52,7 @@ public class ReachingDefinitionsDfaInstance implements DfaInstance<TIntObjectHas
     if (instruction instanceof ReadWriteVariableInstruction) {
       final ReadWriteVariableInstruction varInsn = (ReadWriteVariableInstruction) instruction;
       final String name = varInsn.getVariableName();
-      assert myVarToIndexMap.containsKey(name);
+      assert myVarToIndexMap.containsKey(name) : name + "; " + Arrays.asList(myFlow).contains(instruction);
       final int num = myVarToIndexMap.get(name);
       if (varInsn.isWrite()) {
         registerDef(m, varInsn, num);