Integrate LLVM at llvm/llvm-project@cb2f0d0a5f14

Updates LLVM usage to match
[cb2f0d0a5f14](llvm/llvm-project@cb2f0d0a5f14)

PiperOrigin-RevId: 802610159
Change-Id: I3aaba88e74b0597f1534c1f3f4255d176b1265e5

Author: Sandboxed API Team

sandboxed_api/tools/clang_generator/emitter_base.cc

@@ -109,10 +109,13 @@ std::string PrintRecordTemplateArguments(const clang::CXXRecordDecl* record) {
 }
 
 // Serializes the given Clang AST declaration back into compilable source code.
-std::string PrintDecl(const clang::Decl* decl) {
+std::string PrintDecl(const clang::Decl* decl,
+                      bool IncludeTagDefinition = false) {
   std::string pretty;
   llvm::raw_string_ostream os(pretty);
-  decl->print(os);
+  clang::PrintingPolicy policy = decl->getASTContext().getPrintingPolicy();
+  policy.IncludeTagDefinition = IncludeTagDefinition;
+  decl->print(os, policy);
   return pretty;
 }
 
@@ -181,7 +184,7 @@ std::string GetSpelling(const clang::Decl* decl) {
       //  - types without no user-defined methods (including constructors)
       if (record_decl->hasDefinition() && record_decl->isAggregate() &&
           (record_decl->isPOD() || record_decl->methods().empty())) {
-        return PrintDecl(decl);
+        return PrintDecl(decl, /*IncludeTagDefinition=*/true);
       }
 
       // Remaining declarations that are:

sandboxed_api/tools/clang_generator/generator.cc

@@ -423,18 +423,21 @@ bool GeneratorFactory::runInvocation(
            "__builtin_ia32_vec_init_v8qi=[](auto, auto, auto, auto, auto, "
            "auto, auto, auto)->long long{return 0;}",
            // AVX
-           "__builtin_ia32_vpopcntb_128=",
-           "__builtin_ia32_vpopcntb_256=",
-           "__builtin_ia32_vpopcntb_512=",
-           "__builtin_ia32_vpopcntd_128=",
-           "__builtin_ia32_vpopcntd_256=",
-           "__builtin_ia32_vpopcntd_512=",
-           "__builtin_ia32_vpopcntq_128=",
-           "__builtin_ia32_vpopcntq_256=",
-           "__builtin_ia32_vpopcntq_512=",
-           "__builtin_ia32_vpopcntw_128=",
-           "__builtin_ia32_vpopcntw_256=",
-           "__builtin_ia32_vpopcntw_512=",
+           "__builtin_ia32_prolvd128=",
+           "__builtin_ia32_prolvd256=",
+           "__builtin_ia32_prolvd512=",
+           "__builtin_ia32_prolvq128=",
+           "__builtin_ia32_prolvq256=",
+           "__builtin_ia32_prolvq512=",
+           "__builtin_ia32_prorvd128=",
+           "__builtin_ia32_prorvd256=",
+           "__builtin_ia32_prorvd512=",
+           "__builtin_ia32_prorvq128=",
+           "__builtin_ia32_prorvq256=",
+           "__builtin_ia32_prorvq512=",
+           "__builtin_ia32_vcvtph2ps=",
+           "__builtin_ia32_vcvtph2ps256=[](auto) -> __m256{return {0, 0, 0, 0, "
+           "0, 0, 0, 0};}",
            "__builtin_ia32_vcvttpd2dqs256_round_mask=[](auto, auto, auto, "
            "auto)->__m128i {return __m128i();}",
            "__builtin_ia32_vcvttpd2udqs256_round_mask=[](auto, auto, auto, "
@@ -453,6 +456,40 @@ bool GeneratorFactory::runInvocation(
            "auto)->__m256i {return __m256i();}",
            "__builtin_ia32_vcvttps2uqqs512_round_mask=[](auto, auto, auto, "
            "auto)->__m512i {return __m512i();}",
+           "__builtin_ia32_vpopcntb_128=",
+           "__builtin_ia32_vpopcntb_256=",
+           "__builtin_ia32_vpopcntb_512=",
+           "__builtin_ia32_vpopcntd_128=",
+           "__builtin_ia32_vpopcntd_256=",
+           "__builtin_ia32_vpopcntd_512=",
+           "__builtin_ia32_vpopcntq_128=",
+           "__builtin_ia32_vpopcntq_256=",
+           "__builtin_ia32_vpopcntq_512=",
+           "__builtin_ia32_vpopcntw_128=",
+           "__builtin_ia32_vpopcntw_256=",
+           "__builtin_ia32_vpopcntw_512=",
+           "__builtin_ia32_vprotd=",
+           "__builtin_ia32_vprotq=",
+           "__builtin_ia32_vprotb=",
+           "__builtin_ia32_vprotw=",
+           "__builtin_ia32_vpshldvd128=",
+           "__builtin_ia32_vpshldvd256=",
+           "__builtin_ia32_vpshldvd512=",
+           "__builtin_ia32_vpshldvq128=",
+           "__builtin_ia32_vpshldvq256=",
+           "__builtin_ia32_vpshldvq512=",
+           "__builtin_ia32_vpshldvw128=",
+           "__builtin_ia32_vpshldvw256=",
+           "__builtin_ia32_vpshldvw512=",
+           "__builtin_ia32_vpshrdvd128=",
+           "__builtin_ia32_vpshrdvd256=",
+           "__builtin_ia32_vpshrdvd512=",
+           "__builtin_ia32_vpshrdvq128=",
+           "__builtin_ia32_vpshrdvq256=",
+           "__builtin_ia32_vpshrdvq512=",
+           "__builtin_ia32_vpshrdvw128=",
+           "__builtin_ia32_vpshrdvw256=",
+           "__builtin_ia32_vpshrdvw512=",
 
            // Trick <prfchwintrin.h> from being included by defining its header
            // guard.

sandboxed_api/tools/clang_generator/types.cc

@@ -144,15 +144,15 @@ void TypeCollector::CollectRelatedTypes(clang::QualType qual) {
   // - Nested types are skipped and the enclosing type is collected which is
   //   enough to reconstruct the AST when emitting the SAPI header.
   if (const auto* record_type = qual->getAs<clang::RecordType>()) {
-    const clang::RecordDecl* decl = record_type->getDecl();
+    const clang::RecordDecl* decl = record_type->getOriginalDecl();
     if (!IsProtoBuf(decl)) {
       for (const clang::FieldDecl* field : decl->fields()) {
         CollectRelatedTypes(field->getType());
       }
     }
     const clang::RecordDecl* outer = decl->getOuterLexicalRecordContext();
     decl = outer ? outer : decl;
-    collected_.insert(clang::QualType(decl->getTypeForDecl(), /*Quals=*/0));
+    collected_.insert(decl->getASTContext().getCanonicalTagType(decl));
   }
 
   // For TypedefType; Collect the underlying type.
@@ -205,8 +205,10 @@ void TypeCollector::CollectRelatedTypes(clang::QualType qual) {
   // For Enumtype, recursively call CollectRelatedTypes to collect the
   // underlying integer type of enum classes as well, as it may be a typedef.
   if (qual->isEnumeralType()) {
+    qual = qual.getCanonicalType();
     if (const clang::EnumType* enum_type = qual->getAs<clang::EnumType>()) {
-      if (const clang::EnumDecl* decl = enum_type->getDecl(); decl->isFixed()) {
+      if (const clang::EnumDecl* decl = enum_type->getOriginalDecl();
+          decl->isFixed()) {
         CollectRelatedTypes(decl->getIntegerType());
       }
     }
@@ -417,9 +419,10 @@ std::string TypeMapper::MapQualType(clang::QualType qual) const {
         break;
     }
   } else if (const auto* enum_type = qual->getAs<clang::EnumType>()) {
-    clang::EnumDecl* enum_decl = enum_type->getDecl();
+    clang::EnumDecl* enum_decl = enum_type->getOriginalDecl();
     if (auto* typedef_decl = enum_decl->getTypedefNameForAnonDecl()) {
-      qual = typedef_decl->getUnderlyingType().getDesugaredType(context_);
+      qual = context_.getTypedefType(clang::ElaboratedTypeKeyword::None,
+                                     /*Qualifier=*/std::nullopt, typedef_decl);
     }
     return absl::StrCat("::sapi::v::IntBase<",
                         GetFullyQualifiedName(context_, qual, ns_to_strip_),

sandboxed_api/tools/python_generator/code.py

@@ -251,6 +251,10 @@ def get_pointee(self):
     # type: () -> Type
     return Type(self._tu, self._clang_type.get_pointee())
 
+  def get_canonical(self):
+    # type: () -> Type
+    return Type(self._tu, self._clang_type.get_canonical())
+
   def _get_declaration(self):
     # type: () -> cindex.Cursor
     decl = self._clang_type.get_declaration()
@@ -334,7 +338,7 @@ def _get_related_types_of_record(self, result, skip_self=False):
     decl = self._get_declaration()
     if not decl.is_anonymous() and not skip_self:
       self._tu.search_for_macro_name(decl)
-      result.add(self)
+      result.add(self.get_canonical())
 
     for f in self._clang_type.get_fields():
       self._tu.search_for_macro_name(f)

sandboxed_api/tools/python_generator/code_test.py

@@ -473,7 +473,7 @@ def testForwardDeclaration(self):
 
     names = [t._clang_type.spelling for t in generator._get_related_types()]
     self.assertEqual(
-        names, ['struct_6', 'struct_6p', 'function_p3', 'struct_6_def']
+        names, ['struct_6_def', 'struct_6', 'struct_6p', 'function_p3']
     )
 
     # Extra check for generation, in case rendering throws error for this test.