[llvm-commits] CVS: reopt/lib/Inst/lib/Phase1/Phase1.cpp PrimInfo.cpp

[Brian Gaeke]

Changes in directory reopt/lib/Inst/lib/Phase1:

Phase1.cpp updated: 1.30 -> 1.31
PrimInfo.cpp updated: 1.18 -> 1.19

---
Log message:

Fix ConstantAggregateZero bit rot

---
Diffs of the changes:  (+4 -5)

Index: reopt/lib/Inst/lib/Phase1/Phase1.cpp
diff -u reopt/lib/Inst/lib/Phase1/Phase1.cpp:1.30 reopt/lib/Inst/lib/Phase1/Phase1.cpp:1.31
--- reopt/lib/Inst/lib/Phase1/Phase1.cpp:1.30	Wed Nov 19 14:49:53 2003
+++ reopt/lib/Inst/lib/Phase1/Phase1.cpp	Tue Feb 24 14:42:03 2004
@@ -256,10 +256,9 @@
     // Make the GBT itself, and the corresponding global variable.
     ArrayType* gbtType = ArrayType::get(PrimInfo::getStructType(),
                                         gbtElems.size());
-    ConstantArray* gbtContents = ConstantArray::get(gbtType, gbtElems);
-    GlobalVariable* gbt = new GlobalVariable(gbtType, true,
-                                             GlobalVariable::ExternalLinkage,
-                                             gbtContents, "ppGBT", m_module);
+    GlobalVariable* gbt =
+      new GlobalVariable(gbtType, true, GlobalVariable::ExternalLinkage,
+        ConstantArray::get(gbtType, gbtElems), "ppGBT", m_module);
 
     // Record the GBT size
     ConstantUInt* size = ConstantUInt::get(Type::UIntTy, gbtElems.size());


Index: reopt/lib/Inst/lib/Phase1/PrimInfo.cpp
diff -u reopt/lib/Inst/lib/Phase1/PrimInfo.cpp:1.18 reopt/lib/Inst/lib/Phase1/PrimInfo.cpp:1.19
--- reopt/lib/Inst/lib/Phase1/PrimInfo.cpp:1.18	Wed Nov 19 14:49:53 2003
+++ reopt/lib/Inst/lib/Phase1/PrimInfo.cpp	Tue Feb 24 14:42:03 2004
@@ -78,7 +78,7 @@
     module->addTypeName("PrimInfo", sm_structType);
 }
 
-static ConstantStruct* makeConstStruct(StructType* st,
+static Constant* makeConstStruct(StructType* st,
                                        unsigned siteID,
                                        unsigned gbtType,
                                        GlobalVariable* loadVar)