Rollback r254508 and r254511 to fix buildbots

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

diff --git a/include/llvm/Analysis/ScalarEvolution.h b/include/llvm/Analysis/ScalarEvolution.h
index 3c7f1e052a94a3d240cc1acc332de977c4e196c3..da8c68aa6832a0dd655266596ee31e82b5b791e9 100644 (file)
--- a/include/llvm/Analysis/ScalarEvolution.h
+++ b/include/llvm/Analysis/ScalarEvolution.h
@@ -183,7 +183,7 @@ namespace llvm {
 
   protected:
     SCEVPredicateKind Kind;
-    virtual ~SCEVPredicate();
+    ~SCEVPredicate() = default;
     SCEVPredicate(const SCEVPredicate&) = default;
     SCEVPredicate &operator=(const SCEVPredicate&) = default;
 
@@ -211,9 +211,6 @@ namespace llvm {
     /// if this is a SCEVUnionPredicate.
     virtual const SCEV *getExpr() const = 0;
   };
-  
-  /// Default destructor must be defined outside class due to g++ PR53613.
-  SCEVPredicate::~SCEVPredicate() = default;
 
   inline raw_ostream &operator<<(raw_ostream &OS, const SCEVPredicate &P) {
     P.print(OS);