diff options
| author | Douglas Gregor <dgregor@apple.com> | 2010-02-16 00:04:46 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2010-02-16 00:04:46 +0000 |
| commit | 9a945853ca0c2b4cac07056542b19f25a83f1288 (patch) | |
| tree | ee7a5bfea6d55414632a050b67233503b6190f97 /lib/Frontend/ASTMerge.cpp | |
| parent | ea35d11905f756ad33b87bd89cd3ac1e7ce57994 (diff) | |
Don't import __va_list_tag or __builtin_va_list when merging
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@96299 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Frontend/ASTMerge.cpp')
| -rw-r--r-- | lib/Frontend/ASTMerge.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/Frontend/ASTMerge.cpp b/lib/Frontend/ASTMerge.cpp index 821863e076..3f74e42626 100644 --- a/lib/Frontend/ASTMerge.cpp +++ b/lib/Frontend/ASTMerge.cpp @@ -52,6 +52,12 @@ void ASTMergeAction::ExecuteAction() { for (DeclContext::decl_iterator D = TU->decls_begin(), DEnd = TU->decls_end(); D != DEnd; ++D) { + // Don't re-import __va_list_tag, __builtin_va_list. + if (NamedDecl *ND = dyn_cast<NamedDecl>(*D)) + if (IdentifierInfo *II = ND->getIdentifier()) + if (II->isStr("__va_list_tag") || II->isStr("__builtin_va_list")) + continue; + Importer.Import(*D); } |