*** old/src/share/vm/ci/ciObjectFactory.cpp	Thu Dec  3 11:54:16 2009
--- new/src/share/vm/ci/ciObjectFactory.cpp	Thu Dec  3 11:54:16 2009

*** 335,344 ****
--- 335,349 ----
    } else if (o->is_methodData()) {
      methodDataHandle h_md(THREAD, (methodDataOop)o);
      return new (arena()) ciMethodData(h_md);
    } else if (o->is_instance()) {
      instanceHandle h_i(THREAD, (instanceOop)o);
+     if (java_dyn_CallSite::is_instance(o))
+       return new (arena()) ciCallSite(h_i);
+     else if (java_dyn_MethodHandle::is_instance(o))
+       return new (arena()) ciMethodHandle(h_i);
+     else
        return new (arena()) ciInstance(h_i);
    } else if (o->is_objArray()) {
      objArrayHandle h_oa(THREAD, (objArrayOop)o);
      return new (arena()) ciObjArray(h_oa);
    } else if (o->is_typeArray()) {