From 9503c46a2efbd2d698a9e6fc12592b26ddf184d6 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Tue, 16 Feb 2010 00:04:46 +0000 Subject: Don't import __va_list_tag or __builtin_va_list when merging llvm-svn: 96299 --- clang/lib/Frontend/ASTMerge.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'clang/lib/Frontend/ASTMerge.cpp') diff --git a/clang/lib/Frontend/ASTMerge.cpp b/clang/lib/Frontend/ASTMerge.cpp index 821863e..3f74e42 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(*D)) + if (IdentifierInfo *II = ND->getIdentifier()) + if (II->isStr("__va_list_tag") || II->isStr("__builtin_va_list")) + continue; + Importer.Import(*D); } -- cgit v1.1