Roll-back r250822.

Summary: It breaks the build for the ASTMatchers

Subscribers: klimek, cfe-commits

Differential Revision: http://reviews.llvm.org/D13893

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

Author: angargo

Diff for: include/clang/AST/ASTConsumer.h

@@ -43,7 +43,7 @@ class ASTConsumer {
 public:
   ASTConsumer() : SemaConsumer(false) { }
 
-  virtual ~ASTConsumer() = default;
+  virtual ~ASTConsumer() {}
 
   /// Initialize - This is called to initialize the consumer, providing the
   /// ASTContext.

Diff for: include/clang/AST/CanonicalType.h

@@ -333,7 +333,7 @@ template<typename T>
 class CanProxy : public CanProxyAdaptor<T> {
 public:
   /// \brief Build a NULL proxy.
-  CanProxy() = default;
+  CanProxy() { }
 
   /// \brief Build a proxy to the given canonical type.
   CanProxy(CanQual<T> Stored) { this->Stored = Stored; }
@@ -389,7 +389,7 @@ struct CanTypeIterator
           CanQualType,
           typename std::iterator_traits<InputIterator>::difference_type,
           CanProxy<Type>, CanQualType> {
-  CanTypeIterator() = default;
+  CanTypeIterator() {}
   explicit CanTypeIterator(InputIterator Iter)
       : CanTypeIterator::iterator_adaptor_base(std::move(Iter)) {}
 

Diff for: include/clang/AST/DeclFriend.h

@@ -180,7 +180,7 @@ class CXXRecordDecl::friend_iterator {
   friend class CXXRecordDecl;
   explicit friend_iterator(FriendDecl *Ptr) : Ptr(Ptr) {}
 public:
-  friend_iterator() = default;
+  friend_iterator() {}
 
   typedef FriendDecl *value_type;
   typedef FriendDecl *reference;

Diff for: include/clang/AST/DeclTemplate.h

@@ -664,7 +664,7 @@ class RedeclarableTemplateDecl : public TemplateDecl,
             typename std::iterator_traits<typename llvm::FoldingSetVector<
                 EntryType>::iterator>::iterator_category,
             DeclType *, ptrdiff_t, DeclType *, DeclType *> {
-    SpecIterator() = default;
+    SpecIterator() {}
     explicit SpecIterator(
         typename llvm::FoldingSetVector<EntryType>::iterator SetIter)
         : SpecIterator::iterator_adaptor_base(std::move(SetIter)) {}

Diff for: include/clang/AST/Expr.h

@@ -337,7 +337,7 @@ class Expr : public Stmt {
     {}
 
   public:
-    Classification() = default;
+    Classification() {}
 
     Kinds getKind() const { return static_cast<Kinds>(Kind); }
     ModifiableType getModifiable() const {
@@ -4076,7 +4076,7 @@ class DesignatedInitExpr : public Expr {
     friend class DesignatedInitExpr;
 
   public:
-    Designator() = default;
+    Designator() {}
 
     /// @brief Initializes a field designator.
     Designator(const IdentifierInfo *FieldName, SourceLocation DotLoc,

Diff for: include/clang/AST/ExprCXX.h

@@ -2278,7 +2278,7 @@ class ArrayTypeTraitExpr : public Expr {
     : Expr(ArrayTypeTraitExprClass, Empty), ATT(0), Value(false),
       QueriedType() { }
 
-  virtual ~ArrayTypeTraitExpr() = default;
+  virtual ~ArrayTypeTraitExpr() { }
 
   SourceLocation getLocStart() const LLVM_READONLY { return Loc; }
   SourceLocation getLocEnd() const LLVM_READONLY { return RParen; }

Diff for: include/clang/AST/Mangle.h

@@ -64,7 +64,7 @@ class MangleContext {
                          ManglerKind Kind)
       : Context(Context), Diags(Diags), Kind(Kind) {}
 
-  virtual ~MangleContext() = default;
+  virtual ~MangleContext() { }
 
   ASTContext &getASTContext() const { return Context; }
 

Diff for: include/clang/AST/MangleNumberingContext.h

@@ -32,7 +32,7 @@ class VarDecl;
 /// literals within a particular context.
 class MangleNumberingContext : public RefCountedBase<MangleNumberingContext> {
 public:
-  virtual ~MangleNumberingContext() = default;
+  virtual ~MangleNumberingContext() {}
 
   /// \brief Retrieve the mangling number of a new lambda expression with the
   /// given call operator within this context.

Diff for: include/clang/AST/Redeclarable.h

@@ -248,7 +248,7 @@ Decl *getPrimaryMergedDecl(Decl *D);
 template<typename decl_type>
 class Mergeable {
 public:
-  Mergeable() = default;
+  Mergeable() {}
 
   /// \brief Return the first declaration of this declaration or itself if this
   /// is the only declaration.

Diff for: include/clang/AST/StmtIterator.h

@@ -81,7 +81,7 @@ class StmtIteratorImpl : public StmtIteratorBase,
 protected:
   StmtIteratorImpl(const StmtIteratorBase& RHS) : StmtIteratorBase(RHS) {}
 public:
-  StmtIteratorImpl() = default;
+  StmtIteratorImpl() {}
   StmtIteratorImpl(Stmt **s) : StmtIteratorBase(s) {}
   StmtIteratorImpl(Decl **dgi, Decl **dge) : StmtIteratorBase(dgi, dge) {}
   StmtIteratorImpl(const VariableArrayType *t) : StmtIteratorBase(t) {}

Diff for: include/clang/AST/UnresolvedSet.h

@@ -59,7 +59,7 @@ class UnresolvedSetImpl {
   // UnresolvedSet.
 private:
   template <unsigned N> friend class UnresolvedSet;
-  UnresolvedSetImpl() = default;
+  UnresolvedSetImpl() {}
   UnresolvedSetImpl(const UnresolvedSetImpl &) {}
 
 public:

Diff for: include/clang/AST/VTableBuilder.h

@@ -298,7 +298,7 @@ class VTableContextBase {
 
   bool isMicrosoft() const { return IsMicrosoftABI; }
 
-  virtual ~VTableContextBase() = default;
+  virtual ~VTableContextBase() {}
 
 protected:
   typedef llvm::DenseMap<const CXXMethodDecl *, ThunkInfoVectorTy> ThunksMapTy;

Diff for: include/clang/ASTMatchers/ASTMatchersInternal.h

@@ -131,7 +131,7 @@ class BoundNodesTreeBuilder {
   /// BoundNodesTree.
   class Visitor {
   public:
-    virtual ~Visitor() = default;
+    virtual ~Visitor() {}
 
     /// \brief Called multiple times during a single call to VisitMatches(...).
     ///
@@ -209,7 +209,7 @@ class DynMatcherInterface : public RefCountedBaseVPTR {
 template <typename T>
 class MatcherInterface : public DynMatcherInterface {
 public:
-  ~MatcherInterface() override = default;
+  ~MatcherInterface() override {}
 
   /// \brief Returns true if 'Node' can be matched.
   ///
@@ -798,7 +798,7 @@ class ASTMatchFinder {
     AMM_ParentOnly
   };
 
-  virtual ~ASTMatchFinder() = default;
+  virtual ~ASTMatchFinder() {}
 
   /// \brief Returns true if the given class is directly or indirectly derived
   /// from a base type matching \c base.
@@ -1376,7 +1376,7 @@ class VariadicDynCastAllOfMatcher
         BindableMatcher<SourceT>, Matcher<TargetT>,
         makeDynCastAllOfComposite<SourceT, TargetT> > {
 public:
-  VariadicDynCastAllOfMatcher() = default;
+  VariadicDynCastAllOfMatcher() {}
 };
 
 /// \brief A \c VariadicAllOfMatcher<T> object is a variadic functor that takes
@@ -1394,7 +1394,7 @@ class VariadicAllOfMatcher : public llvm::VariadicFunction<
                                BindableMatcher<T>, Matcher<T>,
                                makeAllOfComposite<T> > {
 public:
-  VariadicAllOfMatcher() = default;
+  VariadicAllOfMatcher() {}
 };
 
 /// \brief Matches nodes of type \c TLoc for which the inner
@@ -1515,7 +1515,7 @@ class TypeTraversePolymorphicMatcher {
 
   struct Func : public llvm::VariadicFunction<Self, Matcher<InnerTBase>,
                                               &Self::create> {
-    Func() = default;
+    Func() {}
   };
 
 private:

Diff for: include/clang/Analysis/Analyses/FormatString.h

@@ -606,7 +606,7 @@ enum PositionContext { FieldWidthPos = 0, PrecisionPos = 1 };
 
 class FormatStringHandler {
 public:
-  FormatStringHandler() = default;
+  FormatStringHandler() {}
   virtual ~FormatStringHandler();
 
   virtual void HandleNullChar(const char *nullCharacter) {}

Diff for: include/clang/Analysis/Analyses/LiveVariables.h

@@ -53,7 +53,7 @@ class LiveVariables : public ManagedAnalysis {
   class Observer {
     virtual void anchor();
   public:
-    virtual ~Observer() = default;
+    virtual ~Observer() {}
 
     /// A callback invoked right before invoking the
     ///  liveness transfer function on the given statement.

Diff for: include/clang/Analysis/Analyses/ReachableCode.h

@@ -48,7 +48,7 @@ enum UnreachableKind {
 class Callback {
   virtual void anchor();
 public:
-  virtual ~Callback() = default;
+  virtual ~Callback() {}
   virtual void HandleUnreachable(UnreachableKind UK,
                                  SourceLocation L,
                                  SourceRange ConditionVal,

Diff for: include/clang/Analysis/Analyses/ThreadSafetyTraverse.h

@@ -176,7 +176,7 @@ template <class Self>
 class VisitReducer : public Traversal<Self, VisitReducerBase>,
                      public VisitReducerBase {
 public:
-  VisitReducer() = default;
+  VisitReducer() {}
 
 public:
   R_SExpr reduceNull() { return true; }

Diff for: include/clang/Analysis/Analyses/UninitializedValues.h

@@ -99,7 +99,7 @@ class UninitUse {
 
 class UninitVariablesHandler {
 public:
-  UninitVariablesHandler() = default;
+  UninitVariablesHandler() {}
   virtual ~UninitVariablesHandler();
 
   /// Called when the uninitialized variable is used at the given expression.

Diff for: include/clang/Analysis/AnalysisContext.h

@@ -44,7 +44,7 @@ namespace idx { class TranslationUnit; }
 /// to AnalysisDeclContext.
 class ManagedAnalysis {
 protected:
-  ManagedAnalysis() = default;
+  ManagedAnalysis() {}
 public:
   virtual ~ManagedAnalysis();
 
@@ -289,7 +289,7 @@ class StackFrameContext : public LocationContext {
       Block(blk), Index(idx) {}
 
 public:
-  ~StackFrameContext() override = default;
+  ~StackFrameContext() override {}
 
   const Stmt *getCallSite() const { return CallSite; }
 
@@ -324,7 +324,7 @@ class ScopeContext : public LocationContext {
     : LocationContext(Scope, ctx, parent), Enter(s) {}
 
 public:
-  ~ScopeContext() override = default;
+  ~ScopeContext() override {}
 
   void Profile(llvm::FoldingSetNodeID &ID) override;
 
@@ -352,7 +352,7 @@ class BlockInvocationContext : public LocationContext {
     : LocationContext(Block, ctx, parent), BD(bd), ContextData(contextData) {}
 
 public:
-  ~BlockInvocationContext() override = default;
+  ~BlockInvocationContext() override {}
 
   const BlockDecl *getBlockDecl() const { return BD; }
 

Diff for: include/clang/Analysis/CFG.h

@@ -704,11 +704,11 @@ class CFGBlock {
 /// operator error is found when building the CFG.
 class CFGCallback {
 public:
-  CFGCallback() = default;
+  CFGCallback() {}
   virtual void compareAlwaysTrue(const BinaryOperator *B, bool isAlwaysTrue) {}
   virtual void compareBitwiseEquality(const BinaryOperator *B,
                                       bool isAlwaysTrue) {}
-  virtual ~CFGCallback() = default;
+  virtual ~CFGCallback() {}
 };
 
 /// CFG - Represents a source-level, intra-procedural CFG that represents the

Diff for: include/clang/Basic/FileSystemStatCache.h

@@ -51,7 +51,7 @@ class FileSystemStatCache {
   std::unique_ptr<FileSystemStatCache> NextStatCache;
 
 public:
-  virtual ~FileSystemStatCache() = default;
+  virtual ~FileSystemStatCache() {}
 
   enum LookupResult {
     CacheExists,   ///< We know the file exists and its cached stat data.

Diff for: include/clang/Basic/IdentifierTable.h

@@ -385,7 +385,7 @@ class IdentifierIterator {
   void operator=(const IdentifierIterator &) = delete;
 
 protected:
-  IdentifierIterator() = default;
+  IdentifierIterator() { }
 
 public:
   virtual ~IdentifierIterator();

Diff for: include/clang/Driver/Job.h

@@ -88,7 +88,7 @@ class Command {
   // FIXME: This really shouldn't be copyable, but is currently copied in some
   // error handling in Driver::generateCompilationDiagnostics.
   Command(const Command &) = default;
-  virtual ~Command() = default;
+  virtual ~Command() {}
 
   virtual void Print(llvm::raw_ostream &OS, const char *Terminator, bool Quote,
                      CrashReportInfo *CrashInfo = nullptr) const;

Diff for: include/clang/Edit/EditsReceiver.h

@@ -20,7 +20,7 @@ namespace edit {
 
 class EditsReceiver {
 public:
-  virtual ~EditsReceiver() = default;
+  virtual ~EditsReceiver() { }
 
   virtual void insert(SourceLocation loc, StringRef text) = 0;
   virtual void replace(CharSourceRange range, StringRef text) = 0;

Diff for: include/clang/Frontend/SerializedDiagnosticReader.h

@@ -58,8 +58,8 @@ struct Location {
 /// the various constructs that are found in serialized diagnostics.
 class SerializedDiagnosticReader {
 public:
-  SerializedDiagnosticReader() = default;
-  virtual ~SerializedDiagnosticReader() = default;
+  SerializedDiagnosticReader() {}
+  virtual ~SerializedDiagnosticReader() {}
 
   /// \brief Read the diagnostics in \c File
   std::error_code readDiagnostics(StringRef File);

Diff for: include/clang/Frontend/VerifyDiagnosticConsumer.h

@@ -161,7 +161,7 @@ class VerifyDiagnosticConsumer: public DiagnosticConsumer,
     unsigned Min, Max;
     bool MatchAnyLine;
 
-    virtual ~Directive() = default;
+    virtual ~Directive() { }
 
     // Returns true if directive text is valid.
     // Otherwise returns false and populates E.

Diff for: include/clang/Lex/ModuleMap.h

@@ -40,7 +40,7 @@ class ModuleMapParser;
 /// reads module map files.
 class ModuleMapCallbacks {
 public:
-  virtual ~ModuleMapCallbacks() = default;
+  virtual ~ModuleMapCallbacks() {}
 
   /// \brief Called when a module map file has been read.
   ///

Diff for: include/clang/Lex/PTHLexer.h

@@ -64,7 +64,7 @@ class PTHLexer : public PreprocessorLexer {
   PTHLexer(Preprocessor& pp, FileID FID, const unsigned char *D,
            const unsigned char* ppcond, PTHManager &PM);
 public:
-  ~PTHLexer() override = default;
+  ~PTHLexer() override {}
 
   /// Lex - Return the next token.
   bool Lex(Token &Tok);

Diff for: include/clang/Lex/PreprocessorLexer.h

@@ -81,7 +81,7 @@ class PreprocessorLexer {
       ParsingFilename(false),
       LexingRawMode(false) {}
 
-  virtual ~PreprocessorLexer() = default;
+  virtual ~PreprocessorLexer() {}
 
   virtual void IndirectLex(Token& Result) = 0;
 

Diff for: include/clang/Sema/Sema.h

@@ -1313,7 +1313,7 @@ class Sema {
     TypeDiagnoser(bool Suppressed = false) : Suppressed(Suppressed) { }
 
     virtual void diagnose(Sema &S, SourceLocation Loc, QualType T) = 0;
-    virtual ~TypeDiagnoser() = default;
+    virtual ~TypeDiagnoser() {}
   };
 
   static int getPrintable(int I) { return I; }
@@ -2297,7 +2297,7 @@ class Sema {
     virtual SemaDiagnosticBuilder diagnoseConversion(
         Sema &S, SourceLocation Loc, QualType T, QualType ConvTy) = 0;
 
-    virtual ~ContextualImplicitConverter() = default;
+    virtual ~ContextualImplicitConverter() {}
   };
 
   class ICEConvertDiagnoser : public ContextualImplicitConverter {
@@ -8597,7 +8597,7 @@ class Sema {
 
     virtual void diagnoseNotICE(Sema &S, SourceLocation Loc, SourceRange SR) =0;
     virtual void diagnoseFold(Sema &S, SourceLocation Loc, SourceRange SR);
-    virtual ~VerifyICEDiagnoser() = default;
+    virtual ~VerifyICEDiagnoser() { }
   };
 
   /// VerifyIntegerConstantExpression - Verifies that an expression is an ICE,

Diff for: include/clang/Sema/TypoCorrection.h

@@ -255,7 +255,7 @@ class CorrectionCandidateCallback {
         IsObjCIvarLookup(false), IsAddressOfOperand(false), Typo(Typo),
         TypoNNS(TypoNNS) {}
 
-  virtual ~CorrectionCandidateCallback() = default;
+  virtual ~CorrectionCandidateCallback() {}
 
   /// \brief Simple predicate used by the default RankCandidate to
   /// determine whether to return an edit distance of 0 or InvalidDistance.