src/hotspot/share/gc/g1/heapRegion.cpp

rev 56449 : imported patch 8220310.mut.1
rev 56451 : imported patch 8220310.mut.3
rev 56452 : [mq]: 8220310.mut.4
rev 56462 : imported patch 8220312.stat.3

*** 460,472 ****
    st->print("|TAMS " PTR_FORMAT ", " PTR_FORMAT "| %s ",
                 p2i(prev_top_at_mark_start()), p2i(next_top_at_mark_start()), rem_set()->get_state_str());
    if (UseNUMA) {
      G1NUMA* numa = G1NUMA::numa();
      if (node_index() < numa->num_active_nodes()) { 
!       st->print("|%02d", numa->numa_id(node_index()));
      } else {
!       st->print("|--");
      }
    }
    st->print_cr("");
  }
  
--- 460,472 ----
    st->print("|TAMS " PTR_FORMAT ", " PTR_FORMAT "| %s ",
                 p2i(prev_top_at_mark_start()), p2i(next_top_at_mark_start()), rem_set()->get_state_str());
    if (UseNUMA) {
      G1NUMA* numa = G1NUMA::numa();
      if (node_index() < numa->num_active_nodes()) { 
!       st->print("|%d", numa->numa_id(node_index()));
      } else {
!       st->print("|-");
      }
    }
    st->print_cr("");
  }