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

     1.1 --- a/src/share/vm/prims/jni.cpp	Tue Jan 05 11:16:09 2010 -0800
     1.2 +++ b/src/share/vm/prims/jni.cpp	Wed Jan 06 14:22:39 2010 -0800
     1.3 @@ -396,11 +396,11 @@
     1.4    oop mirror     = NULL;
     1.5    int slot       = 0;
     1.6  
     1.7 -  if (reflected->klass() == SystemDictionary::reflect_constructor_klass()) {
     1.8 +  if (reflected->klass() == SystemDictionary::reflect_Constructor_klass()) {
     1.9      mirror = java_lang_reflect_Constructor::clazz(reflected);
    1.10      slot   = java_lang_reflect_Constructor::slot(reflected);
    1.11    } else {
    1.12 -    assert(reflected->klass() == SystemDictionary::reflect_method_klass(), "wrong type");
    1.13 +    assert(reflected->klass() == SystemDictionary::reflect_Method_klass(), "wrong type");
    1.14      mirror = java_lang_reflect_Method::clazz(reflected);
    1.15      slot   = java_lang_reflect_Method::slot(reflected);
    1.16    }
    1.17 @@ -496,7 +496,7 @@
    1.18    klassOop super = Klass::cast(k)->java_super();
    1.19    // super2 is the value computed by the compiler's getSuperClass intrinsic:
    1.20    debug_only(klassOop super2 = ( Klass::cast(k)->oop_is_javaArray()
    1.21 -                                 ? SystemDictionary::object_klass()
    1.22 +                                 ? SystemDictionary::Object_klass()
    1.23                                   : Klass::cast(k)->super() ) );
    1.24    assert(super == super2,
    1.25           "java_super computation depends on interface, array, other super");
    1.26 @@ -584,7 +584,7 @@
    1.27    if (thread->has_pending_exception()) {
    1.28      Handle ex(thread, thread->pending_exception());
    1.29      thread->clear_pending_exception();
    1.30 -    if (ex->is_a(SystemDictionary::threaddeath_klass())) {
    1.31 +    if (ex->is_a(SystemDictionary::ThreadDeath_klass())) {
    1.32        // Don't print anything if we are being killed.
    1.33      } else {
    1.34        jio_fprintf(defaultStream::error_stream(), "Exception ");
    1.35 @@ -593,12 +593,12 @@
    1.36          jio_fprintf(defaultStream::error_stream(),
    1.37          "in thread \"%s\" ", thread->get_thread_name());
    1.38        }
    1.39 -      if (ex->is_a(SystemDictionary::throwable_klass())) {
    1.40 +      if (ex->is_a(SystemDictionary::Throwable_klass())) {
    1.41          JavaValue result(T_VOID);
    1.42          JavaCalls::call_virtual(&result,
    1.43                                  ex,
    1.44                                  KlassHandle(THREAD,
    1.45 -                                  SystemDictionary::throwable_klass()),
    1.46 +                                  SystemDictionary::Throwable_klass()),
    1.47                                  vmSymbolHandles::printStackTrace_name(),
    1.48                                  vmSymbolHandles::void_method_signature(),
    1.49                                  THREAD);