*** old/src/share/vm/opto/matcher.hpp	Mon Apr 20 12:36:12 2009
--- new/src/share/vm/opto/matcher.hpp	Mon Apr 20 12:36:12 2009

*** 107,116 ****
--- 107,119 ----
    void verify_new_nodes_only(Node* root);
  
    Node* _mem_node;   // Ideal memory node consumed by mach node
  #endif
  
+   // Mach node for ConP #NULL
+   MachNode* _machConP0;
+ 
  public:
    int LabelRootDepth;
    static const int base2reg[];        // Map Types to machine register types
    // Convert ideal machine register to a register mask for spill-loads
    static const RegMask *idealreg2regmask[];

*** 120,129 ****
--- 123,134 ----
    // Convert machine register number to register mask
    static uint mreg2regmask_max;
    static RegMask mreg2regmask[];
    static RegMask STACK_ONLY_mask;
  
+   MachNode* machConP0() const { return _machConP0; }
+ 
    bool    is_shared( Node *n ) { return _shared.test(n->_idx) != 0; }
    void   set_shared( Node *n ) {  _shared.set(n->_idx); }
    bool   is_visited( Node *n ) { return _visited.test(n->_idx) != 0; }
    void  set_visited( Node *n ) { _visited.set(n->_idx); }
    bool  is_dontcare( Node *n ) { return _dontcare.test(n->_idx) != 0; }