src/share/vm/opto/escape.hpp

*** 158,190 ****
--- 158,194 ----
    EscapeState          _escape;
    GrowableArray<uint>* _edges; // outgoing edges
    Node* _node;                 // Ideal node corresponding to this PointsTo node.
    int   _offset;               // Object fields offsets.
    bool  _scalar_replaceable;   // Not escaped object could be replaced with scalar
+   bool  _has_unknown_ptr;      // Has edge to phantom_object
  
  public:
    PointsToNode():
      _type(UnknownType),
      _escape(UnknownEscape),
      _edges(NULL),
      _node(NULL),
      _offset(-1),
+     _has_unknown_ptr(false),
      _scalar_replaceable(true) {}
  
  
    EscapeState escape_state() const { return _escape; }
    NodeType node_type() const { return _type;}
    int offset() { return _offset;}
    bool scalar_replaceable() { return _scalar_replaceable;}
+   bool has_unknown_ptr()    { return _has_unknown_ptr;}
  
    void set_offset(int offs) { _offset = offs;}
    void set_escape_state(EscapeState state) { _escape = state; }
    void set_node_type(NodeType ntype) {
      assert(_type == UnknownType || _type == ntype, "Can't change node type");
      _type = ntype;
    }
    void set_scalar_replaceable(bool v) { _scalar_replaceable = v; }
+   void set_has_unknown_ptr()          { _has_unknown_ptr = true; }
  
    // count of outgoing edges
    uint edge_count() const { return (_edges == NULL) ? 0 : _edges->length(); }
  
    // node index of target of outgoing edge "e"
*** 248,257 ****
--- 252,263 ----
      // growableArray::adr_at() will throw assert otherwise.
      return _nodes.adr_at(idx);
    }
    uint nodes_size() const { return _nodes.length(); }
  
+   bool is_null_ptr(uint idx) const { return (idx == _noop_null || idx == _oop_null); }
+ 
    // Add node to ConnectionGraph.
    void add_node(Node *n, PointsToNode::NodeType nt, PointsToNode::EscapeState es, bool done);
  
    // offset of a field reference
    int address_offset(Node* adr, PhaseTransform *phase);
*** 331,344 ****
      Node *phi = _node_map[idx];
      return (phi == NULL) ? NULL : phi->as_Phi();
    }
  
    // Notify optimizer that a node has been modified
-   // Node:  This assumes that escape analysis is run before
-   //        PhaseIterGVN creation
    void record_for_optimizer(Node *n) {
      _igvn->_worklist.push(n);
    }
  
    // Set the escape state of a node
    void set_escape_state(uint ni, PointsToNode::EscapeState es);
  
--- 337,349 ----
      Node *phi = _node_map[idx];
      return (phi == NULL) ? NULL : phi->as_Phi();
    }
  
    // Notify optimizer that a node has been modified
    void record_for_optimizer(Node *n) {
      _igvn->_worklist.push(n);
+     _igvn->add_users_to_worklist(n);
    }
  
    // Set the escape state of a node
    void set_escape_state(uint ni, PointsToNode::EscapeState es);