From b8029e6bed42641c94eab8734149f6d8de0d5c6c Mon Sep 17 00:00:00 2001
From: Peizhao Ou <peizhaoo@uci.edu>
Date: Tue, 3 Apr 2018 16:04:13 -0700
Subject: [PATCH] Needs to treat RET as a branch when we add dmb fences

---
 lib/Target/AArch64/AArch64LoadStoreOptimizer.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/Target/AArch64/AArch64LoadStoreOptimizer.cpp b/lib/Target/AArch64/AArch64LoadStoreOptimizer.cpp
index b783b15d988..cae2105bcf6 100644
--- a/lib/Target/AArch64/AArch64LoadStoreOptimizer.cpp
+++ b/lib/Target/AArch64/AArch64LoadStoreOptimizer.cpp
@@ -1600,8 +1600,6 @@ static bool isLoad(MachineInstr* MI) {
 static bool isBranch(MachineInstr* MI) {
   switch (MI->getOpcode()) {
     default: { return false; }
-    case AArch64::B:
-    case AArch64::BR:
     case AArch64::Bcc:
     case AArch64::CBZW:
     case AArch64::CBZX:
@@ -1611,11 +1609,11 @@ static bool isBranch(MachineInstr* MI) {
     case AArch64::TBZX:
     case AArch64::TBNZW:
     case AArch64::TBNZX:
-    case AArch64::BLR:
+    case AArch64::B:
+    case AArch64::BR:
     case AArch64::BL:
-//    case AArch64::BX:
-//    case AArch64::BLX:
-    {
+    case AArch64::BLR:
+    case AArch64::RET: {
       return true;
     }
   }
-- 
2.34.1