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 | 5fdd6c8793462549e3593890ec61573da06e3346 (patch) | |
| tree | 895067e740b3c6f2f97805443c61195cf8de169a /lib/Target/ARM/ARMGlobalMerge.cpp | |
| parent | d475c105080cc5082ca8b8e87c89fa7c2dade39e (diff) | |
| download | llvm-5fdd6c8793462549e3593890ec61573da06e3346.tar.gz llvm-5fdd6c8793462549e3593890ec61573da06e3346.tar.bz2 llvm-5fdd6c8793462549e3593890ec61573da06e3346.tar.xz | |
Second attempt at de-constifying LLVM Types in FunctionType::get(),
StructType::get() and TargetData::getIntPtrType().
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@134982 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM/ARMGlobalMerge.cpp')
| -rw-r--r-- | lib/Target/ARM/ARMGlobalMerge.cpp | 4 |
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; |