diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2018-08-02 17:33:11 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2018-08-02 17:33:11 +0000 |
| commit | c7e70c433efc6953dc3888b9fbf9f3512d7da2b0 (patch) | |
| tree | 27425930fc0c91650a7f3527fcac8e0f92907b90 /lib/Frontend/ASTMerge.cpp | |
| parent | 486754660bb926339aefcf012a3f848592babb8b (diff) | |
Notes
Diffstat (limited to 'lib/Frontend/ASTMerge.cpp')
| -rw-r--r-- | lib/Frontend/ASTMerge.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/Frontend/ASTMerge.cpp b/lib/Frontend/ASTMerge.cpp index 6ec0e2a98c1b1..2434113ab0dbb 100644 --- a/lib/Frontend/ASTMerge.cpp +++ b/lib/Frontend/ASTMerge.cpp @@ -51,9 +51,9 @@ void ASTMergeAction::ExecuteAction() { if (!Unit) continue; - ASTImporter Importer(CI.getASTContext(), + ASTImporter Importer(CI.getASTContext(), CI.getFileManager(), - Unit->getASTContext(), + Unit->getASTContext(), Unit->getFileManager(), /*MinimalImport=*/false); @@ -64,9 +64,9 @@ void ASTMergeAction::ExecuteAction() { if (IdentifierInfo *II = ND->getIdentifier()) if (II->isStr("__va_list_tag") || II->isStr("__builtin_va_list")) continue; - + Decl *ToD = Importer.Import(D); - + if (ToD) { DeclGroupRef DGR(ToD); CI.getASTConsumer().HandleTopLevelDecl(DGR); @@ -88,7 +88,7 @@ ASTMergeAction::ASTMergeAction(std::unique_ptr<FrontendAction> adaptedAction, assert(AdaptedAction && "ASTMergeAction needs an action to adapt"); } -ASTMergeAction::~ASTMergeAction() { +ASTMergeAction::~ASTMergeAction() { } bool ASTMergeAction::usesPreprocessorOnly() const { |