[next] Handle new BTFTagAttributedType

Introduced in llvm/llvm-project
3251ba2d0fcf5223fce3e270b91c54f548664b4e.

Author: bnbarham

include/swift/ClangImporter/SwiftAbstractBasicReader.h

@@ -89,6 +89,11 @@ class DataStreamBasicReader
     clang::QualType type = asImpl().readTypeRef();
     return getASTContext().getQualifiedType(type, quals);
   }
+
+  const clang::BTFTypeTagAttr *readBTFTypeTagAttr() {
+    llvm::report_fatal_error("Read BTFTypeTagAttr that should never have been"
+                             " serialized");
+  }
 };
 
 }

include/swift/ClangImporter/SwiftAbstractBasicWriter.h

@@ -21,6 +21,7 @@
 #define SWIFT_CLANGIMPORTER_SWIFTABSTRACTBASICWRITER_H
 
 #include "clang/AST/AbstractTypeWriter.h"
+#include "clang/AST/Type.h"
 
 namespace swift {
 
@@ -80,11 +81,24 @@ class DataStreamBasicWriter
     assert(!type.isNull());
 
     auto split = type.split();
-    asImpl().writeQualifiers(split.Quals);
+    auto qualifiers = split.Quals;
 
+    // Unwrap BTFTagAttributeType and merge any of its qualifiers.
+    while (auto btfType = dyn_cast<clang::BTFTagAttributedType>(split.Ty)) {
+      split = btfType->getWrappedType().split();
+      qualifiers.addQualifiers(split.Quals);
+    }
+
+    asImpl().writeQualifiers(qualifiers);
     // Just recursively visit the given type.
     asImpl().writeTypeRef(split.Ty);
   }
+
+  void writeBTFTypeTagAttr(const clang::BTFTypeTagAttr *attr) {
+    // BTFTagAttributeType is explicitly unwrapped above, so we should never
+    // hit any of its attributes.
+    llvm::report_fatal_error("Should never hit BTFTypeTagAttr serialization");
+  }
 };
 
 }

lib/ClangImporter/ImportType.cpp

@@ -930,6 +930,7 @@ namespace {
     SUGAR_TYPE(SubstTemplateTypeParm)
     SUGAR_TYPE(Elaborated)
     SUGAR_TYPE(Using)
+    SUGAR_TYPE(BTFTagAttributed)
 
     ImportResult VisitDecayedType(const clang::DecayedType *type) {
       clang::ASTContext &clangCtx = Impl.getClangASTContext();