RFR: Bulk integration from jdk/jdk 2018-04-23

Aleksey Shipilev shade at redhat.com
Mon Apr 23 21:00:29 UTC 2018


On 04/23/2018 10:48 PM, Roman Kennke wrote:
> Looks like I've messed up the merge (again). I fixed it by hg stripping
> up to the merge changesets, fixing some whitespace stuff, hg commit
> --amend the changes right into the same changeset. I think it should be
> safe to push this.
> 
> Output of:
> hg diff -r 49794:50054 src/hotspot/share/gc/shenandoah
> src/hotspot/cpu/x86/gc/shenandoah
> 
> http://cr.openjdk.java.net/~rkennke/merge-2018-04-23/shenandoah-changes-02.patch

I see there are debugging leftovers, like:

+  // tty->print_cr("RB src.base: %s", src.base()->name());
+  // __ verify_oop(src.base(), "broken oop before RB");
+  /*
+  if (in_heap) {
+    read_barrier_not_null(masm, src.base());
+  }
+  */
+  // __ verify_oop(src.base(), "broken oop before RB");

Other than that, it looks good. We can clean up the debugging stuff after the merge.

-Aleksey



More information about the shenandoah-dev mailing list