8071805: BarrierSet::Other is not used and should be removed

Remove all occurences of BarrierSet::Other because the barrier set kind is never set to Other.

Reviewed-by: tschatzl, kbarrett
This commit is contained in:
Joseph Provino 2015-02-04 10:18:28 -05:00
parent 3e6220b1ab
commit 00d9c7a2d1
8 changed files with 1 additions and 12 deletions

View file

@ -143,7 +143,6 @@ static void do_oop_store(InterpreterMacroAssembler* _masm,
} }
break; break;
case BarrierSet::ModRef: case BarrierSet::ModRef:
case BarrierSet::Other:
ShouldNotReachHere(); ShouldNotReachHere();
break; break;
default: default:

View file

@ -115,7 +115,6 @@ static void do_oop_store(InterpreterMacroAssembler* _masm,
} }
break; break;
case BarrierSet::ModRef: case BarrierSet::ModRef:
case BarrierSet::Other:
ShouldNotReachHere(); ShouldNotReachHere();
break; break;
default : default :

View file

@ -185,7 +185,6 @@ static void do_oop_store(InterpreterMacroAssembler* _masm,
} }
break; break;
case BarrierSet::ModRef: case BarrierSet::ModRef:
case BarrierSet::Other:
if (val == noreg) { if (val == noreg) {
__ movptr(obj, NULL_WORD); __ movptr(obj, NULL_WORD);
} else { } else {

View file

@ -189,7 +189,6 @@ static void do_oop_store(InterpreterMacroAssembler* _masm,
} }
break; break;
case BarrierSet::ModRef: case BarrierSet::ModRef:
case BarrierSet::Other:
if (val == noreg) { if (val == noreg) {
__ store_heap_oop_null(obj); __ store_heap_oop_null(obj);
} else { } else {

View file

@ -1432,7 +1432,6 @@ void LIRGenerator::pre_barrier(LIR_Opr addr_opr, LIR_Opr pre_val,
// No pre barriers // No pre barriers
break; break;
case BarrierSet::ModRef: case BarrierSet::ModRef:
case BarrierSet::Other:
// No pre barriers // No pre barriers
break; break;
default : default :
@ -1454,7 +1453,6 @@ void LIRGenerator::post_barrier(LIR_OprDesc* addr, LIR_OprDesc* new_val) {
CardTableModRef_post_barrier(addr, new_val); CardTableModRef_post_barrier(addr, new_val);
break; break;
case BarrierSet::ModRef: case BarrierSet::ModRef:
case BarrierSet::Other:
// No post barriers // No post barriers
break; break;
default : default :

View file

@ -39,8 +39,7 @@ public:
CardTableModRef, CardTableModRef,
CardTableExtension, CardTableExtension,
G1SATBCT, G1SATBCT,
G1SATBCTLogging, G1SATBCTLogging
Other
}; };
enum Flags { enum Flags {

View file

@ -1528,7 +1528,6 @@ void GraphKit::pre_barrier(bool do_load,
case BarrierSet::ModRef: case BarrierSet::ModRef:
break; break;
case BarrierSet::Other:
default : default :
ShouldNotReachHere(); ShouldNotReachHere();
@ -1547,7 +1546,6 @@ bool GraphKit::can_move_pre_barrier() const {
case BarrierSet::ModRef: case BarrierSet::ModRef:
return true; // There is no pre-barrier return true; // There is no pre-barrier
case BarrierSet::Other:
default : default :
ShouldNotReachHere(); ShouldNotReachHere();
} }
@ -1578,7 +1576,6 @@ void GraphKit::post_barrier(Node* ctl,
case BarrierSet::ModRef: case BarrierSet::ModRef:
break; break;
case BarrierSet::Other:
default : default :
ShouldNotReachHere(); ShouldNotReachHere();

View file

@ -2213,7 +2213,6 @@ typedef TwoOopHashtable<Symbol*, mtClass> SymbolTwoOopHashtable;
declare_constant(BarrierSet::CardTableExtension) \ declare_constant(BarrierSet::CardTableExtension) \
declare_constant(BarrierSet::G1SATBCT) \ declare_constant(BarrierSet::G1SATBCT) \
declare_constant(BarrierSet::G1SATBCTLogging) \ declare_constant(BarrierSet::G1SATBCTLogging) \
declare_constant(BarrierSet::Other) \
\ \
declare_constant(BlockOffsetSharedArray::LogN) \ declare_constant(BlockOffsetSharedArray::LogN) \
declare_constant(BlockOffsetSharedArray::LogN_words) \ declare_constant(BlockOffsetSharedArray::LogN_words) \