aboutsummaryrefslogtreecommitdiff
path: root/clang/lib/Frontend/ASTMerge.cpp
diff options
context:
space:
mode:
authorMatheus Izvekov <mizvekov@gmail.com>2022-10-31 19:34:23 +0100
committerMatheus Izvekov <mizvekov@gmail.com>2022-10-31 19:34:23 +0100
commitee1f132d2c4d399be711275a62698ea9e766c199 (patch)
tree7cbb541bde2db5c6c072bb7a5fd5c5424353f9d6 /clang/lib/Frontend/ASTMerge.cpp
parentd9232e394e08ecba3d8e4128a11d30d9aa20605d (diff)
downloadllvm-ee1f132d2c4d399be711275a62698ea9e766c199.zip
llvm-ee1f132d2c4d399be711275a62698ea9e766c199.tar.gz
llvm-ee1f132d2c4d399be711275a62698ea9e766c199.tar.bz2
Revert "[clang] ASTImporter: Fix importing of va_list types and declarations"
This reverts commit 5f820c0f55cd9d4f4520cc92eae0a1c4afe05a54. Apparently it breaks aarch64 buildbots. https://lab.llvm.org/buildbot#builders/188/builds/21591
Diffstat (limited to 'clang/lib/Frontend/ASTMerge.cpp')
-rw-r--r--clang/lib/Frontend/ASTMerge.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/clang/lib/Frontend/ASTMerge.cpp b/clang/lib/Frontend/ASTMerge.cpp
index 7508668..14d781c 100644
--- a/clang/lib/Frontend/ASTMerge.cpp
+++ b/clang/lib/Frontend/ASTMerge.cpp
@@ -59,6 +59,12 @@ void ASTMergeAction::ExecuteAction() {
TranslationUnitDecl *TU = Unit->getASTContext().getTranslationUnitDecl();
for (auto *D : TU->decls()) {
+ // Don't re-import __va_list_tag, __builtin_va_list.
+ if (const auto *ND = dyn_cast<NamedDecl>(D))
+ if (IdentifierInfo *II = ND->getIdentifier())
+ if (II->isStr("__va_list_tag") || II->isStr("__builtin_va_list"))
+ continue;
+
llvm::Expected<Decl *> ToDOrError = Importer.Import(D);
if (ToDOrError) {