Mercurial > hg > graal-jvmci-8
diff src/cpu/x86/vm/frame_x86.cpp @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 12 Nov 2012 23:14:12 +0100 |
parents | 957c266d8bc5 da91efe96a93 |
children | 291ffc492eb6 |
line wrap: on
line diff
--- a/src/cpu/x86/vm/frame_x86.cpp Mon Nov 12 18:11:17 2012 +0100 +++ b/src/cpu/x86/vm/frame_x86.cpp Mon Nov 12 23:14:12 2012 +0100 @@ -26,7 +26,7 @@ #include "interpreter/interpreter.hpp" #include "memory/resourceArea.hpp" #include "oops/markOop.hpp" -#include "oops/methodOop.hpp" +#include "oops/method.hpp" #include "oops/oop.inline.hpp" #include "prims/methodHandles.hpp" #include "runtime/frame.inline.hpp" @@ -499,7 +499,7 @@ bool frame::interpreter_frame_equals_unpacked_fp(intptr_t* fp) { assert(is_interpreted_frame(), "must be interpreter frame"); - methodOop method = interpreter_frame_method(); + Method* method = interpreter_frame_method(); // When unpacking an optimized frame the frame pointer is // adjusted with: int diff = (method->max_locals() - method->size_of_parameters()) * @@ -536,7 +536,7 @@ // first the method - methodOop m = *interpreter_frame_method_addr(); + Method* m = *interpreter_frame_method_addr(); // validate the method we'd find in this potential sender if (!Universe::heap()->is_valid_method(m)) return false; @@ -554,13 +554,9 @@ return false; } - // validate constantPoolCacheOop - - constantPoolCacheOop cp = *interpreter_frame_cache_addr(); - - if (cp == NULL || - !Space::is_aligned(cp) || - !Universe::heap()->is_permanent((void*)cp)) return false; + // validate ConstantPoolCache* + ConstantPoolCache* cp = *interpreter_frame_cache_addr(); + if (cp == NULL || !cp->is_metadata()) return false; // validate locals @@ -581,7 +577,7 @@ interpreterState istate = get_interpreterState(); #endif // CC_INTERP assert(is_interpreted_frame(), "interpreted frame expected"); - methodOop method = interpreter_frame_method(); + Method* method = interpreter_frame_method(); BasicType type = method->result_type(); intptr_t* tos_addr;