--- a/hotspot/src/share/vm/ci/ciType.cpp	Tue Jan 05 11:16:09 2010 -0800
+++ b/hotspot/src/share/vm/ci/ciType.cpp	Wed Jan 06 14:22:39 2010 -0800
@@ -111,7 +111,7 @@
   // short, etc.
   // Note: Bare T_ADDRESS means a raw pointer type, not a return_address.
   assert((uint)t < T_CONFLICT+1, "range check");
-  if (t == T_OBJECT)  return ciEnv::_Object;  // java/lang/Object
+  if (t == T_OBJECT)  return ciEnv::_Object_klass;  // java/lang/Object
   assert(_basic_types[t] != NULL, "domain check");
   return _basic_types[t];
 }