Mercurial > hg > truffle

diff src/share/vm/oops/constantPool.cpp @ 6840:6e5a59a8e4a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author rbackman
date Tue, 09 Oct 2012 07:41:27 +0200
parents f6b0eb4e44cf d8ce2825b193
children 4735d2c84362
line wrap: on
line diff
--- a/src/share/vm/oops/constantPool.cpp	Fri Oct 05 13:37:08 2012 -0700
+++ b/src/share/vm/oops/constantPool.cpp	Tue Oct 09 07:41:27 2012 +0200
@@ -533,7 +533,7 @@
 void ConstantPool::verify_constant_pool_resolve(constantPoolHandle this_oop, KlassHandle k, TRAPS) {
  if (k->oop_is_instance() || k->oop_is_objArray()) {
     instanceKlassHandle holder (THREAD, this_oop->pool_holder());
-    Klass* elem_oop = k->oop_is_instance() ? k() : objArrayKlass::cast(k())->bottom_klass();
+    Klass* elem_oop = k->oop_is_instance() ? k() : ObjArrayKlass::cast(k())->bottom_klass();
     KlassHandle element (THREAD, elem_oop);
 
     // The element type could be a typeArray - we only need the access check if it is