Output types in reverse postorder. This will allow the ByteCode/Reader

to create the minimum number of opaque types for each type with a
cycle in its type graph.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@9615 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Bytecode/Writer/SlotCalculator.cpp b/lib/Bytecode/Writer/SlotCalculator.cpp
index c415ced0f73c9ab6e519b111700a825c459ec10d..b426cb74fbd9891d6dcc27325b9bddf6c2e863a3 100644 (file)
--- 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;
   }
 

diff --git a/lib/VMCore/SlotCalculator.cpp b/lib/VMCore/SlotCalculator.cpp
index c415ced0f73c9ab6e519b111700a825c459ec10d..b426cb74fbd9891d6dcc27325b9bddf6c2e863a3 100644 (file)
--- a/lib/VMCore/SlotCalculator.cpp
+++ b/lib/VMCore/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;
   }