8266185: Shenandoah: Fix incorrect comment/assertion messages · openjdk/jdk@55cc0af (original) (raw)
`@@ -247,7 +247,7 @@ void ShenandoahBarrierSetC2::satb_write_barrier_pre(GraphKit* kit,
`
247
247
`// if (!marking)
`
248
248
` __ if_then(marking, BoolTest::ne, zero, unlikely); {
`
249
249
` BasicType index_bt = TypeX_X->basic_type();
`
250
``
`-
assert(sizeof(size_t) == type2aelembytes(index_bt), "Loading G1 SATBMarkQueue::_index with wrong size.");
`
``
250
`+
assert(sizeof(size_t) == type2aelembytes(index_bt), "Loading Shenandoah SATBMarkQueue::_index with wrong size.");
`
251
251
` Node* index = __ load(__ ctrl(), index_adr, TypeX_X, index_bt, Compile::AliasIdxRaw);
`
252
252
``
253
253
`if (do_load) {
`
`@@ -360,7 +360,7 @@ void ShenandoahBarrierSetC2::shenandoah_write_barrier_pre(GraphKit* kit,
`
360
360
`// Helper that guards and inserts a pre-barrier.
`
361
361
`void ShenandoahBarrierSetC2::insert_pre_barrier(GraphKit* kit, Node* base_oop, Node* offset,
`
362
362
` Node* pre_val, bool need_mem_bar) const {
`
363
``
`-
// We could be accessing the referent field of a reference object. If so, when G1
`
``
363
`+
// We could be accessing the referent field of a reference object. If so, when Shenandoah
`
364
364
`// is enabled, we need to log the value in the referent field in an SATB buffer.
`
365
365
`// This routine performs some compile time filters and generates suitable
`
366
366
`// runtime filters that guard the pre-barrier code.
`
`@@ -978,7 +978,7 @@ void ShenandoahBarrierSetC2::verify_gc_barriers(Compile* compile, CompilePhase p
`
978
978
`if (ShenandoahVerifyOptoBarriers && phase == BarrierSetC2::BeforeMacroExpand) {
`
979
979
`ShenandoahBarrierC2Support::verify(Compile::current()->root());
`
980
980
` } else if (phase == BarrierSetC2::BeforeCodeGen) {
`
981
``
`-
// Verify G1 pre-barriers
`
``
981
`+
// Verify Shenandoah pre-barriers
`
982
982
`const int marking_offset = in_bytes(ShenandoahThreadLocalData::satb_mark_queue_active_offset());
`
983
983
``
984
984
` Unique_Node_List visited;
`
`@@ -1174,7 +1174,7 @@ bool ShenandoahBarrierSetC2::escape_add_to_con_graph(ConnectionGraph* conn_graph
`
1174
1174
`case Op_StoreP: {
`
1175
1175
` Node* adr = n->in(MemNode::Address);
`
1176
1176
`const Type* adr_type = gvn->type(adr);
`
1177
``
`-
// Pointer stores in G1 barriers looks like unsafe access.
`
``
1177
`+
// Pointer stores in Shenandoah barriers looks like unsafe access.
`
1178
1178
`// Ignore such stores to be able scalar replace non-escaping
`
1179
1179
`// allocations.
`
1180
1180
`if (adr_type->isa_rawptr() && adr->is_AddP()) {
`