changeset 33157:841ec4c08d57

Merge
author thartmann
date Thu, 08 Oct 2015 07:51:17 +0000
parents e17908b59e82 141ffb78d088
children 89b942323bd1
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/cpu/aarch64/vm/aarch64.ad	Thu Oct 08 08:54:57 2015 +0200
+++ b/hotspot/src/cpu/aarch64/vm/aarch64.ad	Thu Oct 08 07:51:17 2015 +0000
@@ -2556,7 +2556,7 @@
     if (ld == NULL) {
       // check for a child cpuorder membar
       MemBarNode *child  = child_membar(barrier->as_MemBar());
-      if (child && child->Opcode() != Op_MemBarCPUOrder)
+      if (child && child->Opcode() == Op_MemBarCPUOrder)
 	return true;
     }
   }