RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-25 12:12:47 +01:00
Code Issues Projects Releases Wiki Activity

Factor out buildMemorySSA from getWalker.

Browse Source 
NFC.

llvm-svn: 273901
This commit is contained in:
Daniel Berlin 2016-06-27 18:22:27 +00:00
parent 9b5db5de16
commit d6cd866f6a
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/Transforms/Utils/MemorySSA.h
View File

@ -594,7 +594,7 @@ protected:
private:
class CachingWalker;
void buildMemorySSA();
void verifyUseInDefs(MemoryAccess *, MemoryAccess *) const;
using AccessMap = DenseMap<const BasicBlock *, std::unique_ptr<AccessList>>;

19
lib/Transforms/Utils/MemorySSA.cpp
View File

@ -10,6 +10,7 @@
// This file implements the MemorySSA class.
//
//===----------------------------------------------------------------===//
#include "llvm/Transforms/Utils/MemorySSA.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/DenseSet.h"
#include "llvm/ADT/DepthFirstIterator.h"
@ -38,7 +39,6 @@
#include "llvm/Support/Debug.h"
#include "llvm/Support/FormattedStream.h"
#include "llvm/Transforms/Scalar.h"
#include "llvm/Transforms/Utils/MemorySSA.h"
#include <algorithm>
#define DEBUG_TYPE "memoryssa"
@ -272,7 +272,7 @@ void MemorySSA::markUnreachableAsLiveOnEntry(BasicBlock *BB) {
MemorySSA::MemorySSA(Function &Func, AliasAnalysis *AA, DominatorTree *DT)
: AA(AA), DT(DT), F(Func), LiveOnEntryDef(nullptr), Walker(nullptr),
NextID(0) {
getWalker(); // Ensure MemorySSA has been built.
buildMemorySSA();
}
MemorySSA::MemorySSA(MemorySSA &&MSSA)
@ -301,12 +301,7 @@ MemorySSA::AccessList *MemorySSA::getOrCreateAccessList(const BasicBlock *BB) {
return Res.first->second.get();
}
MemorySSAWalker *MemorySSA::getWalker() {
if (Walker)
return Walker.get();
Walker = make_unique<CachingWalker>(this, AA, DT);
void MemorySSA::buildMemorySSA() {
// We create an access to represent "live on entry", for things like
// arguments or users of globals, where the memory they use is defined before
// the beginning of the function. We do not actually insert it into the IR.
@ -398,6 +393,8 @@ MemorySSAWalker *MemorySSA::getWalker() {
SmallPtrSet<BasicBlock *, 16> Visited;
renamePass(DT->getRootNode(), LiveOnEntryDef.get(), Visited);
MemorySSAWalker *Walker = getWalker();
// Now optimize the MemoryUse's defining access to point to the nearest
// dominating clobbering def.
// This ensures that MemoryUse's that are killed by the same store are
@ -421,7 +418,13 @@ MemorySSAWalker *MemorySSA::getWalker() {
for (auto &BB : F)
if (!Visited.count(&BB))
markUnreachableAsLiveOnEntry(&BB);
}
MemorySSAWalker *MemorySSA::getWalker() {
if (Walker)
return Walker.get();
Walker = make_unique<CachingWalker>(this, AA, DT);
return Walker.get();
}