[llvm-commits] CVS: llvm/lib/VMCore/Constants.cpp SlotCalculator.cpp

[Chris Lattner]

Changes in directory llvm/lib/VMCore:

Constants.cpp updated: 1.58 -> 1.59
SlotCalculator.cpp updated: 1.32 -> 1.33

---
Log message:

Fix problem which effected linking apache


---
Diffs of the changes:  (+7 -3)

Index: llvm/lib/VMCore/Constants.cpp
diff -u llvm/lib/VMCore/Constants.cpp:1.58 llvm/lib/VMCore/Constants.cpp:1.59
--- llvm/lib/VMCore/Constants.cpp:1.58	Mon Oct 20 14:43:21 2003
+++ llvm/lib/VMCore/Constants.cpp	Tue Oct 21 12:39:59 2003
@@ -268,7 +268,7 @@
   Operands.reserve(V.size());
   for (unsigned i = 0, e = V.size(); i != e; ++i) {
     assert((V[i]->getType() == ETypes[i] ||
-            (ETypes[i]->isAbstract() &&
+            ((ETypes[i]->isAbstract() || V[i]->getType()->isAbstract()) &&
              ETypes[i]->getPrimitiveID()==V[i]->getType()->getPrimitiveID())) &&
            "Initializer for struct element doesn't match struct element type!");
     Operands.push_back(Use(V[i], this));


Index: llvm/lib/VMCore/SlotCalculator.cpp
diff -u llvm/lib/VMCore/SlotCalculator.cpp:1.32 llvm/lib/VMCore/SlotCalculator.cpp:1.33
--- llvm/lib/VMCore/SlotCalculator.cpp:1.32	Mon Oct 20 14:43:21 2003
+++ llvm/lib/VMCore/SlotCalculator.cpp	Tue Oct 21 12:39:59 2003
@@ -174,8 +174,12 @@
   SC_DEBUG("Inserting Instructions:\n");
 
   // Add all of the instructions to the type planes...
-  for_each(inst_begin(F), inst_end(F),
-	   bind_obj(this, &SlotCalculator::getOrCreateSlot));
+  for (Function::const_iterator BB = F->begin(), E = F->end(); BB != E; ++BB)
+    for (BasicBlock::const_iterator I = BB->begin(), E = BB->end(); I!=E; ++I) {
+      getOrCreateSlot(I);
+      //if (const VANextInst *VAN = dyn_cast<VANextInst>(I))
+      //  getOrCreateSlot(VAN->getArgType());
+    }
 
   if (!IgnoreNamedNodes) {
     SC_DEBUG("Inserting SymbolTable values:\n");