From d6e6da1b110df8af83a6e5ffe8f27fa8f0051c88 Mon Sep 17 00:00:00 2001
From: lana <none@none>
Date: Tue, 27 Feb 2018 20:48:06 +0000
Subject: [PATCH 1/2] Added tag jdk-10+45 for changeset 4f96cf952e71

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 5100fad9753..02670041c21 100644
--- a/.hgtags
+++ b/.hgtags
@@ -469,3 +469,4 @@ e569e83139fdfbecfeb3cd9014d560917787f158 jdk-10+38
 4b62b815b4f49970b91a952929cf50115c263cb3 jdk-10+42
 107413b070b92c88bde6230ceb4a19b579781068 jdk-10+43
 663f20fc51091bd7f95d18448850ba091207b7bd jdk-10+44
+4f96cf952e71cb8a127334494faf28880c26181b jdk-10+45

From 47c9547b8c081ba5c5e4c0f1a73ea1f836b2540e Mon Sep 17 00:00:00 2001
From: adinn <none@none>
Date: Mon, 5 Mar 2018 13:18:55 +0000
Subject: [PATCH 2/2] 8198950: AArch64:
 org.openjdk.jcstress.tests.varhandles.DekkerTest fails Summary: Fix breakage
 to AArch64 code generation caused by JDK-8181211 Reviewed-by: thartmann,
 roland, kvn, vlivanov, jrose

---
 src/hotspot/share/opto/library_call.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index f7bb9341adf..c94d23c0215 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -2578,7 +2578,8 @@ bool LibraryCallKit::inline_unsafe_access(bool is_store, const BasicType type, c
       // 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);