From 3e6a3becd5099bc922d166b1147995a03b3aeca8 Mon Sep 17 00:00:00 2001
From: Akira Hatanaka <ahatanaka@mips.com>
Date: Tue, 8 Oct 2013 18:13:24 +0000
Subject: [PATCH] [mips] Simplify and optimize code.
No intended functionality change.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192213 91177308-0d34-0410-b5e6-96231b3b80d8
---
lib/Target/Mips/MipsLongBranch.cpp | 2 +-
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 06bb14a383c..ea8cc802835 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 f3f6f2874ac..dedf802f80a 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);
}