infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-17 05:45:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

8252215: Remove VerifyOptoOopOffsets flag

Browse Source 
Reviewed-by: thartmann, kvn
This commit is contained in:
Aleksey Shipilev 2020-08-27 06:34:27 +02:00
parent 0483ff56a0
commit 124db3be8e
3 changed files with 6 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
View File

@ -1146,16 +1146,6 @@ bool ShenandoahBarrierSetC2::final_graph_reshaping(Compile* compile, Node* n, ui
case Op_ShenandoahWeakCompareAndSwapP:
case Op_ShenandoahCompareAndExchangeP:
case Op_ShenandoahCompareAndExchangeN:
#ifdef ASSERT
if( VerifyOptoOopOffsets ) {
MemNode* mem = n->as_Mem();
// Check to see if address types have grounded out somehow.
const TypeInstPtr *tp = mem->in(MemNode::Address)->bottom_type()->isa_instptr();
ciInstanceKlass *k = tp->klass()->as_instance_klass();
bool oop_offset_is_sane = k->contains_field_offset(tp->offset());
assert( !tp || oop_offset_is_sane, "" );
}
#endif
return true;
case Op_ShenandoahLoadReferenceBarrier:
assert(false, "should have been expanded already");

3
src/hotspot/share/opto/c2_globals.hpp
View File

@ -112,9 +112,6 @@
notproduct(bool, PrintIdealNodeCount, false, \
"Print liveness counts of ideal nodes") \
\
notproduct(bool, VerifyOptoOopOffsets, false, \
"Check types of base addresses in field references") \
\
develop(bool, IdealizedNumerics, false, \
"Check performance difference allowing FP " \
"associativity and commutativity...") \

36
src/hotspot/share/opto/compile.cpp
View File

@ -2719,15 +2719,6 @@ struct Final_Reshape_Counts : public StackObj {
int get_inner_loop_count() const { return _inner_loop_count; }
};
#ifdef ASSERT
static bool oop_offset_is_sane(const TypeInstPtr* tp) {
ciInstanceKlass *k = tp->klass()->as_instance_klass();
// Make sure the offset goes inside the instance layout.
return k->contains_field_offset(tp->offset());
// Note that OffsetBot and OffsetTop are very negative.
}
#endif
// Eliminate trivially redundant StoreCMs and accumulate their
// precedence edges.
void Compile::eliminate_redundant_card_marks(Node* n) {
@ -2850,6 +2841,8 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
case Op_ConF:
case Op_CmpF:
case Op_CmpF3:
case Op_StoreF:
case Op_LoadF:
// case Op_ConvL2F: // longs are split into 32-bit halves
frc.inc_float_count();
break;
@ -2874,6 +2867,9 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
case Op_ConD:
case Op_CmpD:
case Op_CmpD3:
case Op_StoreD:
case Op_LoadD:
case Op_LoadD_unaligned:
frc.inc_double_count();
break;
case Op_Opaque1: // Remove Opaque Nodes before matching
@ -2915,16 +2911,6 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
break;
}
case Op_StoreD:
case Op_LoadD:
case Op_LoadD_unaligned:
frc.inc_double_count();
goto handle_mem;
case Op_StoreF:
case Op_LoadF:
frc.inc_float_count();
goto handle_mem;
case Op_StoreCM:
{
// Convert OopStore dependence into precedence edge
@ -2986,18 +2972,8 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
case Op_LoadP:
case Op_LoadN:
case Op_LoadRange:
case Op_LoadS: {
handle_mem:
#ifdef ASSERT
if( VerifyOptoOopOffsets ) {
MemNode* mem = n->as_Mem();
// Check to see if address types have grounded out somehow.
const TypeInstPtr *tp = mem->in(MemNode::Address)->bottom_type()->isa_instptr();
assert( !tp || oop_offset_is_sane(tp), "" );
}
#endif
case Op_LoadS:
break;
}
case Op_AddP: { // Assert sane base pointers
Node *addp = n->in(AddPNode::Address);