Revert "[clang] ASTImporter: Fix importing of va_list types and decla…

…rations" This reverts commit 5f820c0. Apparently it breaks aarch64 buildbots. https://lab.llvm.org/buildbot#builders/188/builds/21591
llvm · Oct 31, 2022 · ee1f132 · ee1f132
1 parent d9232e3
commit ee1f132
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 503 deletions.
diff --git a/clang-tools-extra/clang-tidy/altera/StructPackAlignCheck.cpp b/clang-tools-extra/clang-tidy/altera/StructPackAlignCheck.cpp
@@ -19,11 +19,10 @@ namespace tidy {
 namespace altera {
 
 void StructPackAlignCheck::registerMatchers(MatchFinder *Finder) {
-  Finder->addMatcher(
-      recordDecl(isStruct(), isDefinition(),
-                 unless(anyOf(isExpansionInSystemHeader(), isImplicit())))
-          .bind("struct"),
-      this);
+  Finder->addMatcher(recordDecl(isStruct(), isDefinition(),
+                                unless(isExpansionInSystemHeader()))
+                         .bind("struct"),
+                     this);
 }
 
 CharUnits

diff --git a/clang-tools-extra/clang-tidy/utils/RenamerClangTidyCheck.cpp b/clang-tools-extra/clang-tidy/utils/RenamerClangTidyCheck.cpp
@@ -111,10 +111,7 @@ void RenamerClangTidyCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) {
 }
 
 void RenamerClangTidyCheck::registerMatchers(MatchFinder *Finder) {
-  Finder->addMatcher(
-      namedDecl(unless(anyOf(isImplicit(), hasDeclContext(isImplicit()))))
-          .bind("decl"),
-      this);
+  Finder->addMatcher(namedDecl().bind("decl"), this);
   Finder->addMatcher(usingDecl().bind("using"), this);
   Finder->addMatcher(declRefExpr().bind("declRef"), this);
   Finder->addMatcher(cxxConstructorDecl(unless(isImplicit())).bind("classRef"),

diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
@@ -268,7 +268,6 @@ Bug Fixes
   functions. `Issue 56154 <https://github.com/llvm/llvm-project/issues/56154>`_
 - Fix handling of unexpanded packs in template argument expressions.
   `Issue 58679 <https://github.com/llvm/llvm-project/issues/58679>`_
-- Fix importing of va_list types and declarations.
 
 Improvements to Clang's diagnostics
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

diff --git 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) {

diff --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp
@@ -449,26 +449,6 @@ void Sema::Initialize() {
       PushOnScopeChains(Context.getBuiltinMSVaListDecl(), TUScope);
   }
 
-  if (auto *ND = dyn_cast_if_present<NamedDecl>(Context.getVaListTagDecl())) {
-    if (auto *DC = ND->getLexicalDeclContext(); DC->isStdNamespace()) {
-      auto *NS = cast<NamespaceDecl>(DC);
-      if (!StdNamespace)
-        StdNamespace = NS;
-      if (!Context.getTranslationUnitDecl()->containsDecl(NS))
-        PushOnScopeChains(NS, TUScope);
-      if (!DC->containsDecl(ND)) {
-        Scope S(TUScope, Scope::DeclScope, getDiagnostics());
-        PushDeclContext(&S, DC);
-        PushOnScopeChains(ND, &S);
-        PopDeclContext();
-      }
-    } else {
-      assert(DC == Context.getTranslationUnitDecl());
-      if (!DC->containsDecl(ND))
-        PushOnScopeChains(ND, TUScope);
-    }
-  }
-
   DeclarationName BuiltinVaList = &Context.Idents.get("__builtin_va_list");
   if (IdResolver.begin(BuiltinVaList) == IdResolver.end())
     PushOnScopeChains(Context.getBuiltinVaListDecl(), TUScope);

diff --git a/clang/test/AST/ast-dump-file-line-json.c b/clang/test/AST/ast-dump-file-line-json.c
@@ -129,82 +129,6 @@ int e;
 // CHECK-NEXT:   },
 // CHECK-NEXT:   {
 // CHECK-NEXT:    "id": "0x{{.*}}",
-// CHECK-NEXT:    "kind": "RecordDecl",
-// CHECK-NEXT:    "loc": {},
-// CHECK-NEXT:    "range": {
-// CHECK-NEXT:     "begin": {},
-// CHECK-NEXT:     "end": {}
-// CHECK-NEXT:    },
-// CHECK-NEXT:    "isImplicit": true,
-// CHECK-NEXT:    "name": "__va_list_tag",
-// CHECK-NEXT:    "tagUsed": "struct",
-// CHECK-NEXT:    "completeDefinition": true,
-// CHECK-NEXT:    "inner": [
-// CHECK-NEXT:     {
-// CHECK-NEXT:      "id": "0x{{.*}}",
-// CHECK-NEXT:      "kind": "TypeVisibilityAttr",
-// CHECK-NEXT:      "range": {
-// CHECK-NEXT:       "begin": {},
-// CHECK-NEXT:       "end": {}
-// CHECK-NEXT:      },
-// CHECK-NEXT:      "implicit": true
-// CHECK-NEXT:     },
-// CHECK-NEXT:     {
-// CHECK-NEXT:      "id": "0x{{.*}}",
-// CHECK-NEXT:      "kind": "FieldDecl",
-// CHECK-NEXT:      "loc": {},
-// CHECK-NEXT:      "range": {
-// CHECK-NEXT:       "begin": {},
-// CHECK-NEXT:       "end": {}
-// CHECK-NEXT:      },
-// CHECK-NEXT:      "name": "gp_offset",
-// CHECK-NEXT:      "type": {
-// CHECK-NEXT:       "qualType": "unsigned int"
-// CHECK-NEXT:      }
-// CHECK-NEXT:     },
-// CHECK-NEXT:     {
-// CHECK-NEXT:      "id": "0x{{.*}}",
-// CHECK-NEXT:      "kind": "FieldDecl",
-// CHECK-NEXT:      "loc": {},
-// CHECK-NEXT:      "range": {
-// CHECK-NEXT:       "begin": {},
-// CHECK-NEXT:       "end": {}
-// CHECK-NEXT:      },
-// CHECK-NEXT:      "name": "fp_offset",
-// CHECK-NEXT:      "type": {
-// CHECK-NEXT:       "qualType": "unsigned int"
-// CHECK-NEXT:      }
-// CHECK-NEXT:     },
-// CHECK-NEXT:     {
-// CHECK-NEXT:      "id": "0x{{.*}}",
-// CHECK-NEXT:      "kind": "FieldDecl",
-// CHECK-NEXT:      "loc": {},
-// CHECK-NEXT:      "range": {
-// CHECK-NEXT:       "begin": {},
-// CHECK-NEXT:       "end": {}
-// CHECK-NEXT:      },
-// CHECK-NEXT:      "name": "overflow_arg_area",
-// CHECK-NEXT:      "type": {
-// CHECK-NEXT:       "qualType": "void *"
-// CHECK-NEXT:      }
-// CHECK-NEXT:     },
-// CHECK-NEXT:     {
-// CHECK-NEXT:      "id": "0x{{.*}}",
-// CHECK-NEXT:      "kind": "FieldDecl",
-// CHECK-NEXT:      "loc": {},
-// CHECK-NEXT:      "range": {
-// CHECK-NEXT:       "begin": {},
-// CHECK-NEXT:       "end": {}
-// CHECK-NEXT:      },
-// CHECK-NEXT:      "name": "reg_save_area",
-// CHECK-NEXT:      "type": {
-// CHECK-NEXT:       "qualType": "void *"
-// CHECK-NEXT:      }
-// CHECK-NEXT:     }
-// CHECK-NEXT:    ]
-// CHECK-NEXT:   },
-// CHECK-NEXT:   {
-// CHECK-NEXT:    "id": "0x{{.*}}",
 // CHECK-NEXT:    "kind": "TypedefDecl",
 // CHECK-NEXT:    "loc": {},
 // CHECK-NEXT:    "range": {

diff --git a/clang/test/AST/ast-dump-overloaded-operators.cpp b/clang/test/AST/ast-dump-overloaded-operators.cpp
@@ -24,7 +24,7 @@ void test() {
 // CHECK-NEXT: |-FunctionDecl {{.*}} <line:12:1, col:19> col:6{{( imported)?}} used operator, 'void (E, E)'
 // CHECK-NEXT: | |-ParmVarDecl {{.*}} <col:16> col:17{{( imported)?}} 'E'
 // CHECK-NEXT: | `-ParmVarDecl {{.*}} <col:18> col:19{{( imported)?}} 'E'
-// CHECK-NEXT:  -FunctionDecl {{.*}} <line:14:1, line:18:1> line:14:6{{( imported)?}} test 'void ()'
+// CHECK-NEXT: `-FunctionDecl {{.*}} <line:14:1, line:18:1> line:14:6{{( imported)?}} test 'void ()'
 // CHECK-NEXT:   `-CompoundStmt {{.*}} <col:13, line:18:1>
 // CHECK-NEXT:     |-DeclStmt {{.*}} <line:15:3, col:6>
 // CHECK-NEXT:     | `-VarDecl {{.*}} <col:3, col:5> col:5{{( imported)?}} used e 'E'

diff --git a/clang/test/AST/ast-dump-record-definition-data-json.cpp b/clang/test/AST/ast-dump-record-definition-data-json.cpp
@@ -132,128 +132,6 @@ struct DoesNotAllowConstDefaultInit {
 // CHECK-NEXT:  "name": "__NSConstantString_tag"
 // CHECK-NEXT: }
 
-// CHECK-NOT: {{^}}Dumping
-// CHECK:  "kind": "CXXRecordDecl",
-// CHECK-NEXT:  "loc": {},
-// CHECK-NEXT:  "range": {
-// CHECK-NEXT:   "begin": {},
-// CHECK-NEXT:   "end": {}
-// CHECK-NEXT:  },
-// CHECK-NEXT:  "isImplicit": true,
-// CHECK-NEXT:  "name": "__va_list_tag",
-// CHECK-NEXT:  "tagUsed": "struct",
-// CHECK-NEXT:  "completeDefinition": true,
-// CHECK-NEXT:  "definitionData": {
-// CHECK-NEXT:   "canPassInRegisters": true,
-// CHECK-NEXT:   "copyAssign": {
-// CHECK-NEXT:    "hasConstParam": true,
-// CHECK-NEXT:    "implicitHasConstParam": true,
-// CHECK-NEXT:    "needsImplicit": true,
-// CHECK-NEXT:    "simple": true,
-// CHECK-NEXT:    "trivial": true
-// CHECK-NEXT:   },
-// CHECK-NEXT:   "copyCtor": {
-// CHECK-NEXT:    "hasConstParam": true,
-// CHECK-NEXT:    "implicitHasConstParam": true,
-// CHECK-NEXT:    "needsImplicit": true,
-// CHECK-NEXT:    "simple": true,
-// CHECK-NEXT:    "trivial": true
-// CHECK-NEXT:   },
-// CHECK-NEXT:   "defaultCtor": {
-// CHECK-NEXT:    "exists": true,
-// CHECK-NEXT:    "needsImplicit": true,
-// CHECK-NEXT:    "trivial": true
-// CHECK-NEXT:   },
-// CHECK-NEXT:   "dtor": {
-// CHECK-NEXT:    "irrelevant": true,
-// CHECK-NEXT:    "needsImplicit": true,
-// CHECK-NEXT:    "simple": true,
-// CHECK-NEXT:    "trivial": true
-// CHECK-NEXT:   },
-// CHECK-NEXT:   "isAggregate": true,
-// CHECK-NEXT:   "isLiteral": true,
-// CHECK-NEXT:   "isPOD": true,
-// CHECK-NEXT:   "isStandardLayout": true,
-// CHECK-NEXT:   "isTrivial": true,
-// CHECK-NEXT:   "isTriviallyCopyable": true,
-// CHECK-NEXT:   "moveAssign": {
-// CHECK-NEXT:    "exists": true,
-// CHECK-NEXT:    "needsImplicit": true,
-// CHECK-NEXT:    "simple": true,
-// CHECK-NEXT:    "trivial": true
-// CHECK-NEXT:   },
-// CHECK-NEXT:   "moveCtor": {
-// CHECK-NEXT:    "exists": true,
-// CHECK-NEXT:    "needsImplicit": true,
-// CHECK-NEXT:    "simple": true,
-// CHECK-NEXT:    "trivial": true
-// CHECK-NEXT:   }
-// CHECK-NEXT:  },
-// CHECK-NEXT:  "inner": [
-// CHECK-NEXT:   {
-// CHECK-NEXT:    "id": "0x{{.*}}",
-// CHECK-NEXT:    "kind": "TypeVisibilityAttr",
-// CHECK-NEXT:    "range": {
-// CHECK-NEXT:     "begin": {},
-// CHECK-NEXT:     "end": {}
-// CHECK-NEXT:    },
-// CHECK-NEXT:    "implicit": true
-// CHECK-NEXT:   },
-// CHECK-NEXT:   {
-// CHECK-NEXT:    "id": "0x{{.*}}",
-// CHECK-NEXT:    "kind": "FieldDecl",
-// CHECK-NEXT:    "loc": {},
-// CHECK-NEXT:    "range": {
-// CHECK-NEXT:     "begin": {},
-// CHECK-NEXT:     "end": {}
-// CHECK-NEXT:    },
-// CHECK-NEXT:    "name": "gp_offset",
-// CHECK-NEXT:    "type": {
-// CHECK-NEXT:     "qualType": "unsigned int"
-// CHECK-NEXT:    }
-// CHECK-NEXT:   },
-// CHECK-NEXT:   {
-// CHECK-NEXT:    "id": "0x{{.*}}",
-// CHECK-NEXT:    "kind": "FieldDecl",
-// CHECK-NEXT:    "loc": {},
-// CHECK-NEXT:    "range": {
-// CHECK-NEXT:     "begin": {},
-// CHECK-NEXT:     "end": {}
-// CHECK-NEXT:    },
-// CHECK-NEXT:    "name": "fp_offset",
-// CHECK-NEXT:    "type": {
-// CHECK-NEXT:     "qualType": "unsigned int"
-// CHECK-NEXT:    }
-// CHECK-NEXT:   },
-// CHECK-NEXT:   {
-// CHECK-NEXT:    "id": "0x{{.*}}",
-// CHECK-NEXT:    "kind": "FieldDecl",
-// CHECK-NEXT:    "loc": {},
-// CHECK-NEXT:    "range": {
-// CHECK-NEXT:     "begin": {},
-// CHECK-NEXT:     "end": {}
-// CHECK-NEXT:    },
-// CHECK-NEXT:    "name": "overflow_arg_area",
-// CHECK-NEXT:    "type": {
-// CHECK-NEXT:     "qualType": "void *"
-// CHECK-NEXT:    }
-// CHECK-NEXT:   },
-// CHECK-NEXT:   {
-// CHECK-NEXT:    "id": "0x{{.*}}",
-// CHECK-NEXT:    "kind": "FieldDecl",
-// CHECK-NEXT:    "loc": {},
-// CHECK-NEXT:    "range": {
-// CHECK-NEXT:     "begin": {},
-// CHECK-NEXT:     "end": {}
-// CHECK-NEXT:    },
-// CHECK-NEXT:    "name": "reg_save_area",
-// CHECK-NEXT:    "type": {
-// CHECK-NEXT:     "qualType": "void *"
-// CHECK-NEXT:    }
-// CHECK-NEXT:   }
-// CHECK-NEXT:  ]
-// CHECK-NEXT: }
-
 // CHECK-NOT: {{^}}Dumping
 // CHECK:  "kind": "CXXRecordDecl",
 // CHECK-NEXT:  "name": "__va_list_tag"