1 files changed, 2 insertions, 4 deletions
diff --git a/lib/Bytecode/Writer/SlotCalculator.cpp b/lib/Bytecode/Writer/SlotCalculator.cpp
index 3122f13cb7..00f7cbc5ae 100644
--- a/lib/Bytecode/Writer/SlotCalculator.cpp
+++ b/lib/Bytecode/Writer/SlotCalculator.cpp
@@ -362,16 +362,14 @@ unsigned SlotCalculator::getOrCreateTypeSlot(const Type *Ty) {
   //    global { \2 * } { { \2 }* null }
   //
   unsigned ResultSlot = doInsertType(Ty);
-  SC_DEBUG("  Inserted type: " << Ty->getDescription() << " slot=" <<
-           ResultSlot << "\n");
 
   // Loop over any contained types in the definition... in post
   // order.
   for (po_iterator<const Type*> I = po_begin(Ty), E = po_end(Ty);
        I != E; ++I) {
-    if (*I != Ty) {
+    if (*I != Ty && !TypeMap.count(*I)) {
       // If we haven't seen this sub type before, add it to our type table!
-      getOrCreateTypeSlot(*I);
+      doInsertType(*I);
     }
   }
   return ResultSlot;