diff options
| -rw-r--r-- | include/clang/Frontend/FrontendAction.h | 4 | ||||
| -rw-r--r-- | include/clang/Frontend/FrontendActions.h | 6 | ||||
| -rw-r--r-- | lib/Frontend/ASTMerge.cpp | 4 | ||||
| -rw-r--r-- | lib/Frontend/FrontendAction.cpp | 3 |
4 files changed, 9 insertions, 8 deletions
diff --git a/include/clang/Frontend/FrontendAction.h b/include/clang/Frontend/FrontendAction.h index 1171f1f95a..9945be79b7 100644 --- a/include/clang/Frontend/FrontendAction.h +++ b/include/clang/Frontend/FrontendAction.h @@ -144,8 +144,8 @@ public: /// hasPCHSupport - Does this action support use with PCH? virtual bool hasPCHSupport() const { return !usesPreprocessorOnly(); } - /// hasASTSupport - Does this action support use with AST files? - virtual bool hasASTSupport() const { return !usesPreprocessorOnly(); } + /// hasASTFileSupport - Does this action support use with AST files? + virtual bool hasASTFileSupport() const { return !usesPreprocessorOnly(); } /// hasCodeCompletionSupport - Does this action support use with code /// completion? diff --git a/include/clang/Frontend/FrontendActions.h b/include/clang/Frontend/FrontendActions.h index cee1c1d2be..2e22435422 100644 --- a/include/clang/Frontend/FrontendActions.h +++ b/include/clang/Frontend/FrontendActions.h @@ -87,7 +87,7 @@ protected: virtual void EndSourceFileAction(); - virtual bool hasASTSupport() const { return false; } + virtual bool hasASTFileSupport() const { return false; } public: FixItAction(); @@ -101,7 +101,7 @@ protected: virtual bool usesCompleteTranslationUnit() { return false; } - virtual bool hasASTSupport() const { return false; } + virtual bool hasASTFileSupport() const { return false; } }; class HTMLPrintAction : public ASTFrontendAction { @@ -170,7 +170,7 @@ public: virtual bool usesPreprocessorOnly() const; virtual bool usesCompleteTranslationUnit(); virtual bool hasPCHSupport() const; - virtual bool hasASTSupport() const; + virtual bool hasASTFileSupport() const; virtual bool hasCodeCompletionSupport() const; }; diff --git a/lib/Frontend/ASTMerge.cpp b/lib/Frontend/ASTMerge.cpp index b0faf0ae86..8118631d5c 100644 --- a/lib/Frontend/ASTMerge.cpp +++ b/lib/Frontend/ASTMerge.cpp @@ -95,8 +95,8 @@ bool ASTMergeAction::hasPCHSupport() const { return AdaptedAction->hasPCHSupport(); } -bool ASTMergeAction::hasASTSupport() const { - return AdaptedAction->hasASTSupport(); +bool ASTMergeAction::hasASTFileSupport() const { + return AdaptedAction->hasASTFileSupport(); } bool ASTMergeAction::hasCodeCompletionSupport() const { diff --git a/lib/Frontend/FrontendAction.cpp b/lib/Frontend/FrontendAction.cpp index 633b82c2e0..92137a6dc5 100644 --- a/lib/Frontend/FrontendAction.cpp +++ b/lib/Frontend/FrontendAction.cpp @@ -43,7 +43,8 @@ bool FrontendAction::BeginSourceFile(CompilerInstance &CI, if (InputKind == IK_AST) { assert(!usesPreprocessorOnly() && "Attempt to pass AST file to preprocessor only action!"); - assert(hasASTSupport() && "This action does not have AST support!"); + assert(hasASTFileSupport() && + "This action does not have AST file support!"); llvm::IntrusiveRefCntPtr<Diagnostic> Diags(&CI.getDiagnostics()); std::string Error; |