--- a/hotspot/src/share/vm/runtime/frame.cpp Mon Jul 23 13:04:59 2012 -0700
+++ b/hotspot/src/share/vm/runtime/frame.cpp Tue Jul 24 10:51:00 2012 -0700
@@ -170,11 +170,9 @@
}
// type testers
-bool frame::is_ricochet_frame() const {
- RicochetBlob* rcb = SharedRuntime::ricochet_blob();
- return (_cb == rcb && rcb != NULL && rcb->returns_to_bounce_addr(_pc));
+bool frame::is_ignored_frame() const {
+ return false; // FIXME: some LambdaForm frames should be ignored
}
-
bool frame::is_deoptimized_frame() const {
assert(_deopt_state != unknown, "not answerable");
return _deopt_state == is_deoptimized;
@@ -348,17 +346,12 @@
frame frame::real_sender(RegisterMap* map) const {
frame result = sender(map);
while (result.is_runtime_frame() ||
- result.is_ricochet_frame()) {
+ result.is_ignored_frame()) {
result = result.sender(map);
}
return result;
}
-frame frame::sender_for_ricochet_frame(RegisterMap* map) const {
- assert(is_ricochet_frame(), "");
- return MethodHandles::ricochet_frame_sender(*this, map);
-}
-
// Note: called by profiler - NOT for current thread
frame frame::profile_find_Java_sender_frame(JavaThread *thread) {
// If we don't recognize this frame, walk back up the stack until we do
@@ -541,7 +534,6 @@
const char* frame::print_name() const {
if (is_native_frame()) return "Native";
if (is_interpreted_frame()) return "Interpreted";
- if (is_ricochet_frame()) return "Ricochet";
if (is_compiled_frame()) {
if (is_deoptimized_frame()) return "Deoptimized";
return "Compiled";
@@ -728,8 +720,6 @@
st->print("v ~RuntimeStub::%s", ((RuntimeStub *)_cb)->name());
} else if (_cb->is_deoptimization_stub()) {
st->print("v ~DeoptimizationBlob");
- } else if (_cb->is_ricochet_stub()) {
- st->print("v ~RichochetBlob");
} else if (_cb->is_exception_stub()) {
st->print("v ~ExceptionBlob");
} else if (_cb->is_safepoint_stub()) {
@@ -993,9 +983,6 @@
void frame::oops_code_blob_do(OopClosure* f, CodeBlobClosure* cf, const RegisterMap* reg_map) {
assert(_cb != NULL, "sanity check");
- if (_cb == SharedRuntime::ricochet_blob()) {
- oops_ricochet_do(f, reg_map);
- }
if (_cb->oop_maps() != NULL) {
OopMapSet::oops_do(this, reg_map, f);
@@ -1014,11 +1001,6 @@
cf->do_code_blob(_cb);
}
-void frame::oops_ricochet_do(OopClosure* f, const RegisterMap* map) {
- assert(is_ricochet_frame(), "");
- MethodHandles::ricochet_frame_oops_do(*this, f, map);
-}
-
class CompiledArgumentOopFinder: public SignatureInfo {
protected:
OopClosure* _f;
@@ -1087,7 +1069,7 @@
// First consult the ADLC on where it puts parameter 0 for this signature.
VMReg reg = SharedRuntime::name_for_receiver();
oop r = *caller.oopmapreg_to_location(reg, reg_map);
- assert( Universe::heap()->is_in_or_null(r), "bad receiver" );
+ assert(Universe::heap()->is_in_or_null(r), err_msg("bad receiver: " INTPTR_FORMAT " (" INTX_FORMAT ")", (intptr_t) r, (intptr_t) r));
return r;
}
@@ -1407,8 +1389,6 @@
values.describe(-1, info_address,
FormatBuffer<1024>("#%d nmethod " INTPTR_FORMAT " for native method %s", frame_no,
nm, nm->method()->name_and_sig_as_C_string()), 2);
- } else if (is_ricochet_frame()) {
- values.describe(-1, info_address, err_msg("#%d ricochet frame", frame_no), 2);
} else {
// provide default info if not handled before
char *info = (char *) "special frame";