--- a/hotspot/src/share/vm/opto/machnode.cpp	Thu Jul 21 08:38:25 2011 -0700
+++ b/hotspot/src/share/vm/opto/machnode.cpp	Thu Jul 21 11:25:07 2011 -0700
@@ -409,7 +409,7 @@
 
 //------------------------------label_set--------------------------------------
 // Set the Label for a LabelOper, if an operand for this instruction
-void MachNode::label_set( Label& label, uint block_num ) {
+void MachNode::label_set( Label* label, uint block_num ) {
   ShouldNotCallThis();
 }
 
@@ -514,6 +514,9 @@
 void MachNullCheckNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
   // only emits entries in the null-pointer exception handler table
 }
+void MachNullCheckNode::label_set(Label* label, uint block_num) {
+  // Nothing to emit
+}
 
 const RegMask &MachNullCheckNode::in_RegMask( uint idx ) const {
   if( idx == 0 ) return RegMask::Empty;