src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EATestBase.java

*** 75,85 ****
              return x == other.x && y == other.y && z == other.z;
          }
  
          @Override
          public String toString() {
!             return "{" + x + "," + y + "}";
          }
  
          @Override
          public int hashCode() {
              return x + 13 * y;
--- 75,85 ----
              return x == other.x && y == other.y && z == other.z;
          }
  
          @Override
          public String toString() {
!             return "{" + x + "," + y + "," + z + "}";
          }
  
          @Override
          public int hashCode() {
              return x + 13 * y;
*** 156,168 ****
          try (DebugContext.Scope s = debug.scope(getClass(), method, getCodeCache())) {
              graph = parseEager(method, AllowAssumptions.YES, debug);
              context = getDefaultHighTierContext();
              new InliningPhase(new CanonicalizerPhase()).apply(graph, context);
              new DeadCodeEliminationPhase().apply(graph);
!             new CanonicalizerPhase().apply(graph, context);
              new PartialEscapePhase(iterativeEscapeAnalysis, false, new CanonicalizerPhase(), null, graph.getOptions()).apply(graph, context);
              returnNodes = graph.getNodes(ReturnNode.TYPE).snapshot();
          } catch (Throwable e) {
              throw debug.handle(e);
          }
      }
  }
--- 156,176 ----
          try (DebugContext.Scope s = debug.scope(getClass(), method, getCodeCache())) {
              graph = parseEager(method, AllowAssumptions.YES, debug);
              context = getDefaultHighTierContext();
              new InliningPhase(new CanonicalizerPhase()).apply(graph, context);
              new DeadCodeEliminationPhase().apply(graph);
!             canonicalizeGraph();
              new PartialEscapePhase(iterativeEscapeAnalysis, false, new CanonicalizerPhase(), null, graph.getOptions()).apply(graph, context);
+             postEACanonicalizeGraph();
              returnNodes = graph.getNodes(ReturnNode.TYPE).snapshot();
          } catch (Throwable e) {
              throw debug.handle(e);
          }
      }
+ 
+     protected void postEACanonicalizeGraph() {
+     }
+ 
+     protected void canonicalizeGraph() {
+         new CanonicalizerPhase().apply(graph, context);
+     }
  }