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 | 9503c46a2efbd2d698a9e6fc12592b26ddf184d6 (patch) | |
| tree | 9eab914371272f1bfc5dd03f229ef77667bd6228 /clang/lib/Frontend/ASTMerge.cpp | |
| parent | b4964f7705679d42efe646178d68377db15a80c0 (diff) | |
| download | bcm5719-llvm-9503c46a2efbd2d698a9e6fc12592b26ddf184d6.tar.gz bcm5719-llvm-9503c46a2efbd2d698a9e6fc12592b26ddf184d6.zip | |
Don't import __va_list_tag or __builtin_va_list when merging
llvm-svn: 96299
Diffstat (limited to 'clang/lib/Frontend/ASTMerge.cpp')
| -rw-r--r-- | clang/lib/Frontend/ASTMerge.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/clang/lib/Frontend/ASTMerge.cpp b/clang/lib/Frontend/ASTMerge.cpp index 821863e0762..3f74e42626e 100644 --- a/clang/lib/Frontend/ASTMerge.cpp +++ b/clang/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); } |
