1.1 --- a/src/cpu/sparc/vm/frame_sparc.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/cpu/sparc/vm/frame_sparc.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -26,7 +26,7 @@
1.4 #include "interpreter/interpreter.hpp"
1.5 #include "memory/resourceArea.hpp"
1.6 #include "oops/markOop.hpp"
1.7 -#include "oops/methodOop.hpp"
1.8 +#include "oops/method.hpp"
1.9 #include "oops/oop.inline.hpp"
1.10 #include "prims/methodHandles.hpp"
1.11 #include "runtime/frame.inline.hpp"
1.12 @@ -612,7 +612,7 @@
1.13 void frame::pd_gc_epilog() {
1.14 if (is_interpreted_frame()) {
1.15 // set constant pool cache entry for interpreter
1.16 - methodOop m = interpreter_frame_method();
1.17 + Method* m = interpreter_frame_method();
1.18
1.19 *interpreter_frame_cpoolcache_addr() = m->constants()->cache();
1.20 }
1.21 @@ -645,7 +645,7 @@
1.22
1.23 // first the method
1.24
1.25 - methodOop m = *interpreter_frame_method_addr();
1.26 + Method* m = *interpreter_frame_method_addr();
1.27
1.28 // validate the method we'd find in this potential sender
1.29 if (!Universe::heap()->is_valid_method(m)) return false;
1.30 @@ -663,13 +663,9 @@
1.31 return false;
1.32 }
1.33
1.34 - // validate constantPoolCacheOop
1.35 -
1.36 - constantPoolCacheOop cp = *interpreter_frame_cache_addr();
1.37 -
1.38 - if (cp == NULL ||
1.39 - !Space::is_aligned(cp) ||
1.40 - !Universe::heap()->is_permanent((void*)cp)) return false;
1.41 + // validate ConstantPoolCache*
1.42 + ConstantPoolCache* cp = *interpreter_frame_cache_addr();
1.43 + if (cp == NULL || !cp->is_metadata()) return false;
1.44
1.45 // validate locals
1.46
1.47 @@ -729,7 +725,7 @@
1.48
1.49 BasicType frame::interpreter_frame_result(oop* oop_result, jvalue* value_result) {
1.50 assert(is_interpreted_frame(), "interpreted frame expected");
1.51 - methodOop method = interpreter_frame_method();
1.52 + Method* method = interpreter_frame_method();
1.53 BasicType type = method->result_type();
1.54
1.55 if (method->is_native()) {
