*** old/src/share/vm/opto/idealKit.hpp	Wed Mar 30 11:22:42 2011
--- new/src/share/vm/opto/idealKit.hpp	Wed Mar 30 11:22:42 2011

*** 106,115 ****
--- 106,116 ----
    Node* _cvstate;                          // current cvstate (control, memory and variables)
    uint _var_ct;                            // number of variables
    bool _delay_all_transforms;              // flag forcing all transforms to be delayed
    Node* _initial_ctrl;                     // saves initial control until variables declared
    Node* _initial_memory;                   // saves initial memory  until variables declared
+   Node* _initial_i_o;                      // saves initial i_o  until variables declared
  
    PhaseGVN& gvn() const { return _gvn; }
    // Create a new cvstate filled with nulls
    Node* new_cvstate();                     // Create a new cvstate
    Node* cvstate() { return _cvstate; }     // current cvstate

*** 140,160 ****
--- 141,165 ----
  
    // Users should not care about slices only MergedMem so no access for them.
    Node* memory(uint alias_idx);
  
   public:
!   IdealKit(PhaseGVN &gvn, Node* control, Node* memory, bool delay_all_transforms = false, bool has_declarations = false);
!   IdealKit(GraphKit* gkit, bool delay_all_transforms = false, bool has_declarations = false);
    ~IdealKit() {
      stop();
      drain_delay_transform();
    }
+   void sync_kit(GraphKit* gkit);
+ 
    // Control
    Node* ctrl()                          { return _cvstate->in(TypeFunc::Control); }
    void set_ctrl(Node* ctrl)             { _cvstate->set_req(TypeFunc::Control, ctrl); }
    Node* top()                           { return C->top(); }
    MergeMemNode* merged_memory()         { return _cvstate->in(TypeFunc::Memory)->as_MergeMem(); }
    void set_all_memory(Node* mem)        { _cvstate->set_req(TypeFunc::Memory, mem); }
+   Node* i_o()                           { return _cvstate->in(TypeFunc::I_O); }
+   void set_i_o(Node* c)                 { _cvstate->set_req(TypeFunc::I_O, c); }
    void set(IdealVariable& v, Node* rhs) { _cvstate->set_req(first_var + v.id(), rhs); }
    Node* value(IdealVariable& v)         { return _cvstate->in(first_var + v.id()); }
    void dead(IdealVariable& v)           { set(v, (Node*)NULL); }
    void if_then(Node* left, BoolTest::mask relop, Node* right,
                 float prob = PROB_FAIR, float cnt = COUNT_UNKNOWN,

*** 237,245 ****
--- 242,261 ----
    void make_leaf_call(const TypeFunc *slow_call_type,
                        address slow_call,
                        const char *leaf_name,
                        Node* parm0,
                        Node* parm1 = NULL,
!                       Node* parm2 = NULL);
!                       Node* parm2 = NULL,
+                       Node* parm3 = NULL);
+ 
+   void make_leaf_call_no_fp(const TypeFunc *slow_call_type,
+                             address slow_call,
+                             const char *leaf_name,
+                             const TypePtr* adr_type,
+                             Node* parm0,
+                             Node* parm1,
+                             Node* parm2,
+                             Node* parm3);
+ 
  };
  
  #endif // SHARE_VM_OPTO_IDEALKIT_HPP