--- old/src/share/vm/opto/machnode.cpp Mon Aug 15 17:13:59 2011 +++ new/src/share/vm/opto/machnode.cpp Mon Aug 15 17:13:59 2011 @@ -389,12 +389,6 @@ } -//------------------------------negate----------------------------------------- -// Negate conditional branches. Error for non-branch Nodes -void MachNode::negate() { - ShouldNotCallThis(); -} - //------------------------------peephole--------------------------------------- // Apply peephole rule(s) to this instruction MachNode *MachNode::peephole( Block *block, int block_index, PhaseRegAlloc *ra_, int &deleted, Compile* C ) { @@ -407,12 +401,6 @@ ShouldNotCallThis(); } -//------------------------------label_set-------------------------------------- -// Set the Label for a LabelOper, if an operand for this instruction -void MachNode::label_set( Label* label, uint block_num ) { - ShouldNotCallThis(); -} - //------------------------------method_set------------------------------------- // Set the absolute address of a method void MachNode::method_set( intptr_t addr ) { @@ -517,6 +505,9 @@ void MachNullCheckNode::label_set(Label* label, uint block_num) { // Nothing to emit } +void MachNullCheckNode::save_label( Label** label, uint* block_num ) { + // Nothing to emit +} const RegMask &MachNullCheckNode::in_RegMask( uint idx ) const { if( idx == 0 ) return RegMask::Empty;