1.1 --- a/src/share/vm/c1/c1_IR.cpp Thu May 20 06:34:23 2010 -0700
1.2 +++ b/src/share/vm/c1/c1_IR.cpp Fri May 21 02:59:24 2010 -0700
1.3 @@ -230,7 +230,8 @@
1.4 , _stack(stack)
1.5 , _exception_handlers(exception_handlers)
1.6 , _next(NULL)
1.7 - , _id(-1) {
1.8 + , _id(-1)
1.9 + , _is_method_handle_invoke(false) {
1.10 assert(_stack != NULL, "must be non null");
1.11 assert(_bci == SynchronizationEntryBCI || Bytecodes::is_defined(scope()->method()->java_code_at_bci(_bci)), "make sure bci points at a real bytecode");
1.12 }
1.13 @@ -241,7 +242,8 @@
1.14 , _exception_handlers(NULL)
1.15 , _bci(info->_bci)
1.16 , _scope_debug_info(NULL)
1.17 - , _oop_map(NULL) {
1.18 + , _oop_map(NULL)
1.19 + , _is_method_handle_invoke(info->_is_method_handle_invoke) {
1.20 if (lock_stack_only) {
1.21 if (info->_stack != NULL) {
1.22 _stack = info->_stack->copy_locks();
1.23 @@ -259,10 +261,10 @@
1.24 }
1.25
1.26
1.27 -void CodeEmitInfo::record_debug_info(DebugInformationRecorder* recorder, int pc_offset, bool is_method_handle_invoke) {
1.28 +void CodeEmitInfo::record_debug_info(DebugInformationRecorder* recorder, int pc_offset) {
1.29 // record the safepoint before recording the debug info for enclosing scopes
1.30 recorder->add_safepoint(pc_offset, _oop_map->deep_copy());
1.31 - _scope_debug_info->record_debug_info(recorder, pc_offset, true/*topmost*/, is_method_handle_invoke);
1.32 + _scope_debug_info->record_debug_info(recorder, pc_offset, true/*topmost*/, _is_method_handle_invoke);
1.33 recorder->end_safepoint(pc_offset);
1.34 }
1.35
