Mercurial > hg > graal-compiler
diff src/share/vm/oops/klass.hpp @ 7482:989155e2d07a
Merge with hs25-b15.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Wed, 16 Jan 2013 01:34:24 +0100 |
| parents | 291ffc492eb6 30866cd626b0 |
| children | 5fc51c1ecdeb |
line wrap: on
line diff
--- a/src/share/vm/oops/klass.hpp Tue Jan 15 18:54:02 2013 +0100 +++ b/src/share/vm/oops/klass.hpp Wed Jan 16 01:34:24 2013 +0100 @@ -466,6 +466,8 @@ oop class_loader() const; + virtual oop klass_holder() const { return class_loader(); } + protected: virtual Klass* array_klass_impl(bool or_null, int rank, TRAPS); virtual Klass* array_klass_impl(bool or_null, TRAPS);