[PM/AA] Extract the ModRef enums from the AliasAnalysis class in

[oota-llvm.git] / lib / Transforms / Scalar / MemCpyOptimizer.cpp

diff --git a/lib/Transforms/Scalar/MemCpyOptimizer.cpp b/lib/Transforms/Scalar/MemCpyOptimizer.cpp
index 32921716f23fe5e09e25af1ab47995fa6dcf11ae..46105dab1d85cc2476c67c2d3cb30c3ca2a62e84 100644 (file)
--- a/lib/Transforms/Scalar/MemCpyOptimizer.cpp
+++ b/lib/Transforms/Scalar/MemCpyOptimizer.cpp
@@ -506,7 +506,7 @@ bool MemCpyOpt::processStore(StoreInst *SI, BasicBlock::iterator &BBI) {
         MemoryLocation StoreLoc = MemoryLocation::get(SI);
         for (BasicBlock::iterator I = --BasicBlock::iterator(SI),
                                   E = C; I != E; --I) {
         MemoryLocation StoreLoc = MemoryLocation::get(SI);
         for (BasicBlock::iterator I = --BasicBlock::iterator(SI),
                                   E = C; I != E; --I) {

-          if (AA.getModRefInfo(&*I, StoreLoc) != AliasAnalysis::NoModRef) {
+          if (AA.getModRefInfo(&*I, StoreLoc) != MRI_NoModRef) {

             C = nullptr;
             break;
           }
             C = nullptr;
             break;
           }


@@ -704,11 +704,11 @@ bool MemCpyOpt::performCallSlotOptzn(Instruction *cpy,
   // the use analysis, we also need to know that it does not sneakily
   // access dest.  We rely on AA to figure this out for us.
   AliasAnalysis &AA = getAnalysis<AliasAnalysis>();
   // the use analysis, we also need to know that it does not sneakily
   // access dest.  We rely on AA to figure this out for us.
   AliasAnalysis &AA = getAnalysis<AliasAnalysis>();

-  AliasAnalysis::ModRefResult MR = AA.getModRefInfo(C, cpyDest, srcSize);
+  ModRefInfo MR = AA.getModRefInfo(C, cpyDest, srcSize);

   // If necessary, perform additional analysis.
   // If necessary, perform additional analysis.

-  if (MR != AliasAnalysis::NoModRef)
+  if (MR != MRI_NoModRef)

     MR = AA.callCapturesBefore(C, cpyDest, srcSize, &DT);
     MR = AA.callCapturesBefore(C, cpyDest, srcSize, &DT);

-  if (MR != AliasAnalysis::NoModRef)
+  if (MR != MRI_NoModRef)

     return false;
 
   // All the checks have passed, so do the transformation.
     return false;
 
   // All the checks have passed, so do the transformation.