diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-08-18 20:39:29 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-08-18 20:39:29 +0000 |
| commit | 293534b1a50f7489f6d6e2c24aeccc8e7db88c05 (patch) | |
| tree | dc32e59f7a8de096b84d1202bbc73093e1747083 /clang/lib/Frontend/ASTMerge.cpp | |
| parent | 35b0eaf23d5fe90ad9a04f76488c212cb6f31210 (diff) | |
| download | bcm5719-llvm-293534b1a50f7489f6d6e2c24aeccc8e7db88c05.tar.gz bcm5719-llvm-293534b1a50f7489f6d6e2c24aeccc8e7db88c05.zip | |
Initialize the AST consumer as soon as we have both an ASTConsumer and an
ASTContext. Fixes some cases where we could previously initialize the AST
consumer more than once.
llvm-svn: 245346
Diffstat (limited to 'clang/lib/Frontend/ASTMerge.cpp')
| -rw-r--r-- | clang/lib/Frontend/ASTMerge.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/clang/lib/Frontend/ASTMerge.cpp b/clang/lib/Frontend/ASTMerge.cpp index 762c7a5da5e..b499fa2b0e6 100644 --- a/clang/lib/Frontend/ASTMerge.cpp +++ b/clang/lib/Frontend/ASTMerge.cpp @@ -59,7 +59,6 @@ void ASTMergeAction::ExecuteAction() { /*MinimalImport=*/false); TranslationUnitDecl *TU = Unit->getASTContext().getTranslationUnitDecl(); - CI.getASTConsumer().Initialize(CI.getASTContext()); for (auto *D : TU->decls()) { // Don't re-import __va_list_tag, __builtin_va_list. if (const auto *ND = dyn_cast<NamedDecl>(D)) |
