*** old/src/share/vm/ci/ciObjectFactory.cpp	Wed Oct 28 19:51:13 2009
--- new/src/share/vm/ci/ciObjectFactory.cpp	Wed Oct 28 19:51:13 2009

*** 151,160 ****
--- 151,164 ----
      get(SystemDictionary::class_klass())
        ->as_instance_klass();
    ciEnv::_ClassCastException =
      get(SystemDictionary::ClassCastException_klass())
        ->as_instance_klass();
+   if (EnableInvokeDynamic) {
+     ciEnv::_InvokeDynamic =
+       get(SystemDictionary::InvokeDynamic_klass())->as_instance_klass();
+   }
    ciEnv::_Object =
      get(SystemDictionary::object_klass())
        ->as_instance_klass();
    ciEnv::_Throwable =
      get(SystemDictionary::throwable_klass())

*** 329,338 ****
--- 333,345 ----
      objArrayHandle h_oa(THREAD, (objArrayOop)o);
      return new (arena()) ciObjArray(h_oa);
    } else if (o->is_typeArray()) {
      typeArrayHandle h_ta(THREAD, (typeArrayOop)o);
      return new (arena()) ciTypeArray(h_ta);
+   } else if (o->is_constantPoolCache()) {
+     constantPoolCacheHandle h_cpc(THREAD, (constantPoolCacheOop) o);
+     return new (arena()) ciCPCache(h_cpc);
    }
  
    // The oop is of some type not supported by the compiler interface.
    ShouldNotReachHere();
    return NULL;