*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/WriteBarrierVerificationTest.java	Mon Mar 20 17:38:25 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/WriteBarrierVerificationTest.java	Mon Mar 20 17:38:25 2017

*** 21,32 ****
--- 21,30 ----
   * questions.
   */
  package org.graalvm.compiler.hotspot.test;
  
  import java.util.List;
  import java.util.Map;
  
  import org.junit.Assert;
  import org.junit.Test;
  
  import org.graalvm.compiler.core.common.LocationIdentity;
  import org.graalvm.compiler.debug.Debug;

*** 64,73 ****
--- 62,72 ----
  import org.graalvm.compiler.phases.common.inlining.InliningPhase;
  import org.graalvm.compiler.phases.graph.ReentrantNodeIterator;
  import org.graalvm.compiler.phases.graph.ReentrantNodeIterator.NodeIteratorClosure;
  import org.graalvm.compiler.phases.tiers.HighTierContext;
  import org.graalvm.compiler.phases.tiers.MidTierContext;
+ import org.graalvm.util.EconomicMap;
  
  import jdk.vm.ci.meta.ResolvedJavaField;
  
  /**
   * The following tests validate the write barrier verification phase. For every tested snippet, an

*** 304,314 ****
--- 303,313 ----
      @Test(expected = AssertionError.class)
      public void test22() {
          test("test6Snippet", 5, new int[]{1, 2});
      }
  
-     @Test(expected = AssertionError.class)
      public void test23() {
          test("test6Snippet", 5, new int[]{3});
      }
  
      @Test

*** 710,720 ****
--- 709,719 ----
                      }
                      return false;
                  }
  
                  @Override
!                 protected EconomicMap<LoopExitNode, Boolean> processLoop(LoopBeginNode loop, Boolean initialState) {
                      return ReentrantNodeIterator.processLoop(this, loop, initialState).exitStates;
                  }
  
                  @Override
                  protected Boolean merge(AbstractMergeNode merge, List<Boolean> states) {

*** 727,737 ****
--- 726,736 ----
                  }
              };
  
              DebugConfig debugConfig = DebugScope.getConfig();
              DebugConfig fixedConfig = debugConfig == null ? null
!                             : Debug.fixedConfig(debugConfig.getOptions(), 0, 0, false, false, false, false, false, debugConfig.dumpHandlers(), debugConfig.verifyHandlers(), debugConfig.output());
              try (DebugConfigScope s = Debug.setConfig(fixedConfig)) {
                  ReentrantNodeIterator.apply(closure, graph.start(), false);
                  new WriteBarrierVerificationPhase(config).apply(graph);
              } catch (AssertionError error) {
                  /*