* FIX: test/Regression/Assembler/2002-02-19-TypeParsing.ll

   That was due to the StructType object not getting called multiple times
   to remove itself from the ATU list for an object, because it stopped
   getting queried due to this wrong test

* Improve debug output when DEBUG_MERGE_TYPES is on

llvm-svn: 2124

1 files changed, 4 insertions, 3 deletions

diff --git a/llvm/lib/VMCore/Type.cpp b/llvm/lib/VMCore/Type.cpp
index cd1cb442e63..1af616f8663 100644
--- a/llvm/lib/VMCore/Type.cpp
+++ b/llvm/lib/VMCore/Type.cpp
@@ -927,12 +927,12 @@ void DerivedType::typeIsRefined() {
     cerr << " typeIsREFINED user " << i << "[" << ATU << "] of abstract type ["
 	 << (void*)this << " " << getDescription() << "]\n";
 #endif
+    unsigned OldSize = AbstractTypeUsers.size();
     ATU->refineAbstractType(this, this);
     
     // If the user didn't remove itself from the list, continue...
-    if (AbstractTypeUsers.size() > i && AbstractTypeUsers[i] == ATU) {
+    if (AbstractTypeUsers.size() == OldSize && AbstractTypeUsers[i] == ATU)
       ++i;
-    }
   }
 
   --isRefining;
@@ -942,8 +942,9 @@ void DerivedType::typeIsRefined() {
     for (unsigned i = 0; i < AbstractTypeUsers.size(); ++i) {
       if (AbstractTypeUsers[i] != this) {
         // Debugging hook
-        cerr << "FOUND FAILURE\n";
+        cerr << "FOUND FAILURE\nUser: ";
         AbstractTypeUsers[i]->dump();
+        cerr << "\nCatch:\n";
         AbstractTypeUsers[i]->refineAbstractType(this, this);
         assert(0 && "Type became concrete,"
                " but it still has abstract type users hanging around!");