From: Xin Tong <trent.xin.tong@gmail.com>
Date: Sun, 19 Mar 2017 15:41:46 +0000 (+0000)
Subject: Correct a rebase mistake.
X-Git-Tag: android-x86-7.1-r4~18772
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=15605ca567a43d4546c4dc85d58fd69c501b4bd2;p=android-x86%2Fexternal-llvm.git

Correct a rebase mistake.

Left out AA in jumpthreading SimplifyPartiallyRedundantLoad

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@298219 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Transforms/Scalar/JumpThreading.cpp b/lib/Transforms/Scalar/JumpThreading.cpp
index a747d75ad3b..4b8b434fce9 100644
--- a/lib/Transforms/Scalar/JumpThreading.cpp
+++ b/lib/Transforms/Scalar/JumpThreading.cpp
@@ -1026,7 +1026,7 @@ bool JumpThreadingPass::SimplifyPartiallyRedundantLoad(LoadInst *LI) {
     Value *Ptr = LoadedPtr->DoPHITranslation(LoadBB, PredBB);
     PredAvailable = FindAvailablePtrLoadStore(
         Ptr, LI->getType(), LI->isAtomic(), PredBB, BBIt, DefMaxInstsToScan,
-        nullptr, &IsLoadCSE, &NumScanedInst);
+        AA, &IsLoadCSE, &NumScanedInst);
 
     // If PredBB has a single predecessor, continue scanning through the
     // single precessor.
@@ -1038,7 +1038,7 @@ bool JumpThreadingPass::SimplifyPartiallyRedundantLoad(LoadInst *LI) {
         BBIt = SinglePredBB->end();
         PredAvailable = FindAvailablePtrLoadStore(
             Ptr, LI->getType(), LI->isAtomic(), SinglePredBB, BBIt,
-            (DefMaxInstsToScan - NumScanedInst), nullptr, &IsLoadCSE,
+            (DefMaxInstsToScan - NumScanedInst), AA, &IsLoadCSE,
             &NumScanedInst);
       }
     }