diff options
| -rw-r--r-- | lib/CodeGen/RegAllocLinearScan.cpp | 10 | ||||
| -rw-r--r-- | lib/Transforms/Scalar/SimplifyHalfPowrLibCalls.cpp | 3 |
2 files changed, 5 insertions, 8 deletions
diff --git a/lib/CodeGen/RegAllocLinearScan.cpp b/lib/CodeGen/RegAllocLinearScan.cpp index b18f62be00..bbff424710 100644 --- a/lib/CodeGen/RegAllocLinearScan.cpp +++ b/lib/CodeGen/RegAllocLinearScan.cpp @@ -933,13 +933,9 @@ LiveInterval *RALinScan::hasNextReloadInterval(LiveInterval *cur) { } void RALinScan::DowngradeRegister(LiveInterval *li, unsigned Reg) { - bool isNew = DowngradedRegs.insert(Reg); - (void)isNew; // Silence compiler warning. - assert(isNew && "Multiple reloads holding the same register?"); - DowngradeMap.insert(std::make_pair(li->reg, Reg)); - for (const unsigned *AS = tri_->getAliasSet(Reg); *AS; ++AS) { - isNew = DowngradedRegs.insert(*AS); - isNew = isNew; // Silence compiler warning. + for (const unsigned *AS = tri_->getOverlaps(Reg); *AS; ++AS) { + bool isNew = DowngradedRegs.insert(*AS); + (void)isNew; // Silence compiler warning. assert(isNew && "Multiple reloads holding the same register?"); DowngradeMap.insert(std::make_pair(li->reg, *AS)); } diff --git a/lib/Transforms/Scalar/SimplifyHalfPowrLibCalls.cpp b/lib/Transforms/Scalar/SimplifyHalfPowrLibCalls.cpp index 87c9d63d58..70ff32e023 100644 --- a/lib/Transforms/Scalar/SimplifyHalfPowrLibCalls.cpp +++ b/lib/Transforms/Scalar/SimplifyHalfPowrLibCalls.cpp @@ -97,7 +97,8 @@ InlineHalfPowrs(const std::vector<Instruction *> &HalfPowrs, InlineFunctionInfo IFI(0, TD); bool B = InlineFunction(Call, IFI); - assert(B && "half_powr didn't inline?"); B=B; + assert(B && "half_powr didn't inline?"); + (void)B; BasicBlock *NewBody = NewBlock->getSinglePredecessor(); assert(NewBody); |