RFR [11]: Revert SBSA::resolve change

Aleksey Shipilev shade at redhat.com
Wed Sep 12 07:27:23 UTC 2018


sh/jdk11 build fails in aarch64:

jdk11/build/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp:433:33:
error: ‘ACCESS_WRITE’ was not declared in this scope
   bool is_write = (decorators & ACCESS_WRITE) != 0;

And that is because I backported one fix too many:
   http://hg.openjdk.java.net/shenandoah/jdk11/rev/e9f2ac39a5e3

This reverts it:

diff -r 7f19158276ab src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
--- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp	Mon Sep 10
17:56:38 2018 +0200
+++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp	Wed Sep 12
09:25:47 2018 +0200
@@ -430,23 +430,2 @@

-void ShenandoahBarrierSetAssembler::resolve(MacroAssembler* masm, DecoratorSet decorators, Register
obj) {
-  bool oop_not_null = (decorators & IS_NOT_NULL) != 0;
-  bool is_write = (decorators & ACCESS_WRITE) != 0;
-  if (is_write) {
-    if (oop_not_null) {
-      write_barrier(masm, obj);
-    } else {
-      Label done;
-      __ cbz(obj, done);
-      write_barrier(masm, obj);
-      __ bind(done);
-    }
-  } else {
-    if (oop_not_null) {
-      read_barrier_not_null(masm, obj);
-    } else {
-      read_barrier(masm, obj);
-    }
-  }
-}
-
 void ShenandoahBarrierSetAssembler::cmpxchg_oop(MacroAssembler* masm, Register addr, Register
expected, Register new_val,
diff -r 7f19158276ab src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp
--- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp	Mon Sep 10
17:56:38 2018 +0200
+++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp	Wed Sep 12
09:25:47 2018 +0200
@@ -86,3 +86,2 @@
   virtual void obj_equals(MacroAssembler* masm, Register src1, Register src2);
-  virtual void resolve(MacroAssembler* masm, DecoratorSet decorators, Register obj);
   virtual void tlab_allocate(MacroAssembler* masm, Register obj,


Thanks,
-Aleksey



More information about the shenandoah-dev mailing list