# HG changeset patch
# User shade
# Date 1462545849 0
# Node ID e15886fd3b9643c9899fe7450c1d40854fd647ab
# Parent  1c70cff7c20684dd75b4a2a6c201ebfee9bc93db# Parent  6ec4e44eda220e7f3e400dca757760752980c916
Merge

diff -r 1c70cff7c206 -r e15886fd3b96 hotspot/src/share/vm/opto/library_call.cpp
--- a/hotspot/src/share/vm/opto/library_call.cpp	Fri May 06 09:10:47 2016 +0200
+++ b/hotspot/src/share/vm/opto/library_call.cpp	Fri May 06 14:44:09 2016 +0000
@@ -2472,9 +2472,10 @@
   bool requires_atomic_access = false;
   switch (kind) {
       case Relaxed:
-      case Opaque:
           requires_atomic_access = AlwaysAtomicAccesses;
           break;
+      case Opaque:
+          // Opaque accesses are atomic.
       case Acquire:
       case Release:
       case Volatile: