6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-26 21:32:10 +00:00
Code Issues Projects Releases Wiki Activity

[LCG] Simplify a bunch of the LCG code with range for loops and auto.

Browse Source 
Still more work to be done here to leverage C++11, but this clears out
the glaring issues.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@203395 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chandler Carruth 2014-03-09 12:20:34 +00:00
parent 05d8dc66df
commit c52fffeb17
1 changed files with 29 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
lib/Analysis/LazyCallGraph.cpp
View File

@ -51,10 +51,9 @@ LazyCallGraph::Node::Node(LazyCallGraph &G, Function &F) : G(G), F(F) {
SmallPtrSet<Constant *, 16> Visited; SmallPtrSet<Constant *, 16> Visited;
// Find all the potential callees in this function. First walk the // Find all the potential callees in this function. First walk the
// instructions and add every operand which is a constant to the worklist. // instructions and add every operand which is a constant to the worklist.
for (Function::iterator BBI = F.begin(), BBE = F.end(); BBI != BBE; ++BBI) for (BasicBlock &BB : F)
for (BasicBlock::iterator II = BBI->begin(), IE = BBI->end(); II != IE; for (Instruction &I : BB)
++II) for (Value *Op : I.operand_values())
for (Value *Op : II->operand_values())
if (Constant *C = dyn_cast<Constant>(Op)) if (Constant *C = dyn_cast<Constant>(Op))
if (Visited.insert(C)) if (Visited.insert(C))
Worklist.push_back(C); Worklist.push_back(C);
@ -70,13 +69,11 @@ LazyCallGraph::Node::Node(LazyCallGraph &G, const Node &OtherN)
// Loop over the other node's callees, adding the Function*s to our list // Loop over the other node's callees, adding the Function*s to our list
// directly, and recursing to add the Node*s. // directly, and recursing to add the Node*s.
Callees.reserve(OtherN.Callees.size()); Callees.reserve(OtherN.Callees.size());
for (NodeVectorImplT::iterator OI = OtherN.Callees.begin(), for (const auto &OtherCallee : OtherN.Callees)
OE = OtherN.Callees.end(); if (Function *Callee = OtherCallee.dyn_cast<Function *>())
OI != OE; ++OI)
if (Function *Callee = OI->dyn_cast<Function *>())
Callees.push_back(Callee); Callees.push_back(Callee);
else else
Callees.push_back(G.copyInto(*OI->get<Node *>())); Callees.push_back(G.copyInto(*OtherCallee.get<Node *>()));
} }
LazyCallGraph::Node::Node(LazyCallGraph &G, Node &&OtherN) LazyCallGraph::Node::Node(LazyCallGraph &G, Node &&OtherN)
@ -84,25 +81,24 @@ LazyCallGraph::Node::Node(LazyCallGraph &G, Node &&OtherN)
CalleeSet(std::move(OtherN.CalleeSet)) { CalleeSet(std::move(OtherN.CalleeSet)) {
// Loop over our Callees. They've been moved from another node, but we need // Loop over our Callees. They've been moved from another node, but we need
// to move the Node*s to live under our bump ptr allocator. // to move the Node*s to live under our bump ptr allocator.
for (NodeVectorImplT::iterator CI = Callees.begin(), CE = Callees.end(); for (auto &Callee : Callees)
CI != CE; ++CI) if (Node *ChildN = Callee.dyn_cast<Node *>())
if (Node *ChildN = CI->dyn_cast<Node *>()) Callee = G.moveInto(std::move(*ChildN));
*CI = G.moveInto(std::move(*ChildN));
} }
LazyCallGraph::LazyCallGraph(Module &M) : M(M) { LazyCallGraph::LazyCallGraph(Module &M) : M(M) {
for (Module::iterator FI = M.begin(), FE = M.end(); FI != FE; ++FI) for (Function &F : M)
if (!FI->isDeclaration() && !FI->hasLocalLinkage()) if (!F.isDeclaration() && !F.hasLocalLinkage())
if (EntryNodeSet.insert(&*FI)) if (EntryNodeSet.insert(&F))
EntryNodes.push_back(&*FI); EntryNodes.push_back(&F);
// Now add entry nodes for functions reachable via initializers to globals. // Now add entry nodes for functions reachable via initializers to globals.
SmallVector<Constant *, 16> Worklist; SmallVector<Constant *, 16> Worklist;
SmallPtrSet<Constant *, 16> Visited; SmallPtrSet<Constant *, 16> Visited;
for (Module::global_iterator GI = M.global_begin(), GE = M.global_end(); GI != GE; ++GI) for (GlobalVariable &GV : M.globals())
if (GI->hasInitializer()) if (GV.hasInitializer())
if (Visited.insert(GI->getInitializer())) if (Visited.insert(GV.getInitializer()))
Worklist.push_back(GI->getInitializer()); Worklist.push_back(GV.getInitializer());
findCallees(Worklist, Visited, EntryNodes, EntryNodeSet); findCallees(Worklist, Visited, EntryNodes, EntryNodeSet);
} }
@ -110,13 +106,11 @@ LazyCallGraph::LazyCallGraph(Module &M) : M(M) {
LazyCallGraph::LazyCallGraph(const LazyCallGraph &G) LazyCallGraph::LazyCallGraph(const LazyCallGraph &G)
: M(G.M), EntryNodeSet(G.EntryNodeSet) { : M(G.M), EntryNodeSet(G.EntryNodeSet) {
EntryNodes.reserve(G.EntryNodes.size()); EntryNodes.reserve(G.EntryNodes.size());
for (NodeVectorImplT::const_iterator EI = G.EntryNodes.begin(), for (const auto &EntryNode : G.EntryNodes)
EE = G.EntryNodes.end(); if (Function *Callee = EntryNode.dyn_cast<Function *>())
EI != EE; ++EI)
if (Function *Callee = EI->dyn_cast<Function *>())
EntryNodes.push_back(Callee); EntryNodes.push_back(Callee);
else else
EntryNodes.push_back(copyInto(*EI->get<Node *>())); EntryNodes.push_back(copyInto(*EntryNode.get<Node *>()));
} }
// FIXME: This would be crazy simpler if BumpPtrAllocator were movable without // FIXME: This would be crazy simpler if BumpPtrAllocator were movable without
@ -128,11 +122,9 @@ LazyCallGraph::LazyCallGraph(LazyCallGraph &&G)
// Loop over our EntryNodes. They've been moved from another graph, so we // Loop over our EntryNodes. They've been moved from another graph, so we
// need to move the Node*s to live under our bump ptr allocator. We can just // need to move the Node*s to live under our bump ptr allocator. We can just
// do this in-place. // do this in-place.
for (NodeVectorImplT::iterator EI = EntryNodes.begin(), for (auto &Entry : EntryNodes)
EE = EntryNodes.end(); if (Node *EntryN = Entry.dyn_cast<Node *>())
EI != EE; ++EI) Entry = moveInto(std::move(*EntryN));
if (Node *EntryN = EI->dyn_cast<Node *>())
*EI = moveInto(std::move(*EntryN));
} }
LazyCallGraph::Node *LazyCallGraph::insertInto(Function &F, Node *&MappedN) { LazyCallGraph::Node *LazyCallGraph::insertInto(Function &F, Node *&MappedN) {
@ -162,9 +154,9 @@ LazyCallGraphPrinterPass::LazyCallGraphPrinterPass(raw_ostream &OS) : OS(OS) {}
static void printNodes(raw_ostream &OS, LazyCallGraph::Node &N, static void printNodes(raw_ostream &OS, LazyCallGraph::Node &N,
SmallPtrSetImpl<LazyCallGraph::Node *> &Printed) { SmallPtrSetImpl<LazyCallGraph::Node *> &Printed) {
// Recurse depth first through the nodes. // Recurse depth first through the nodes.
for (LazyCallGraph::iterator I = N.begin(), E = N.end(); I != E; ++I) for (LazyCallGraph::Node *ChildN : N)
if (Printed.insert(*I)) if (Printed.insert(ChildN))
printNodes(OS, **I, Printed); printNodes(OS, *ChildN, Printed);
OS << " Call edges in function: " << N.getFunction().getName() << "\n"; OS << " Call edges in function: " << N.getFunction().getName() << "\n";
for (LazyCallGraph::iterator I = N.begin(), E = N.end(); I != E; ++I) for (LazyCallGraph::iterator I = N.begin(), E = N.end(); I != E; ++I)
@ -179,9 +171,9 @@ PreservedAnalyses LazyCallGraphPrinterPass::run(Module *M, ModuleAnalysisManager
OS << "Printing the call graph for module: " << M->getModuleIdentifier() << "\n\n"; OS << "Printing the call graph for module: " << M->getModuleIdentifier() << "\n\n";
SmallPtrSet<LazyCallGraph::Node *, 16> Printed; SmallPtrSet<LazyCallGraph::Node *, 16> Printed;
for (LazyCallGraph::iterator I = G.begin(), E = G.end(); I != E; ++I) for (LazyCallGraph::Node *N : G)
if (Printed.insert(*I)) if (Printed.insert(N))
printNodes(OS, **I, Printed); printNodes(OS, *N, Printed);
return PreservedAnalyses::all(); return PreservedAnalyses::all();
} }