Revert r134893 and r134888 (and related patches in other trees). It was causing

[oota-llvm.git] / lib / Target / ARM / ARMGlobalMerge.cpp

diff --git a/lib/Target/ARM/ARMGlobalMerge.cpp b/lib/Target/ARM/ARMGlobalMerge.cpp
index 8d77b2d8383e109ae3152bddbe79ea0167566cab..f8993792bc67c45054bf57349c3023e9858cd47f 100644 (file)
--- 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<Type*> Tys;
+    std::vector<const Type*> Tys;
     std::vector<Constant*> Inits;
     for (j = i; j != e; ++j) {
-      Type *Ty = Globals[j]->getType()->getElementType();
+      const Type *Ty = Globals[j]->getType()->getElementType();
       MergedSize += TD->getTypeAllocSize(Ty);
       if (MergedSize > MaxOffset) {
         break;