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

     1.1 --- a/src/share/vm/utilities/exceptions.cpp	Fri Aug 31 16:39:35 2012 -0700
     1.2 +++ b/src/share/vm/utilities/exceptions.cpp	Sat Sep 01 13:25:18 2012 -0400
     1.3 @@ -88,7 +88,7 @@
     1.4    // adequate stack space.
     1.5    // This can happen with stress testing a large value of StackShadowPages
     1.6    if (h_exception()->klass() == SystemDictionary::StackOverflowError_klass()) {
     1.7 -    instanceKlass* ik = instanceKlass::cast(h_exception->klass());
     1.8 +    InstanceKlass* ik = InstanceKlass::cast(h_exception->klass());
     1.9      assert(ik->is_initialized(),
    1.10             "need to increase min_stack_allowed calculation");
    1.11    }
    1.12 @@ -219,10 +219,10 @@
    1.13  void Exceptions::throw_stack_overflow_exception(Thread* THREAD, const char* file, int line, methodHandle method) {
    1.14    Handle exception;
    1.15    if (!THREAD->has_pending_exception()) {
    1.16 -    klassOop k = SystemDictionary::StackOverflowError_klass();
    1.17 -    oop e = instanceKlass::cast(k)->allocate_instance(CHECK);
    1.18 +    Klass* k = SystemDictionary::StackOverflowError_klass();
    1.19 +    oop e = InstanceKlass::cast(k)->allocate_instance(CHECK);
    1.20      exception = Handle(THREAD, e);  // fill_in_stack trace does gc
    1.21 -    assert(instanceKlass::cast(k)->is_initialized(), "need to increase min_stack_allowed calculation");
    1.22 +    assert(InstanceKlass::cast(k)->is_initialized(), "need to increase min_stack_allowed calculation");
    1.23      if (StackTraceInThrowable) {
    1.24        java_lang_Throwable::fill_in_stack_trace(exception, method());
    1.25      }
    1.26 @@ -257,7 +257,7 @@
    1.27    Handle h_exception;
    1.28  
    1.29    // Resolve exception klass
    1.30 -  klassOop ik = SystemDictionary::resolve_or_fail(name, h_loader, h_protection_domain, true, thread);
    1.31 +  Klass* ik = SystemDictionary::resolve_or_fail(name, h_loader, h_protection_domain, true, thread);
    1.32    instanceKlassHandle klass(thread, ik);
    1.33  
    1.34    if (!thread->has_pending_exception()) {
    1.35 @@ -451,7 +451,7 @@
    1.36          message = java_lang_String::as_utf8_string(msg);
    1.37        }
    1.38      }
    1.39 -    debug_check_abort(instanceKlass::cast(exception()->klass())->external_name(), message);
    1.40 +    debug_check_abort(InstanceKlass::cast(exception()->klass())->external_name(), message);
    1.41    }
    1.42  }
    1.43  #endif