Revert r108794, "Separate PassInfo into two classes: a constructor-free

superclass (StaticPassInfo) and a constructor-ful subclass (PassInfo).", it is
breaking teh everything.

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

1 files changed, 5 insertions, 7 deletions

diff --git a/include/llvm/Support/PassNameParser.h b/include/llvm/Support/PassNameParser.h
index c356439..cdca978 100644
--- a/include/llvm/Support/PassNameParser.h
+++ b/include/llvm/Support/PassNameParser.h
@@ -55,11 +55,9 @@ public:
   // ignorablePassImpl - Can be overriden in subclasses to refine the list of
   // which passes we want to include.
   //
-  virtual bool ignorablePassImpl(const StaticPassInfo *P) const {
-    return false;
-  }
+  virtual bool ignorablePassImpl(const PassInfo *P) const { return false; }
 
-  inline bool ignorablePass(const StaticPassInfo *P) const {
+  inline bool ignorablePass(const PassInfo *P) const {
     // Ignore non-selectable and non-constructible passes!  Ignore
     // non-optimizations.
     return P->getPassArgument() == 0 || *P->getPassArgument() == 0 ||
@@ -68,7 +66,7 @@ public:
 
   // Implement the PassRegistrationListener callbacks used to populate our map
   //
-  virtual void passRegistered(const StaticPassInfo *P) {
+  virtual void passRegistered(const PassInfo *P) {
     if (ignorablePass(P) || !Opt) return;
     if (findOption(P->getPassArgument()) != getNumOptions()) {
       errs() << "Two passes with the same argument (-"
@@ -77,7 +75,7 @@ public:
     }
     addLiteralOption(P->getPassArgument(), P, P->getPassName());
   }
-  virtual void passEnumerate(const StaticPassInfo *P) { passRegistered(P); }
+  virtual void passEnumerate(const PassInfo *P) { passRegistered(P); }
 
   // ValLessThan - Provide a sorting comparator for Values elements...
   typedef std::pair<const char*,
@@ -107,7 +105,7 @@ private:
   Filter filter;
 
 public:
-  bool ignorablePassImpl(const StaticPassInfo *P) const { return !filter(*P); }
+  bool ignorablePassImpl(const PassInfo *P) const { return !filter(*P); }
 };
 
 ///===----------------------------------------------------------------------===//