diff options
| author | Jay Foad <jay.foad@gmail.com> | 2011-07-12 14:06:48 +0000 |
|---|---|---|
| committer | Jay Foad <jay.foad@gmail.com> | 2011-07-12 14:06:48 +0000 |
| commit | b804a2b751ac0d1a5673ec395c4cecb326e73dfb (patch) | |
| tree | 3f55036b549a4067ca1c1c12cf860e118e229e1c /llvm/lib/Target/ARM/ARMGlobalMerge.cpp | |
| parent | 0a33f7e678e8d778e499ad42e0b610b15f5ba772 (diff) | |
| download | llvm-b804a2b751ac0d1a5673ec395c4cecb326e73dfb.zip llvm-b804a2b751ac0d1a5673ec395c4cecb326e73dfb.tar.gz llvm-b804a2b751ac0d1a5673ec395c4cecb326e73dfb.tar.bz2 | |
Second attempt at de-constifying LLVM Types in FunctionType::get(),
StructType::get() and TargetData::getIntPtrType().
llvm-svn: 134982
Diffstat (limited to 'llvm/lib/Target/ARM/ARMGlobalMerge.cpp')
| -rw-r--r-- | llvm/lib/Target/ARM/ARMGlobalMerge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Target/ARM/ARMGlobalMerge.cpp b/llvm/lib/Target/ARM/ARMGlobalMerge.cpp index f899379..8d77b2d 100644 --- a/llvm/lib/Target/ARM/ARMGlobalMerge.cpp +++ b/llvm/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; |