src/share/vm/prims/jvm.cpp

*** 33,42 ****
--- 33,43 ----
  #include "memory/oopFactory.hpp"
  #include "memory/universe.inline.hpp"
  #include "oops/fieldStreams.hpp"
  #include "oops/instanceKlass.hpp"
  #include "oops/objArrayKlass.hpp"
+ #include "oops/methodOop.hpp"
  #include "prims/jvm.h"
  #include "prims/jvm_misc.hpp"
  #include "prims/jvmtiExport.hpp"
  #include "prims/jvmtiThreadState.hpp"
  #include "prims/nativeLookup.hpp"
*** 2177,2200 ****
  JVM_QUICK_ENTRY(void, JVM_GetMethodIxExceptionTableEntry(JNIEnv *env, jclass cls, jint method_index, jint entry_index, JVM_ExceptionTableEntryType *entry))
    JVMWrapper("JVM_GetMethodIxExceptionTableEntry");
    klassOop k = java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(cls));
    k = JvmtiThreadState::class_to_verify_considering_redefinition(k, thread);
    oop method = instanceKlass::cast(k)->methods()->obj_at(method_index);
!   typeArrayOop extable = methodOop(method)->exception_table();
!   entry->start_pc   = extable->int_at(entry_index * 4);
!   entry->end_pc     = extable->int_at(entry_index * 4 + 1);
!   entry->handler_pc = extable->int_at(entry_index * 4 + 2);
!   entry->catchType  = extable->int_at(entry_index * 4 + 3);
  JVM_END
  
  
  JVM_QUICK_ENTRY(jint, JVM_GetMethodIxExceptionTableLength(JNIEnv *env, jclass cls, int method_index))
    JVMWrapper("JVM_GetMethodIxExceptionTableLength");
    klassOop k = java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(cls));
    k = JvmtiThreadState::class_to_verify_considering_redefinition(k, thread);
    oop method = instanceKlass::cast(k)->methods()->obj_at(method_index);
!   return methodOop(method)->exception_table()->length() / 4;
  JVM_END
  
  
  JVM_QUICK_ENTRY(jint, JVM_GetMethodIxModifiers(JNIEnv *env, jclass cls, int method_index))
    JVMWrapper("JVM_GetMethodIxModifiers");
--- 2178,2201 ----
  JVM_QUICK_ENTRY(void, JVM_GetMethodIxExceptionTableEntry(JNIEnv *env, jclass cls, jint method_index, jint entry_index, JVM_ExceptionTableEntryType *entry))
    JVMWrapper("JVM_GetMethodIxExceptionTableEntry");
    klassOop k = java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(cls));
    k = JvmtiThreadState::class_to_verify_considering_redefinition(k, thread);
    oop method = instanceKlass::cast(k)->methods()->obj_at(method_index);
!   ExceptionTable extable((methodOop(method)));
!   entry->start_pc   = extable.start_pc(entry_index);
!   entry->end_pc     = extable.end_pc(entry_index);
!   entry->handler_pc = extable.handler_pc(entry_index);
!   entry->catchType  = extable.catch_type_index(entry_index);
  JVM_END
  
  
  JVM_QUICK_ENTRY(jint, JVM_GetMethodIxExceptionTableLength(JNIEnv *env, jclass cls, int method_index))
    JVMWrapper("JVM_GetMethodIxExceptionTableLength");
    klassOop k = java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(cls));
    k = JvmtiThreadState::class_to_verify_considering_redefinition(k, thread);
    oop method = instanceKlass::cast(k)->methods()->obj_at(method_index);
!   return methodOop(method)->exception_table_length();
  JVM_END
  
  
  JVM_QUICK_ENTRY(jint, JVM_GetMethodIxModifiers(JNIEnv *env, jclass cls, int method_index))
    JVMWrapper("JVM_GetMethodIxModifiers");