[llvm-commits] CVS: llvm/lib/Transforms/IPO/MutateStructTypes.cpp SimpleStructMutation.cpp

[Chris Lattner]

Changes in directory llvm/lib/Transforms/IPO:

MutateStructTypes.cpp updated: 1.45 -> 1.46
SimpleStructMutation.cpp updated: 1.24 -> 1.25

---
Log message:

Adjust to the changed StructType interface.  In particular, getElementTypes() is gone.


---
Diffs of the changes:  (+6 -8)

Index: llvm/lib/Transforms/IPO/MutateStructTypes.cpp
diff -u llvm/lib/Transforms/IPO/MutateStructTypes.cpp:1.45 llvm/lib/Transforms/IPO/MutateStructTypes.cpp:1.46
--- llvm/lib/Transforms/IPO/MutateStructTypes.cpp:1.45	Sun Feb  8 22:14:01 2004
+++ llvm/lib/Transforms/IPO/MutateStructTypes.cpp	Sun Feb  8 22:37:31 2004
@@ -69,11 +69,10 @@
   }
   case Type::StructTyID: {
     const StructType *ST = cast<StructType>(Ty);
-    const StructType::ElementTypes &El = ST->getElementTypes();
     std::vector<const Type *> Types;
 
-    for (StructType::ElementTypes::const_iterator I = El.begin(), E = El.end();
-         I != E; ++I)
+    for (StructType::element_iterator I = ST->element_begin(),
+           E = ST->element_end(); I != E; ++I)
       Types.push_back(ConvertType(*I));
     DestTy = StructType::get(Types);
     break;
@@ -115,7 +114,7 @@
   if (const StructType *OldST = dyn_cast<StructType>(OldTy)) {
     // Figure out what the current index is...
     unsigned ElNum = cast<ConstantUInt>(Idx[i])->getValue();
-    assert(ElNum < OldST->getElementTypes().size());
+    assert(ElNum < OldST->getNumElements());
 
     std::map<const StructType*, TransformType>::iterator
       I = Transforms.find(OldST);
@@ -198,7 +197,7 @@
     const StructType  *OldTy = I->first;
     const std::vector<int> &InVec = I->second;
 
-    assert(OldTy->getElementTypes().size() == InVec.size() &&
+    assert(OldTy->getNumElements() == InVec.size() &&
            "Action not specified for every element of structure type!");
 
     std::vector<const Type *> NewType;


Index: llvm/lib/Transforms/IPO/SimpleStructMutation.cpp
diff -u llvm/lib/Transforms/IPO/SimpleStructMutation.cpp:1.24 llvm/lib/Transforms/IPO/SimpleStructMutation.cpp:1.25
--- llvm/lib/Transforms/IPO/SimpleStructMutation.cpp:1.24	Fri Nov 21 15:52:10 2003
+++ llvm/lib/Transforms/IPO/SimpleStructMutation.cpp	Sun Feb  8 22:37:31 2004
@@ -109,7 +109,7 @@
 static inline void GetTransformation(const TargetData &TD, const StructType *ST,
                                      std::vector<int> &Transform,
                                    enum SimpleStructMutation::Transform XForm) {
-  unsigned NumElements = ST->getElementTypes().size();
+  unsigned NumElements = ST->getNumElements();
   Transform.reserve(NumElements);
 
   switch (XForm) {
@@ -124,8 +124,7 @@
 
     // Build mapping from index to size
     for (unsigned i = 0; i < NumElements; ++i)
-      ElList.push_back(
-              std::make_pair(i, TD.getTypeSize(ST->getElementTypes()[i])));
+      ElList.push_back(std::make_pair(i,TD.getTypeSize(ST->getElementType(i))));
 
     sort(ElList.begin(), ElList.end(), ptr_fun(FirstLess));