From 9e658c974b0d2ad0a68be4bd32a15c2f28200b52 Mon Sep 17 00:00:00 2001
From: Matt Morehouse <mascasa@google.com>
Date: Fri, 1 Dec 2017 22:20:26 +0000
Subject: Revert "[X86] Improvement in CodeGen instruction selection for LEAs."

This reverts r319543, due to ASan bot breakage.

llvm-svn: 319591
---
 llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'llvm/lib/CodeGen')

diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index 28e89b1be5c..cb37137d547 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -27,7 +27,6 @@
 #include "llvm/Analysis/AliasAnalysis.h"
 #include "llvm/Analysis/BranchProbabilityInfo.h"
 #include "llvm/Analysis/CFG.h"
-#include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Analysis/OptimizationRemarkEmitter.h"
 #include "llvm/Analysis/TargetLibraryInfo.h"
 #include "llvm/CodeGen/FastISel.h"
@@ -326,8 +325,6 @@ void SelectionDAGISel::getAnalysisUsage(AnalysisUsage &AU) const {
   if (OptLevel != CodeGenOpt::None)
     AU.addRequired<AAResultsWrapperPass>();
   AU.addRequired<GCModuleInfo>();
-  if (OptLevel != CodeGenOpt::None)
-    AU.addRequired<LoopInfoWrapperPass>();
   AU.addRequired<StackProtector>();
   AU.addPreserved<StackProtector>();
   AU.addPreserved<GCModuleInfo>();
@@ -1418,7 +1415,6 @@ void SelectionDAGISel::SelectAllBasicBlocks(const Function &Fn) {
 
   // Iterate over all basic blocks in the function.
   for (const BasicBlock *LLVMBB : RPOT) {
-    CurDAG->IsDAGPartOfLoop = false;
     if (OptLevel != CodeGenOpt::None) {
       bool AllPredsVisited = true;
       for (const_pred_iterator PI = pred_begin(LLVMBB), PE = pred_end(LLVMBB);
@@ -1596,13 +1592,6 @@ void SelectionDAGISel::SelectAllBasicBlocks(const Function &Fn) {
                                    FunctionBasedInstrumentation);
     }
 
-    if (OptLevel != CodeGenOpt::None) {
-      auto &LIWP = getAnalysis<LoopInfoWrapperPass>();
-      LoopInfo &LI = LIWP.getLoopInfo();
-      if (LI.getLoopFor(LLVMBB))
-        CurDAG->IsDAGPartOfLoop = true;
-    }
-
     if (Begin != BI)
       ++NumDAGBlocks;
     else
-- 
cgit v1.2.3