Mercurial > hg > truffle

diff src/share/vm/ci/ciType.cpp @ 1339:09ac706c2623

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Wed, 24 Mar 2010 17:16:33 -0700
parents 4ce7240d622c
children c18cbe5936b8
line wrap: on
line diff
--- a/src/share/vm/ci/ciType.cpp	Mon Mar 15 15:51:36 2010 -0400
+++ b/src/share/vm/ci/ciType.cpp	Wed Mar 24 17:16:33 2010 -0700
@@ -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];
 }