From: Douglas Gregor <dgregor@apple.com>
Date: Tue, 16 Feb 2010 00:04:46 +0000 (+0000)
Subject: Don't import __va_list_tag or __builtin_va_list when merging
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a945853ca0c2b4cac07056542b19f25a83f1288;p=clang

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
---

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);
     }