Mercurial > hg > graal-compiler
diff src/share/vm/oops/klass.hpp @ 10408:836a62f43af9
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Wed, 19 Jun 2013 10:45:56 +0200 |
| parents | ab85c49630e2 6bd680e9ea35 |
| children | 6b0fd0964b87 |
line wrap: on
line diff
--- a/src/share/vm/oops/klass.hpp Tue Jun 18 14:23:29 2013 -0700 +++ b/src/share/vm/oops/klass.hpp Wed Jun 19 10:45:56 2013 +0200 @@ -398,9 +398,10 @@ // vtables virtual klassVtable* vtable() const { return NULL; } + virtual int vtable_length() const { return 0; } // subclass check - bool is_subclass_of(Klass* k) const; + bool is_subclass_of(const Klass* k) const; // subtype check: true if is_subclass_of, or if k is interface and receiver implements it bool is_subtype_of(Klass* k) const { juint off = k->super_check_offset(); @@ -449,7 +450,7 @@ Klass* array_klass_or_null(int rank); Klass* array_klass_or_null(); - virtual oop protection_domain() { return NULL; } + virtual oop protection_domain() const = 0; oop class_loader() const;