Mercurial > hg > graal-compiler
diff src/cpu/x86/vm/frame_x86.cpp @ 1748:3e8fbc61cee8
6978355: renaming for 6961697
Summary: This is the renaming part of 6961697 to keep the actual changes small for review.
Reviewed-by: kvn, never
author | twisti |
---|---|
date | Wed, 25 Aug 2010 05:27:54 -0700 |
parents | 126ea7725993 |
children | 1aa5b22a7716 f95d63e2154a |
line wrap: on
line diff
--- a/src/cpu/x86/vm/frame_x86.cpp Mon Aug 23 09:09:36 2010 -0700 +++ b/src/cpu/x86/vm/frame_x86.cpp Wed Aug 25 05:27:54 2010 -0700 @@ -141,12 +141,12 @@ } // Could just be some random pointer within the codeBlob - - if (!sender_blob->instructions_contains(sender_pc)) return false; + if (!sender_blob->code_contains(sender_pc)) { + return false; + } // We should never be able to see an adapter if the current frame is something from code cache - - if ( sender_blob->is_adapter_blob()) { + if (sender_blob->is_adapter_blob()) { return false; } @@ -340,7 +340,7 @@ fr._unextended_sp = unextended_sp; address original_pc = nm->get_original_pc(&fr); - assert(nm->code_contains(original_pc), "original PC must be in nmethod"); + assert(nm->insts_contains(original_pc), "original PC must be in nmethod"); assert(nm->is_method_handle_return(original_pc) == is_method_handle_return, "must be"); } #endif