Mercurial > hg > truffle

diff src/share/vm/oops/objArrayKlass.hpp @ 4970:33df1aeaebbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 13:10:13 +0100
parents 069ab3f976d3
children b632e80fc9dc
line wrap: on
line diff
--- a/src/share/vm/oops/objArrayKlass.hpp	Fri Feb 24 18:30:42 2012 -0800
+++ b/src/share/vm/oops/objArrayKlass.hpp	Mon Feb 27 13:10:13 2012 +0100
@@ -47,7 +47,7 @@
   oop* bottom_klass_addr()            { return (oop*)&_bottom_klass; }
 
   // Compiler/Interpreter offset
-  static int element_klass_offset_in_bytes() { return offset_of(objArrayKlass, _element_klass); }
+  static ByteSize element_klass_offset() { return in_ByteSize(sizeof(klassOopDesc) + offset_of(objArrayKlass, _element_klass)); }
 
   // Dispatched operation
   bool can_be_primary_super_slow() const;