Clean up debugging code

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

diff --git a/lib/VMCore/Type.cpp b/lib/VMCore/Type.cpp
index 647bad09f7ad05e7d60faf605925a9de936f4bab..c252185825deb420aa446002f38b62a6064a5700 100644 (file)
--- a/lib/VMCore/Type.cpp
+++ b/lib/VMCore/Type.cpp
@@ -861,10 +861,9 @@ void DerivedType::refineAbstractTypeTo(const Type *NewType) {
 #endif
       User->refineAbstractType(this, NewTy);
 
-      if (AbstractTypeUsers.size() == OldSize)
-        User->refineAbstractType(this, NewTy);
-
+#ifdef DEBUG_MERGE_TYPES
       if (AbstractTypeUsers.size() == OldSize) {
+        User->refineAbstractType(this, NewTy);
         if (AbstractTypeUsers.back() != User)
           cerr << "User changed!\n";
         cerr << "Top of user list is:\n";
@@ -873,7 +872,7 @@ void DerivedType::refineAbstractTypeTo(const Type *NewType) {
         cerr <<"\nOld User=\n";
         User->dump();
       }
-
+#endif
       assert(AbstractTypeUsers.size() != OldSize &&
             "AbsTyUser did not remove self from user list!");
     }
@@ -922,6 +921,7 @@ void DerivedType::typeIsRefined() {
       if (AbstractTypeUsers[i] != this) {
         // Debugging hook
         cerr << "FOUND FAILURE\n";
+        AbstractTypeUsers[i]->dump();
         AbstractTypeUsers[i]->refineAbstractType(this, this);
         assert(0 && "Type became concrete,"
                " but it still has abstract type users hanging around!");