diff options
| author | Balazs Keri <1.int32@gmail.com> | 2019-04-08 13:59:15 +0000 |
|---|---|---|
| committer | Balazs Keri <1.int32@gmail.com> | 2019-04-08 13:59:15 +0000 |
| commit | a1f6b103f3964bcdf434e2c45428b4f097454cb6 (patch) | |
| tree | 7fb055f9aa20b8398ca415a2be022692311ada1c /clang/lib/Frontend/ASTMerge.cpp | |
| parent | 50c3b290ed8749b568439908adcfca85df33535d (diff) | |
| download | bcm5719-llvm-a1f6b103f3964bcdf434e2c45428b4f097454cb6.tar.gz bcm5719-llvm-a1f6b103f3964bcdf434e2c45428b4f097454cb6.zip | |
Changed every use of ASTImporter::Import to Import_New
Reviewers: a.sidorin, shafik, martong, a_sidorin
Reviewed By: a_sidorin
Subscribers: rnkovacs, dkrupp, martong, Szelethus, gamesh411, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D55049
llvm-svn: 357913
Diffstat (limited to 'clang/lib/Frontend/ASTMerge.cpp')
| -rw-r--r-- | clang/lib/Frontend/ASTMerge.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/clang/lib/Frontend/ASTMerge.cpp b/clang/lib/Frontend/ASTMerge.cpp index f4aacbb76bf..b995d25441e 100644 --- a/clang/lib/Frontend/ASTMerge.cpp +++ b/clang/lib/Frontend/ASTMerge.cpp @@ -65,11 +65,13 @@ void ASTMergeAction::ExecuteAction() { if (II->isStr("__va_list_tag") || II->isStr("__builtin_va_list")) continue; - Decl *ToD = Importer.Import(D); + llvm::Expected<Decl *> ToDOrError = Importer.Import_New(D); - if (ToD) { - DeclGroupRef DGR(ToD); + if (ToDOrError) { + DeclGroupRef DGR(*ToDOrError); CI.getASTConsumer().HandleTopLevelDecl(DGR); + } else { + llvm::consumeError(ToDOrError.takeError()); } } } |
