1.1 --- a/src/share/vm/oops/klass.cpp Fri Nov 16 09:59:08 2012 +0100
1.2 +++ b/src/share/vm/oops/klass.cpp Fri Nov 16 09:19:12 2012 -0500
1.3 @@ -56,7 +56,7 @@
1.4
1.5 while (t != NULL) {
1.6 if (t == k) return true;
1.7 - t = Klass::cast(t)->super();
1.8 + t = t->super();
1.9 }
1.10 return false;
1.11 }
1.12 @@ -243,16 +243,16 @@
1.13 juint j = super_depth();
1.14 assert(j == my_depth, "computed accessor gets right answer");
1.15 Klass* t = this;
1.16 - while (!Klass::cast(t)->can_be_primary_super()) {
1.17 - t = Klass::cast(t)->super();
1.18 - j = Klass::cast(t)->super_depth();
1.19 + while (!t->can_be_primary_super()) {
1.20 + t = t->super();
1.21 + j = t->super_depth();
1.22 }
1.23 for (juint j1 = j+1; j1 < primary_super_limit(); j1++) {
1.24 assert(primary_super_of_depth(j1) == NULL, "super list padding");
1.25 }
1.26 while (t != NULL) {
1.27 assert(primary_super_of_depth(j) == t, "super list initialization");
1.28 - t = Klass::cast(t)->super();
1.29 + t = t->super();
1.30 --j;
1.31 }
1.32 assert(j == (juint)-1, "correct depth count");
1.33 @@ -333,7 +333,7 @@
1.34
1.35
1.36 Klass* Klass::subklass() const {
1.37 - return _subklass == NULL ? NULL : Klass::cast(_subklass);
1.38 + return _subklass == NULL ? NULL : _subklass;
1.39 }
1.40
1.41 InstanceKlass* Klass::superklass() const {
1.42 @@ -342,7 +342,7 @@
1.43 }
1.44
1.45 Klass* Klass::next_sibling() const {
1.46 - return _next_sibling == NULL ? NULL : Klass::cast(_next_sibling);
1.47 + return _next_sibling == NULL ? NULL : _next_sibling;
1.48 }
1.49
1.50 void Klass::set_subklass(Klass* s) {
