diff options
Diffstat (limited to 'lib/Bytecode/Writer/SlotCalculator.cpp')
| -rw-r--r-- | lib/Bytecode/Writer/SlotCalculator.cpp | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/lib/Bytecode/Writer/SlotCalculator.cpp b/lib/Bytecode/Writer/SlotCalculator.cpp index c415ced0f7..b426cb74fb 100644 --- a/lib/Bytecode/Writer/SlotCalculator.cpp +++ b/lib/Bytecode/Writer/SlotCalculator.cpp @@ -287,20 +287,28 @@ int SlotCalculator::insertValue(const Value *D, bool dontIgnore) { SC_DEBUG(" Inserted type: " << TheTy->getDescription() << " slot=" << ResultSlot << "\n"); - // Loop over any contained types in the definition... in depth first order. + // Loop over any contained types in the definition... in reverse depth + // first order. // + std::vector<const Type*> DfsOrder; for (df_iterator<const Type*> I = df_begin(TheTy), E = df_end(TheTy); - I != E; ++I) + I != E; ++I) { if (*I != TheTy) { // If we haven't seen this sub type before, add it to our type table! - const Type *SubTy = *I; - if (getSlot(SubTy) == -1) { - SC_DEBUG(" Inserting subtype: " << SubTy->getDescription() << "\n"); - int Slot = doInsertValue(SubTy); - SC_DEBUG(" Inserted subtype: " << SubTy->getDescription() << - " slot=" << Slot << "\n"); - } + DfsOrder.push_back(*I); } + } + + for (std::vector<const Type*>::const_reverse_iterator + I = DfsOrder.rbegin(), E = DfsOrder.rend(); I != E; ++I) { + const Type *SubTy = *I; + if (getSlot(SubTy) == -1) { + SC_DEBUG(" Inserting subtype: " << SubTy->getDescription() << "\n"); + int Slot = doInsertValue(SubTy); + SC_DEBUG(" Inserted subtype: " << SubTy->getDescription() << + " slot=" << Slot << "\n"); + } + } return ResultSlot; } |