diff options
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 6ec0e2a98c1b..2434113ab0db 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 {  | 
