[sh/jdk8u] RFR 8224573: Fix windows build after JDK-8221507

Zhengyu Gu zgu at redhat.com
Wed Nov 25 16:28:32 UTC 2020


Hi,

I would like to backport this patch to Sh/jdk8u as followup of 
JDK-8221507 backport, to fix build problem on Windows.

The original patch does not apply cleanly, due to 
ShenandoahHeapRegion::region_number() -> ShenandoahHeapRegion::index() 
renaming.

Original patch: http://hg.openjdk.java.net/jdk/jdk/rev/6b976a59ee87

Sh/jdk8u patch:

# HG changeset patch
# User clanger
# Date 1558510920 -3600
# Node ID 6b976a59ee8783bb2d37a7ae1309f56be8636c10
# Parent  a8be2165f87c1faf9e445f67f8b0a16d38844f56
[backport] 8224573: Fix windows build after JDK-8221507
Reviewed-by: shade, stuefe

diff -r a8be2165f87c 
src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp
--- a/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp 
        Tue May 21 10:36:23 2019 +0200
+++ b/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp 
        Wed Nov 25 11:20:30 2020 -0500
@@ -641,7 +641,7 @@
  void ShenandoahHeapRegion::set_state(RegionState to) {
    EventShenandoahHeapRegionStateChange evt;
    if (evt.should_commit()){
-    evt.set_index(index());
+    evt.set_index((unsigned)index());
      evt.set_start((uintptr_t)bottom());
      evt.set_used(used());
      evt.set_from(_state);
diff -r a8be2165f87c 
src/share/vm/gc_implementation/shenandoah/shenandoahJfrSupport.cpp
--- a/src/share/vm/gc_implementation/shenandoah/shenandoahJfrSupport.cpp 
        Tue May 21 10:36:23 2019 +0200
+++ b/src/share/vm/gc_implementation/shenandoah/shenandoahJfrSupport.cpp 
        Wed Nov 25 11:20:30 2020 -0500
@@ -57,7 +57,7 @@
  public:
    virtual void heap_region_do(ShenandoahHeapRegion* r) {
      EventShenandoahHeapRegionInformation evt;
-    evt.set_index(r->index());
+    evt.set_index((unsigned)r->index());
      evt.set_state((u8)r->state());
      evt.set_start((uintptr_t)r->bottom());
      evt.set_used(r->used());

Thanks,

-Zhengyu



More information about the shenandoah-dev mailing list