diff options
| -rw-r--r-- | lib/Target/Mips/MipsLongBranch.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/Mips/MipsMachineFunction.cpp | 16 |
2 files changed, 7 insertions, 11 deletions
diff --git a/lib/Target/Mips/MipsLongBranch.cpp b/lib/Target/Mips/MipsLongBranch.cpp index 06bb14a383..ea8cc80283 100644 --- a/lib/Target/Mips/MipsLongBranch.cpp +++ b/lib/Target/Mips/MipsLongBranch.cpp @@ -241,7 +241,7 @@ void MipsLongBranch::replaceBranch(MachineBasicBlock &MBB, Iter Br, // and erase the original branch. assert(Br->isBundledWithSucc()); MachineBasicBlock::instr_iterator II(Br); - MIBundleBuilder(&*MIB).append(llvm::next(II)->removeFromBundle()); + MIBundleBuilder(&*MIB).append((++II)->removeFromBundle()); Br->eraseFromParent(); } diff --git a/lib/Target/Mips/MipsMachineFunction.cpp b/lib/Target/Mips/MipsMachineFunction.cpp index f3f6f2874a..dedf802f80 100644 --- a/lib/Target/Mips/MipsMachineFunction.cpp +++ b/lib/Target/Mips/MipsMachineFunction.cpp @@ -121,24 +121,20 @@ bool MipsFunctionInfo::isEhDataRegFI(int FI) const { } MachinePointerInfo MipsFunctionInfo::callPtrInfo(const StringRef &Name) { - StringMap<const MipsCallEntry *>::const_iterator I; - I = ExternalCallEntries.find(Name); + const MipsCallEntry *&E = ExternalCallEntries[Name]; - if (I != ExternalCallEntries.end()) - return MachinePointerInfo(I->getValue()); + if (!E) + E = new MipsCallEntry(Name); - const MipsCallEntry *E = ExternalCallEntries[Name] = new MipsCallEntry(Name); return MachinePointerInfo(E); } MachinePointerInfo MipsFunctionInfo::callPtrInfo(const GlobalValue *Val) { - ValueMap<const GlobalValue *, const MipsCallEntry *>::const_iterator I; - I = GlobalCallEntries.find(Val); + const MipsCallEntry *&E = GlobalCallEntries[Val]; - if (I != GlobalCallEntries.end()) - return MachinePointerInfo(I->second); + if (!E) + E = new MipsCallEntry(Val); - const MipsCallEntry *E = GlobalCallEntries[Val] = new MipsCallEntry(Val); return MachinePointerInfo(E); } |