Fix a bug in my previous change. Unfortunately this reverts most of the

speedup, but has the advantage of not breaking a bunch of programs!

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

diff --git a/lib/VMCore/Type.cpp b/lib/VMCore/Type.cpp
index af3a81e..6a9da3a 100644 (file)
--- a/lib/VMCore/Type.cpp
+++ b/lib/VMCore/Type.cpp
@@ -478,8 +478,8 @@ bool Type::PromoteAbstractToConcrete(void *Ptr) {
       return true;              // This type is abstract if subtype is abstract!
     }
   
-  // Nothing looks abstract here.
-  setAbstract(false);
+  // Nothing looks abstract here.  Restore the abstract flag.
+  setAbstract(true);
   return false;
 }
 
@@ -732,7 +732,8 @@ public:
     // subtypes to see if the type has just become concrete!
     if (Ty->isAbstract()) {
       std::set<Type*> KnownAbstractTypes;
-      Ty->PromoteAbstractToConcrete(&KnownAbstractTypes);
+      if (!Ty->PromoteAbstractToConcrete(&KnownAbstractTypes))
+        Ty->setAbstract(false);
 
       // If the type just became concrete, notify all users!
       if (!Ty->isAbstract())