# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1359749423 -3600
# Node ID f78ac2ce44ef4f09d33a968df3bc5ca838be1c18
# Parent  7e5581ae1e43ec9e031c07735f4988fd61aa4db5
fix client and servr ild for leafGraphId change

diff -r 7e5581ae1e43 -r f78ac2ce44ef src/share/vm/c1/c1_IR.cpp
--- a/src/share/vm/c1/c1_IR.cpp	Fri Feb 01 17:34:18 2013 +0100
+++ b/src/share/vm/c1/c1_IR.cpp	Fri Feb 01 21:10:23 2013 +0100
@@ -210,7 +210,7 @@
 
 void CodeEmitInfo::record_debug_info(DebugInformationRecorder* recorder, int pc_offset) {
   // record the safepoint before recording the debug info for enclosing scopes
-  recorder->add_safepoint(pc_offset, -1, _oop_map->deep_copy());
+  recorder->add_safepoint(pc_offset, _oop_map->deep_copy());
   _scope_debug_info->record_debug_info(recorder, pc_offset, true/*topmost*/, _is_method_handle_invoke);
   recorder->end_safepoint(pc_offset);
 }
diff -r 7e5581ae1e43 -r f78ac2ce44ef src/share/vm/opto/output.cpp
--- a/src/share/vm/opto/output.cpp	Fri Feb 01 17:34:18 2013 +0100
+++ b/src/share/vm/opto/output.cpp	Fri Feb 01 21:10:23 2013 +0100
@@ -814,7 +814,7 @@
   // Add the safepoint in the DebugInfoRecorder
   if( !mach->is_MachCall() ) {
     mcall = NULL;
-    debug_info()->add_safepoint(safepoint_pc_offset, -1, sfn->_oop_map);
+    debug_info()->add_safepoint(safepoint_pc_offset, sfn->_oop_map);
   } else {
     mcall = mach->as_MachCall();
 
@@ -832,7 +832,7 @@
       return_oop = true;
     }
     safepoint_pc_offset += mcall->ret_addr_offset();
-    debug_info()->add_safepoint(safepoint_pc_offset, -1, mcall->_oop_map);
+    debug_info()->add_safepoint(safepoint_pc_offset, mcall->_oop_map);
   }
 
   // Loop over the JVMState list to add scope information
diff -r 7e5581ae1e43 -r f78ac2ce44ef src/share/vm/shark/sharkCacheDecache.cpp
--- a/src/share/vm/shark/sharkCacheDecache.cpp	Fri Feb 01 17:34:18 2013 +0100
+++ b/src/share/vm/shark/sharkCacheDecache.cpp	Fri Feb 01 21:10:23 2013 +0100
@@ -40,7 +40,7 @@
   _oopmap = new OopMap(
     oopmap_slot_munge(stack()->oopmap_frame_size()),
     oopmap_slot_munge(arg_size()));
-  debug_info()->add_safepoint(pc_offset(), -1, oopmap());
+  debug_info()->add_safepoint(pc_offset(), oopmap());
 }
 
 void SharkDecacher::start_stack(int stack_depth) {