src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java

rev 56282 : [mq]: graal

*** 1,7 ****
  /*
!  * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 307,317 ****
              this.map = graph.createNodeMap();
              this.pendingTests = new ArrayDeque<>();
              this.conditions = new ArrayDeque<>();
              tool = GraphUtil.getDefaultSimplifier(context.getMetaAccess(), context.getConstantReflection(), context.getConstantFieldProvider(), false, graph.getAssumptions(), graph.getOptions(),
                              context.getLowerer());
!             mergeMaps = EconomicMap.create();
          }
  
          protected void processConditionAnchor(ConditionAnchorNode node) {
              tryProveCondition(node.condition(), (guard, result, guardedValueStamp, newInput) -> {
                  if (result != node.isNegated()) {
--- 307,317 ----
              this.map = graph.createNodeMap();
              this.pendingTests = new ArrayDeque<>();
              this.conditions = new ArrayDeque<>();
              tool = GraphUtil.getDefaultSimplifier(context.getMetaAccess(), context.getConstantReflection(), context.getConstantFieldProvider(), false, graph.getAssumptions(), graph.getOptions(),
                              context.getLowerer());
!             mergeMaps = EconomicMap.create(Equivalence.IDENTITY);
          }
  
          protected void processConditionAnchor(ConditionAnchorNode node) {
              tryProveCondition(node.condition(), (guard, result, guardedValueStamp, newInput) -> {
                  if (result != node.isNegated()) {
*** 614,624 ****
                      InfoElement infoElement = this.getInfoElements(valueAt);
                      while (infoElement != null) {
                          Stamp newStamp = infoElement.getStamp();
                          if (phi.stamp(NodeView.DEFAULT).tryImproveWith(newStamp) != null) {
                              if (mergeMap == null) {
!                                 mergeMap = EconomicMap.create();
                                  mergeMaps.put(merge, mergeMap);
                              }
  
                              PhiInfoElement phiInfoElement = mergeMap.get(phi);
                              if (phiInfoElement == null) {
--- 614,624 ----
                      InfoElement infoElement = this.getInfoElements(valueAt);
                      while (infoElement != null) {
                          Stamp newStamp = infoElement.getStamp();
                          if (phi.stamp(NodeView.DEFAULT).tryImproveWith(newStamp) != null) {
                              if (mergeMap == null) {
!                                 mergeMap = EconomicMap.create(Equivalence.IDENTITY);
                                  mergeMaps.put(merge, mergeMap);
                              }
  
                              PhiInfoElement phiInfoElement = mergeMap.get(phi);
                              if (phiInfoElement == null) {