src/hotspot/share/opto/escape.cpp

*** 35,44 ****
--- 35,45 ----
  #include "opto/compile.hpp"
  #include "opto/escape.hpp"
  #include "opto/phaseX.hpp"
  #include "opto/movenode.hpp"
  #include "opto/rootnode.hpp"
+ #include "opto/subnode.hpp"
  
  ConnectionGraph::ConnectionGraph(Compile * C, PhaseIterGVN *igvn) :
    _nodes(C->comp_arena(), C->unique(), C->unique(), NULL),
    _in_worklist(C->comp_arena()),
    _next_pidx(0),
*** 158,168 ****
      if (n->is_MergeMem()) {
        // Collect all MergeMem nodes to add memory slices for
        // scalar replaceable objects in split_unique_types().
        _mergemem_worklist.append(n->as_MergeMem());
      } else if (OptimizePtrCompare && n->is_Cmp() &&
!                (n->Opcode() == Op_CmpP || n->Opcode() == Op_CmpN)) {
        // Collect compare pointers nodes.
        ptr_cmp_worklist.append(n);
      } else if (n->is_MemBarStoreStore()) {
        // Collect all MemBarStoreStore nodes so that depending on the
        // escape status of the associated Allocate node some of them
--- 159,170 ----
      if (n->is_MergeMem()) {
        // Collect all MergeMem nodes to add memory slices for
        // scalar replaceable objects in split_unique_types().
        _mergemem_worklist.append(n->as_MergeMem());
      } else if (OptimizePtrCompare && n->is_Cmp() &&
!                ((n->Opcode() == Op_CmpP && !(((CmpPNode*)n)->has_perturbed_operand() != NULL)) ||
!                  n->Opcode() == Op_CmpN)) {
        // Collect compare pointers nodes.
        ptr_cmp_worklist.append(n);
      } else if (n->is_MemBarStoreStore()) {
        // Collect all MemBarStoreStore nodes so that depending on the
        // escape status of the associated Allocate node some of them