1 files changed, 21 insertions, 24 deletions
diff --git a/llvm/lib/Transforms/Scalar/GVNHoist.cpp b/llvm/lib/Transforms/Scalar/GVNHoist.cpp
index 29de792bd24..845e27c5383 100644
--- a/llvm/lib/Transforms/Scalar/GVNHoist.cpp
+++ b/llvm/lib/Transforms/Scalar/GVNHoist.cpp
@@ -387,6 +387,25 @@ private:
     return false;
   }
 
+  bool hasEHhelper(const BasicBlock *BB, const BasicBlock *SrcBB,
+                   int &NBBsOnAllPaths) {
+    // Stop walk once the limit is reached.
+    if (NBBsOnAllPaths == 0)
+      return true;
+
+    // Impossible to hoist with exceptions on the path.
+    if (hasEH(BB))
+      return true;
+
+    // No such instruction after HoistBarrier in a basic block was
+    // selected for hoisting so instructions selected within basic block with
+    // a hoist barrier can be hoisted.
+    if ((BB != SrcBB) && HoistBarrier.count(BB))
+      return true;
+
+    return false;
+  }
+
   // Return true when there are exception handling or loads of memory Def
   // between Def and NewPt.  This function is only called for stores: Def is
   // the MemoryDef of the store to be hoisted.
@@ -414,18 +433,7 @@ private:
         continue;
       }
 
-      // Stop walk once the limit is reached.
-      if (NBBsOnAllPaths == 0)
-        return true;
-
-      // Impossible to hoist with exceptions on the path.
-      if (hasEH(BB))
-        return true;
-
-      // No such instruction after HoistBarrier in a basic block was
-      // selected for hoisting so instructions selected within basic block with
-      // a hoist barrier can be hoisted.
-      if ((BB != OldBB) && HoistBarrier.count(BB))
+      if (hasEHhelper(BB, OldBB, NBBsOnAllPaths))
         return true;
 
       // Check that we do not move a store past loads.
@@ -463,18 +471,7 @@ private:
         continue;
       }
 
-      // Stop walk once the limit is reached.
-      if (NBBsOnAllPaths == 0)
-        return true;
-
-      // Impossible to hoist with exceptions on the path.
-      if (hasEH(BB))
-        return true;
-
-      // No such instruction after HoistBarrier in a basic block was
-      // selected for hoisting so instructions selected within basic block with
-      // a hoist barrier can be hoisted.
-      if ((BB != SrcBB) && HoistBarrier.count(BB))
+      if (hasEHhelper(BB, SrcBB, NBBsOnAllPaths))
         return true;
 
       // -1 is unlimited number of blocks on all paths.