Mercurial > hg > graal-compiler
comparison 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 |
comparison
equal
deleted
inserted
replaced
7381:6761a8f854a4 | 7482:989155e2d07a |
---|---|
464 | 464 |
465 virtual oop protection_domain() { return NULL; } | 465 virtual oop protection_domain() { return NULL; } |
466 | 466 |
467 oop class_loader() const; | 467 oop class_loader() const; |
468 | 468 |
469 virtual oop klass_holder() const { return class_loader(); } | |
470 | |
469 protected: | 471 protected: |
470 virtual Klass* array_klass_impl(bool or_null, int rank, TRAPS); | 472 virtual Klass* array_klass_impl(bool or_null, int rank, TRAPS); |
471 virtual Klass* array_klass_impl(bool or_null, TRAPS); | 473 virtual Klass* array_klass_impl(bool or_null, TRAPS); |
472 | 474 |
473 public: | 475 public: |