commit 7a145c6805ba8c81680294e87e801bdef56c9954
author Andrew Dinn <adinn@openjdk.org> Mon Mar 05 13:18:55 2018 +0000
committer Andrew Dinn <adinn@openjdk.org> Mon Mar 05 13:18:55 2018 +0000
tree 449b2efd38a335c0e9f0b9eb4a552c6ef41081a0
parent 843a9abbce0698223cfcbd6d0dd0ff874486effe

8198950: AArch64: org.openjdk.jcstress.tests.varhandles.DekkerTest fails

Fix breakage to AArch64 code generation caused by JDK-8181211

Reviewed-by: thartmann, roland, kvn, vlivanov, jrose

src/hotspot/share/opto/library_call.cpp

diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index f7bb934..c94d23c 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -2578,7 +2578,8 @@
       // the one that guards them: pin the Load node
       LoadNode::ControlDependency dep = LoadNode::Pinned;
       Node* ctrl = control();
-      if (adr_type->isa_instptr()) {
+      // non volatile loads may be able to float
+      if (!need_mem_bar && adr_type->isa_instptr()) {
         assert(adr_type->meet(TypePtr::NULL_PTR) != adr_type->remove_speculative(), "should be not null");
         intptr_t offset = Type::OffsetBot;
         AddPNode::Ideal_base_and_offset(adr, &_gvn, offset);