*** old/src/share/vm/ci/ciObject.hpp	Wed Oct 28 20:02:20 2009
--- new/src/share/vm/ci/ciObject.hpp	Wed Oct 28 20:02:20 2009

*** 129,142 ****
--- 129,144 ----
    // be registered with the oopRecorder.
    jobject constant_encoding();
  
    // What kind of ciObject is this?
    virtual bool is_null_object() const       { return false; }
+   virtual bool is_call_site() const         { return false; }
    virtual bool is_cpcache() const           { return false; }
    virtual bool is_instance()                { return false; }
    virtual bool is_method()                  { return false; }
    virtual bool is_method_data()             { return false; }
+   virtual bool is_method_handle() const     { return false; }
    virtual bool is_array()                   { return false; }
    virtual bool is_obj_array()               { return false; }
    virtual bool is_type_array()              { return false; }
    virtual bool is_symbol()                  { return false; }
    virtual bool is_type()                    { return false; }

*** 184,193 ****
--- 186,199 ----
    // Subclass casting with assertions.
    ciNullObject*            as_null_object() {
      assert(is_null_object(), "bad cast");
      return (ciNullObject*)this;
    }
+   ciCallSite*              as_call_site() {
+     assert(is_call_site(), "bad cast");
+     return (ciCallSite*) this;
+   }
    ciCPCache*               as_cpcache() {
      assert(is_cpcache(), "bad cast");
      return (ciCPCache*) this;
    }
    ciInstance*              as_instance() {

*** 200,209 ****
--- 206,219 ----
    }
    ciMethodData*            as_method_data() {
      assert(is_method_data(), "bad cast");
      return (ciMethodData*)this;
    }
+   ciMethodHandle*          as_method_handle() {
+     assert(is_method_handle(), "bad cast");
+     return (ciMethodHandle*) this;
+   }
    ciArray*                 as_array() {
      assert(is_array(), "bad cast");
      return (ciArray*)this;
    }
    ciObjArray*              as_obj_array() {