Minor simplification: eliminate a dyn_cast.
Fix a typo in a debug message.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@13607 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/SparcV9/SparcV9CodeEmitter.cpp b/lib/Target/SparcV9/SparcV9CodeEmitter.cpp
index fcdbb7c..6606d8d 100644
--- a/lib/Target/SparcV9/SparcV9CodeEmitter.cpp
+++ b/lib/Target/SparcV9/SparcV9CodeEmitter.cpp
@@ -596,14 +596,9 @@
DEBUG(std::cerr << "Saving reference to BB (VReg)\n");
unsigned* CurrPC = (unsigned*)(intptr_t)MCE.getCurrentPCValue();
BBRefs.push_back(std::make_pair(BB, std::make_pair(CurrPC, &MI)));
- } else if (const Constant *C = dyn_cast<Constant>(V)) {
- if (const ConstantInt *CI = dyn_cast<ConstantInt>(C)) {
- rv = CI->getRawValue() - MCE.getCurrentPCValue();
- } else {
- std::cerr << "Cannot have non-integral const in instruction: "
- << *C;
- abort();
- }
+ } else if (const ConstantInt *CI = dyn_cast<ConstantInt>(V)) {
+ // Make constant PC-relative by subtracting the PC from it.
+ rv = CI->getRawValue() - MCE.getCurrentPCValue();
} else if (GlobalValue *GV = dyn_cast<GlobalValue>(V)) {
// same as MO.isGlobalAddress()
DEBUG(std::cerr << "GlobalValue: ");
@@ -777,7 +772,7 @@
if (binCode == (1 << 30)) {
// this is an invalid call: the addr is out of bounds. that means a code
// sequence has already been emitted, and this is a no-op
- DEBUG(std::cerr << "Call supressed: already emitted far call.\n");
+ DEBUG(std::cerr << "Call suppressed: already emitted far call.\n");
} else {
emitWord(binCode);
}