summaryrefslogtreecommitdiff
path: root/lib/Target/ARM/ARMGlobalMerge.cpp
diff options
context:
space:
mode:
authorJay Foad <jay.foad@gmail.com>2011-07-11 09:56:20 +0000
committerJay Foad <jay.foad@gmail.com>2011-07-11 09:56:20 +0000
commiteeb64ae6e52ac2a7980884fe89c01508014af6a9 (patch)
treed642ebabea7be19546d56ed183345831207df879 /lib/Target/ARM/ARMGlobalMerge.cpp
parentce3a9f51ce1b11143e94394906299c7640cf31b7 (diff)
downloadllvm-eeb64ae6e52ac2a7980884fe89c01508014af6a9.tar.gz
llvm-eeb64ae6e52ac2a7980884fe89c01508014af6a9.tar.bz2
llvm-eeb64ae6e52ac2a7980884fe89c01508014af6a9.tar.xz
De-constify Types in StructType::get() and TargetData::getIntPtrType().
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@134893 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM/ARMGlobalMerge.cpp')
-rw-r--r--lib/Target/ARM/ARMGlobalMerge.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Target/ARM/ARMGlobalMerge.cpp b/lib/Target/ARM/ARMGlobalMerge.cpp
index f8993792bc..8d77b2d838 100644
--- a/lib/Target/ARM/ARMGlobalMerge.cpp
+++ b/lib/Target/ARM/ARMGlobalMerge.cpp
@@ -128,10 +128,10 @@ bool ARMGlobalMerge::doMerge(SmallVectorImpl<GlobalVariable*> &Globals,
for (size_t i = 0, e = Globals.size(); i != e; ) {
size_t j = 0;
uint64_t MergedSize = 0;
- std::vector<const Type*> Tys;
+ std::vector<Type*> Tys;
std::vector<Constant*> Inits;
for (j = i; j != e; ++j) {
- const Type *Ty = Globals[j]->getType()->getElementType();
+ Type *Ty = Globals[j]->getType()->getElementType();
MergedSize += TD->getTypeAllocSize(Ty);
if (MergedSize > MaxOffset) {
break;