diff src/share/vm/oops/method.cpp @ 7470:18c3c3fa291b

Merge
author dlong
date Wed, 09 Jan 2013 21:18:52 -0500
parents ade95d680b42 0c8717a92b2d
children 989155e2d07a 5daaddd917a1 6a51fc70a15e
line wrap: on
line diff
--- a/src/share/vm/oops/method.cpp	Wed Jan 09 18:06:34 2013 -0500
+++ b/src/share/vm/oops/method.cpp	Wed Jan 09 21:18:52 2013 -0500
@@ -194,16 +194,16 @@
   return buf;
 }
 
-int  Method::fast_exception_handler_bci_for(KlassHandle ex_klass, int throw_bci, TRAPS) {
+int Method::fast_exception_handler_bci_for(methodHandle mh, KlassHandle ex_klass, int throw_bci, TRAPS) {
   // exception table holds quadruple entries of the form (beg_bci, end_bci, handler_bci, klass_index)
   // access exception table
-  ExceptionTable table(this);
+  ExceptionTable table(mh());
   int length = table.length();
   // iterate through all entries sequentially
-  constantPoolHandle pool(THREAD, constants());
+  constantPoolHandle pool(THREAD, mh->constants());
   for (int i = 0; i < length; i ++) {
     //reacquire the table in case a GC happened
-    ExceptionTable table(this);
+    ExceptionTable table(mh());
     int beg_bci = table.start_pc(i);
     int end_bci = table.end_pc(i);
     assert(beg_bci <= end_bci, "inconsistent exception table");