summaryrefslogtreecommitdiffstats
path: root/llvm/lib/VMCore/Constants.cpp
diff options
context:
space:
mode:
authorMicah Villmow <villmow@gmail.com>2012-10-24 17:25:11 +0000
committerMicah Villmow <villmow@gmail.com>2012-10-24 17:25:11 +0000
commit51e7246cb4e9d0d5d0c3cdecc84401008c31fde7 (patch)
tree9a94461ccdb5e830c6ba40c2c1123384cf7b2cc0 /llvm/lib/VMCore/Constants.cpp
parentac9a344915a7e886fadd723b59ca83e9400659d9 (diff)
downloadbcm5719-llvm-51e7246cb4e9d0d5d0c3cdecc84401008c31fde7.tar.gz
bcm5719-llvm-51e7246cb4e9d0d5d0c3cdecc84401008c31fde7.zip
Back out r166591, not sure why this made it through since I cancelled the command. Bleh, sorry about this!
llvm-svn: 166596
Diffstat (limited to 'llvm/lib/VMCore/Constants.cpp')
-rw-r--r--llvm/lib/VMCore/Constants.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/VMCore/Constants.cpp b/llvm/lib/VMCore/Constants.cpp
index b96257936df..a4e21e16b3f 100644
--- a/llvm/lib/VMCore/Constants.cpp
+++ b/llvm/lib/VMCore/Constants.cpp
@@ -1673,7 +1673,7 @@ Constant *ConstantExpr::getAlignOf(Type* Ty) {
// Note that a non-inbounds gep is used, as null isn't within any object.
Type *AligningTy =
StructType::get(Type::getInt1Ty(Ty->getContext()), Ty, NULL);
- Constant *NullPtr = Constant::getNullValue(AligningTy->getPointerTo(Ty));
+ Constant *NullPtr = Constant::getNullValue(AligningTy->getPointerTo());
Constant *Zero = ConstantInt::get(Type::getInt64Ty(Ty->getContext()), 0);
Constant *One = ConstantInt::get(Type::getInt32Ty(Ty->getContext()), 1);
Constant *Indices[2] = { Zero, One };
OpenPOWER on IntegriCloud