[llvm] r216991 - [CFLAA] No initializer lists for MSVC
Hal Finkel
hfinkel at anl.gov
Tue Sep 2 15:52:30 PDT 2014
Author: hfinkel
Date: Tue Sep 2 17:52:30 2014
New Revision: 216991
URL: http://llvm.org/viewvc/llvm-project?rev=216991&view=rev
Log:
[CFLAA] No initializer lists for MSVC
MSVC 2012 does not understand initializer lists; remove them.
Modified:
llvm/trunk/lib/Analysis/CFLAliasAnalysis.cpp
llvm/trunk/lib/Analysis/StratifiedSets.h
Modified: llvm/trunk/lib/Analysis/CFLAliasAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/CFLAliasAnalysis.cpp?rev=216991&r1=216990&r2=216991&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/CFLAliasAnalysis.cpp (original)
+++ llvm/trunk/lib/Analysis/CFLAliasAnalysis.cpp Tue Sep 2 17:52:30 2014
@@ -250,49 +250,50 @@ public:
}
void visitCastInst(CastInst &Inst) {
- Output.push_back({&Inst, Inst.getOperand(0), EdgeType::Assign, AttrNone});
+ Output.push_back(Edge(&Inst, Inst.getOperand(0), EdgeType::Assign,
+ AttrNone));
}
void visitBinaryOperator(BinaryOperator &Inst) {
auto *Op1 = Inst.getOperand(0);
auto *Op2 = Inst.getOperand(1);
- Output.push_back({&Inst, Op1, EdgeType::Assign, AttrNone});
- Output.push_back({&Inst, Op2, EdgeType::Assign, AttrNone});
+ Output.push_back(Edge(&Inst, Op1, EdgeType::Assign, AttrNone));
+ Output.push_back(Edge(&Inst, Op2, EdgeType::Assign, AttrNone));
}
void visitAtomicCmpXchgInst(AtomicCmpXchgInst &Inst) {
auto *Ptr = Inst.getPointerOperand();
auto *Val = Inst.getNewValOperand();
- Output.push_back({Ptr, Val, EdgeType::Dereference, AttrNone});
+ Output.push_back(Edge(Ptr, Val, EdgeType::Dereference, AttrNone));
}
void visitAtomicRMWInst(AtomicRMWInst &Inst) {
auto *Ptr = Inst.getPointerOperand();
auto *Val = Inst.getValOperand();
- Output.push_back({Ptr, Val, EdgeType::Dereference, AttrNone});
+ Output.push_back(Edge(Ptr, Val, EdgeType::Dereference, AttrNone));
}
void visitPHINode(PHINode &Inst) {
for (unsigned I = 0, E = Inst.getNumIncomingValues(); I != E; ++I) {
Value *Val = Inst.getIncomingValue(I);
- Output.push_back({&Inst, Val, EdgeType::Assign, AttrNone});
+ Output.push_back(Edge(&Inst, Val, EdgeType::Assign, AttrNone));
}
}
void visitGetElementPtrInst(GetElementPtrInst &Inst) {
auto *Op = Inst.getPointerOperand();
- Output.push_back({&Inst, Op, EdgeType::Assign, AttrNone});
+ Output.push_back(Edge(&Inst, Op, EdgeType::Assign, AttrNone));
for (auto I = Inst.idx_begin(), E = Inst.idx_end(); I != E; ++I)
- Output.push_back({&Inst, *I, EdgeType::Assign, AttrNone});
+ Output.push_back(Edge(&Inst, *I, EdgeType::Assign, AttrNone));
}
void visitSelectInst(SelectInst &Inst) {
auto *Condition = Inst.getCondition();
- Output.push_back({&Inst, Condition, EdgeType::Assign, AttrNone});
+ Output.push_back(Edge(&Inst, Condition, EdgeType::Assign, AttrNone));
auto *TrueVal = Inst.getTrueValue();
- Output.push_back({&Inst, TrueVal, EdgeType::Assign, AttrNone});
+ Output.push_back(Edge(&Inst, TrueVal, EdgeType::Assign, AttrNone));
auto *FalseVal = Inst.getFalseValue();
- Output.push_back({&Inst, FalseVal, EdgeType::Assign, AttrNone});
+ Output.push_back(Edge(&Inst, FalseVal, EdgeType::Assign, AttrNone));
}
void visitAllocaInst(AllocaInst &) {}
@@ -300,13 +301,13 @@ public:
void visitLoadInst(LoadInst &Inst) {
auto *Ptr = Inst.getPointerOperand();
auto *Val = &Inst;
- Output.push_back({Val, Ptr, EdgeType::Reference, AttrNone});
+ Output.push_back(Edge(Val, Ptr, EdgeType::Reference, AttrNone));
}
void visitStoreInst(StoreInst &Inst) {
auto *Ptr = Inst.getPointerOperand();
auto *Val = Inst.getValueOperand();
- Output.push_back({Ptr, Val, EdgeType::Dereference, AttrNone});
+ Output.push_back(Edge(Ptr, Val, EdgeType::Dereference, AttrNone));
}
static bool isFunctionExternal(Function *Fn) {
@@ -427,7 +428,7 @@ public:
continue;
auto NewAttrs = SubAttrs | MainAttrs;
- Output.push_back({MainVal, SubVal, EdgeType::Assign, NewAttrs});
+ Output.push_back(Edge(MainVal, SubVal, EdgeType::Assign, NewAttrs));
}
}
}
@@ -444,7 +445,7 @@ public:
}
for (Value *V : Inst.arg_operands())
- Output.push_back({&Inst, V, EdgeType::Assign, AttrAll});
+ Output.push_back(Edge(&Inst, V, EdgeType::Assign, AttrAll));
}
void visitCallInst(CallInst &Inst) { visitCallLikeInst(Inst); }
@@ -459,40 +460,40 @@ public:
void visitExtractElementInst(ExtractElementInst &Inst) {
auto *Ptr = Inst.getVectorOperand();
auto *Val = &Inst;
- Output.push_back({Val, Ptr, EdgeType::Reference, AttrNone});
+ Output.push_back(Edge(Val, Ptr, EdgeType::Reference, AttrNone));
}
void visitInsertElementInst(InsertElementInst &Inst) {
auto *Vec = Inst.getOperand(0);
auto *Val = Inst.getOperand(1);
- Output.push_back({&Inst, Vec, EdgeType::Assign, AttrNone});
- Output.push_back({&Inst, Val, EdgeType::Dereference, AttrNone});
+ Output.push_back(Edge(&Inst, Vec, EdgeType::Assign, AttrNone));
+ Output.push_back(Edge(&Inst, Val, EdgeType::Dereference, AttrNone));
}
void visitLandingPadInst(LandingPadInst &Inst) {
// Exceptions come from "nowhere", from our analysis' perspective.
// So we place the instruction its own group, noting that said group may
// alias externals
- Output.push_back({&Inst, &Inst, EdgeType::Assign, AttrAll});
+ Output.push_back(Edge(&Inst, &Inst, EdgeType::Assign, AttrAll));
}
void visitInsertValueInst(InsertValueInst &Inst) {
auto *Agg = Inst.getOperand(0);
auto *Val = Inst.getOperand(1);
- Output.push_back({&Inst, Agg, EdgeType::Assign, AttrNone});
- Output.push_back({&Inst, Val, EdgeType::Dereference, AttrNone});
+ Output.push_back(Edge(&Inst, Agg, EdgeType::Assign, AttrNone));
+ Output.push_back(Edge(&Inst, Val, EdgeType::Dereference, AttrNone));
}
void visitExtractValueInst(ExtractValueInst &Inst) {
auto *Ptr = Inst.getAggregateOperand();
- Output.push_back({&Inst, Ptr, EdgeType::Reference, AttrNone});
+ Output.push_back(Edge(&Inst, Ptr, EdgeType::Reference, AttrNone));
}
void visitShuffleVectorInst(ShuffleVectorInst &Inst) {
auto *From1 = Inst.getOperand(0);
auto *From2 = Inst.getOperand(1);
- Output.push_back({&Inst, From1, EdgeType::Assign, AttrNone});
- Output.push_back({&Inst, From2, EdgeType::Assign, AttrNone});
+ Output.push_back(Edge(&Inst, From1, EdgeType::Assign, AttrNone));
+ Output.push_back(Edge(&Inst, From2, EdgeType::Assign, AttrNone));
}
};
@@ -849,7 +850,7 @@ static FunctionInfo buildSetsFrom(CFLAli
DenseMap<GraphT::Node, Value *> NodeValueMap;
NodeValueMap.resize(Map.size());
for (const auto &Pair : Map)
- NodeValueMap.insert({Pair.second, Pair.first});
+ NodeValueMap.insert(std::make_pair(Pair.second, Pair.first));
const auto findValueOrDie = [&NodeValueMap](GraphT::Node Node) {
auto ValIter = NodeValueMap.find(Node);
@@ -921,7 +922,7 @@ static FunctionInfo buildSetsFrom(CFLAli
}
void CFLAliasAnalysis::scan(Function *Fn) {
- auto InsertPair = Cache.insert({Fn, Optional<FunctionInfo>()});
+ auto InsertPair = Cache.insert(std::make_pair(Fn, Optional<FunctionInfo>()));
(void)InsertPair;
assert(InsertPair.second &&
"Trying to scan a function that has already been cached");
Modified: llvm/trunk/lib/Analysis/StratifiedSets.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/StratifiedSets.h?rev=216991&r1=216990&r2=216991&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/StratifiedSets.h (original)
+++ llvm/trunk/lib/Analysis/StratifiedSets.h Tue Sep 2 17:52:30 2014
@@ -21,6 +21,7 @@
#include <cmath>
#include <limits>
#include <type_traits>
+#include <utility>
#include <vector>
namespace llvm {
@@ -319,7 +320,7 @@ template <typename T> class StratifiedSe
}
StratifiedIndex Number = StratLinks.size();
- Remaps.insert({Link.Number, Number});
+ Remaps.insert(std::make_pair(Link.Number, Number));
StratLinks.push_back(Link.getLink());
}
@@ -494,7 +495,7 @@ private:
// necessary.
bool addAtMerging(const T &ToAdd, StratifiedIndex Index) {
StratifiedInfo Info = {Index};
- auto Pair = Values.insert({ToAdd, Info});
+ auto Pair = Values.insert(std::make_pair(ToAdd, Info));
if (Pair.second)
return true;
More information about the llvm-commits
mailing list