From b42b762bca56b1649c6895023459702c8740c261 Mon Sep 17 00:00:00 2001 From: George Burgess IV Date: Fri, 11 Mar 2016 19:34:03 +0000 Subject: [MemorySSA] Make a return type reflect reality. NFC. llvm-svn: 263286 --- llvm/lib/Transforms/Utils/MemorySSA.cpp | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'llvm/lib/Transforms/Utils/MemorySSA.cpp') diff --git a/llvm/lib/Transforms/Utils/MemorySSA.cpp b/llvm/lib/Transforms/Utils/MemorySSA.cpp index f7dc7444d4a..f49d666d1a0 100644 --- a/llvm/lib/Transforms/Utils/MemorySSA.cpp +++ b/llvm/lib/Transforms/Utils/MemorySSA.cpp @@ -257,17 +257,17 @@ MemorySSAWalker *MemorySSA::buildMemorySSA(AliasAnalysis *AA, bool InsertIntoDef = false; AccessListType *Accesses = nullptr; for (Instruction &I : B) { - MemoryAccess *MA = createNewAccess(&I, true); - if (!MA) + MemoryUseOrDef *MUD = createNewAccess(&I, true); + if (!MUD) continue; - if (isa(MA)) + if (isa(MUD)) InsertIntoDef = true; - else if (isa(MA)) + else InsertIntoDefUse = true; if (!Accesses) Accesses = getOrCreateAccessList(&B); - Accesses->push_back(MA); + Accesses->push_back(MUD); } if (InsertIntoDef) DefiningBlocks.insert(&B); @@ -358,7 +358,8 @@ MemorySSAWalker *MemorySSA::buildMemorySSA(AliasAnalysis *AA, } /// \brief Helper function to create new memory accesses -MemoryAccess *MemorySSA::createNewAccess(Instruction *I, bool IgnoreNonMemory) { +MemoryUseOrDef *MemorySSA::createNewAccess(Instruction *I, + bool IgnoreNonMemory) { // Find out what affect this instruction has on memory. ModRefInfo ModRef = AA->getModRefInfo(I); bool Def = bool(ModRef & MRI_Mod); @@ -372,13 +373,13 @@ MemoryAccess *MemorySSA::createNewAccess(Instruction *I, bool IgnoreNonMemory) { assert((Def || Use) && "Trying to create a memory access with a non-memory instruction"); - MemoryUseOrDef *MA; + MemoryUseOrDef *MUD; if (Def) - MA = new MemoryDef(I->getContext(), nullptr, I, I->getParent(), NextID++); + MUD = new MemoryDef(I->getContext(), nullptr, I, I->getParent(), NextID++); else - MA = new MemoryUse(I->getContext(), nullptr, I, I->getParent()); - ValueToMemoryAccess.insert(std::make_pair(I, MA)); - return MA; + MUD = new MemoryUse(I->getContext(), nullptr, I, I->getParent()); + ValueToMemoryAccess.insert(std::make_pair(I, MUD)); + return MUD; } MemoryAccess *MemorySSA::findDominatingDef(BasicBlock *UseBlock, -- cgit v1.2.3