Fix problem which effected linking apache

llvm-svn: 9335
This commit is contained in:
Chris Lattner 2003-10-21 17:39:59 +00:00
parent 7a75f6b7d4
commit 53d92d23b0
2 changed files with 7 additions and 3 deletions

View File

@ -268,7 +268,7 @@ ConstantStruct::ConstantStruct(const StructType *T,
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));

View File

@ -174,8 +174,12 @@ void SlotCalculator::incorporateFunction(const Function *F) {
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");