From: Andy Gibbs Date: Wed, 2 Dec 2015 14:22:18 +0000 (+0000) Subject: Fix buildbots broken by r254508 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=3fe37662ad60efa7faa432de8e7e86ca73d85d8d;p=oota-llvm.git Fix buildbots broken by r254508 g++ 4.7 does not allow an inline defaulted virtual destructor to be overridden, giving the error "looser throw specifier for ... overridding ~SCEVPredicate() noexcept (true)" (see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53613). The work-around given in the bug report above has been utilised here. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@254511 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/Analysis/ScalarEvolution.h b/include/llvm/Analysis/ScalarEvolution.h index 0000b42391a..3c7f1e052a9 100644 --- a/include/llvm/Analysis/ScalarEvolution.h +++ b/include/llvm/Analysis/ScalarEvolution.h @@ -183,7 +183,7 @@ namespace llvm { protected: SCEVPredicateKind Kind; - virtual ~SCEVPredicate() = default; + virtual ~SCEVPredicate(); SCEVPredicate(const SCEVPredicate&) = default; SCEVPredicate &operator=(const SCEVPredicate&) = default; @@ -211,6 +211,9 @@ 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);