[cfe-commits] r96299 - /cfe/trunk/lib/Frontend/ASTMerge.cpp

[Douglas Gregor]

Author: dgregor
Date: Mon Feb 15 18:04:46 2010
New Revision: 96299

URL: http://llvm.org/viewvc/llvm-project?rev=96299&view=rev
Log:
Don't import __va_list_tag or __builtin_va_list when merging

Modified:
    cfe/trunk/lib/Frontend/ASTMerge.cpp

Modified: cfe/trunk/lib/Frontend/ASTMerge.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/ASTMerge.cpp?rev=96299&r1=96298&r2=96299&view=diff

==============================================================================
--- cfe/trunk/lib/Frontend/ASTMerge.cpp (original)
+++ cfe/trunk/lib/Frontend/ASTMerge.cpp Mon Feb 15 18:04:46 2010
@@ -52,6 +52,12 @@
     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);
     }