Subzero: Fix build errors with LLVM trunk. 1. Some explicit conversions between Inst* and InstList::iterator are needed. 2. llvm::sys::PrintStackTraceOnErrorSignal() has a new argument. 3. A previous CL neglected to plumb in SUBZERO_REVISION for the cmake build. BUG= none R=eholk@chromium.org Review URL: https://codereview.chromium.org/2247253005 .
diff --git a/src/IceCfg.cpp b/src/IceCfg.cpp index eace318..6e944ac 100644 --- a/src/IceCfg.cpp +++ b/src/IceCfg.cpp
@@ -828,7 +828,7 @@ auto Current = Node->getInsts().begin(); auto End = Node->getInsts().end(); while (Current != End) { - CfgUnorderedMap<Constant *, CfgVector<Inst *>> FloatUses; + CfgUnorderedMap<Constant *, CfgVector<InstList::iterator>> FloatUses; if (llvm::isa<InstCall>(iteratorToInst(Current))) { ++Current; assert(Current != End); @@ -868,7 +868,7 @@ InstAssign::create(Node->getCfg(), NewVar, ConstCache[Pair.first]); Insts.insert(Pair.second[0], Assign); - for (auto *InstUse : Pair.second) { + for (auto InstUse : Pair.second) { for (SizeT i = 0; i < InstUse->getSrcSize(); ++i) { if (auto *Const = llvm::dyn_cast<Constant>(InstUse->getSrc(i))) { if (Const == Pair.first) {