--- a/hotspot/src/share/vm/opto/compile.hpp	Wed Aug 10 14:06:57 2011 -0700
+++ b/hotspot/src/share/vm/opto/compile.hpp	Thu Aug 11 12:08:11 2011 -0700
@@ -785,11 +785,17 @@
   // Process an OopMap Element while emitting nodes
   void Process_OopMap_Node(MachNode *mach, int code_offset);
 
+  // Initialize code buffer
+  CodeBuffer* init_buffer(uint* blk_starts);
+
   // Write out basic block data to code buffer
-  void Fill_buffer();
+  void fill_buffer(CodeBuffer* cb, uint* blk_starts);
 
   // Determine which variable sized branches can be shortened
-  void Shorten_branches(Label *labels, int& code_size, int& reloc_size, int& stub_size);
+  void shorten_branches(uint* blk_starts, int& code_size, int& reloc_size, int& stub_size);
+
+  // Inserts nops where needed and final shorten branches.
+  void finalize_offsets_and_shorten(uint* blk_starts);
 
   // Compute the size of first NumberOfLoopInstrToAlign instructions
   // at the head of a loop.