Don't need to load a NULL pointer constant from memory!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1305 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp b/lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp
index cb3f9a1..7fe3e60 100644
--- a/lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp
+++ b/lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp
@@ -241,14 +241,22 @@
return MachineOperand::MO_SignExtendedImmed;
}
- if (!CPV->getType()->isIntegral()) return opType;
-
+ // Otherwise it needs to be an integer or a NULL pointer
+ if (! CPV->getType()->isIntegral() &&
+ ! (CPV->getType()->isPointerType() &&
+ CPV->isNullValue()))
+ return opType;
+
// Now get the constant value and check if it fits in the IMMED field.
// Take advantage of the fact that the max unsigned value will rarely
// fit into any IMMED field and ignore that case (i.e., cast smaller
// unsigned constants to signed).
//
int64_t intValue;
+ if (CPV->getType()->isPointerType())
+ {
+ intValue = 0;
+ }
if (CPV->getType()->isSigned())
{
intValue = ((ConstPoolSInt*)CPV)->getValue();