From 136295d845a066fa5c600b062c4507cb8a9506f3 Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Mon, 3 Dec 2018 10:51:03 +0100
Subject: [PATCH] 8214857: "bad trailing membar" assert failure at
 memnode.cpp:3220

Reviewed-by: adinn, thartmann
---
 src/hotspot/share/opto/memnode.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index 2e80495bac7..7d6684e3e82 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -3230,7 +3230,7 @@ MemBarNode* MemBarNode::leading_membar() const {
   while (leading != NULL && (!leading->is_MemBar() || !leading->as_MemBar()->leading())) {
     while (leading == NULL || leading->is_top() || seen.test_set(leading->_idx)) {
       leading = NULL;
-      while (regions.size() > 0) {
+      while (regions.size() > 0 && leading == NULL) {
         Node* r = regions.node();
         uint i = regions.index();
         if (i < r->req()) {