Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/prims/jvmtiGetLoadedClasses.cpp	Fri Nov 09 22:22:53 2012 -0800
     1.2 +++ b/src/share/vm/prims/jvmtiGetLoadedClasses.cpp	Mon Nov 12 16:15:05 2012 -0500
     1.3 @@ -169,7 +169,7 @@
     1.4    static void increment(Klass* k) {
     1.5      JvmtiGetLoadedClassesClosure* that = JvmtiGetLoadedClassesClosure::get_this();
     1.6      if (that->get_initiatingLoader() == NULL) {
     1.7 -      for (Klass* l = k; l != NULL; l = Klass::cast(l)->array_klass_or_null()) {
     1.8 +      for (Klass* l = k; l != NULL; l = l->array_klass_or_null()) {
     1.9          that->set_count(that->get_count() + 1);
    1.10        }
    1.11      } else if (k != NULL) {
    1.12 @@ -182,7 +182,7 @@
    1.13      JvmtiGetLoadedClassesClosure* that = JvmtiGetLoadedClassesClosure::get_this();
    1.14      oop class_loader = loader_data->class_loader();
    1.15      if (class_loader == JNIHandles::resolve(that->get_initiatingLoader())) {
    1.16 -      for (Klass* l = k; l != NULL; l = Klass::cast(l)->array_klass_or_null()) {
    1.17 +      for (Klass* l = k; l != NULL; l = l->array_klass_or_null()) {
    1.18          that->set_count(that->get_count() + 1);
    1.19        }
    1.20      }
    1.21 @@ -200,14 +200,14 @@
    1.22      JvmtiGetLoadedClassesClosure* that = JvmtiGetLoadedClassesClosure::get_this();
    1.23      if (that->available()) {
    1.24        if (that->get_initiatingLoader() == NULL) {
    1.25 -        for (Klass* l = k; l != NULL; l = Klass::cast(l)->array_klass_or_null()) {
    1.26 -          oop mirror = Klass::cast(l)->java_mirror();
    1.27 +        for (Klass* l = k; l != NULL; l = l->array_klass_or_null()) {
    1.28 +          oop mirror = l->java_mirror();
    1.29            that->set_element(that->get_index(), mirror);
    1.30            that->set_index(that->get_index() + 1);
    1.31          }
    1.32        } else if (k != NULL) {
    1.33          // if initiating loader not null, just include the instance with 1 dimension
    1.34 -        oop mirror = Klass::cast(k)->java_mirror();
    1.35 +        oop mirror = k->java_mirror();
    1.36          that->set_element(that->get_index(), mirror);
    1.37          that->set_index(that->get_index() + 1);
    1.38        }
    1.39 @@ -219,8 +219,8 @@
    1.40      if (that->available()) {
    1.41        oop class_loader = loader_data->class_loader();
    1.42        if (class_loader == JNIHandles::resolve(that->get_initiatingLoader())) {
    1.43 -        for (Klass* l = k; l != NULL; l = Klass::cast(l)->array_klass_or_null()) {
    1.44 -          oop mirror = Klass::cast(l)->java_mirror();
    1.45 +        for (Klass* l = k; l != NULL; l = l->array_klass_or_null()) {
    1.46 +          oop mirror = l->java_mirror();
    1.47            that->set_element(that->get_index(), mirror);
    1.48            that->set_index(that->get_index() + 1);
    1.49          }
    1.50 @@ -234,7 +234,7 @@
    1.51    static void increment_for_basic_type_arrays(Klass* k) {
    1.52      JvmtiGetLoadedClassesClosure* that = JvmtiGetLoadedClassesClosure::get_this();
    1.53      assert(that != NULL, "no JvmtiGetLoadedClassesClosure");
    1.54 -    for (Klass* l = k; l != NULL; l = Klass::cast(l)->array_klass_or_null()) {
    1.55 +    for (Klass* l = k; l != NULL; l = l->array_klass_or_null()) {
    1.56        that->set_count(that->get_count() + 1);
    1.57      }
    1.58    }
    1.59 @@ -244,8 +244,8 @@
    1.60      JvmtiGetLoadedClassesClosure* that = JvmtiGetLoadedClassesClosure::get_this();
    1.61      assert(that != NULL, "no JvmtiGetLoadedClassesClosure");
    1.62      assert(that->available(), "no list");
    1.63 -    for (Klass* l = k; l != NULL; l = Klass::cast(l)->array_klass_or_null()) {
    1.64 -      oop mirror = Klass::cast(l)->java_mirror();
    1.65 +    for (Klass* l = k; l != NULL; l = l->array_klass_or_null()) {
    1.66 +      oop mirror = l->java_mirror();
    1.67        that->set_element(that->get_index(), mirror);
    1.68        that->set_index(that->get_index() + 1);
    1.69      }