Fix other issues

Author: YexuanXiao

clang/include/clang/AST/ASTContext.h

@@ -1567,7 +1567,7 @@ class ASTContext : public RefCountedBase<ASTContext> {
   /// and bit count.
   QualType getDependentBitIntType(bool Unsigned, Expr *BitsExpr) const;
 
-  QualType getPredefinedSugarType(uint32_t KD) const;
+  QualType getPredefinedSugarType(PredefinedSugarType::Kind KD) const;
 
   /// Gets the struct used to keep track of the extended descriptor for
   /// pointer to blocks.

clang/include/clang/AST/Type.h

@@ -8066,20 +8066,25 @@ class PredefinedSugarType final : public Type {
   using Kind = PredefinedSugarKind;
 
 private:
-  PredefinedSugarType(Kind KD, QualType UnderlyingType)
-      : Type(PredefinedSugar, UnderlyingType->getCanonicalTypeInternal(),
-             TypeDependence::None) {
+  PredefinedSugarType(Kind KD, const IdentifierInfo *IdentName,
+                      QualType CanonicalType)
+      : Type(PredefinedSugar, CanonicalType, TypeDependence::None),
+        Name(IdentName) {
     PredefinedSugarTypeBits.Kind = llvm::to_underlying(KD);
   }
 
+  static StringRef getName(Kind KD);
+
+  const IdentifierInfo *Name;
+
 public:
   bool isSugared() const { return true; }
 
   QualType desugar() const { return getCanonicalTypeInternal(); }
 
   Kind getKind() const { return Kind(PredefinedSugarTypeBits.Kind); }
 
-  StringRef getName() const;
+  const IdentifierInfo *getIdentifier() const { return Name; }
 
   static bool classof(const Type *T) {
     return T->getTypeClass() == PredefinedSugar;

clang/include/clang/AST/TypeProperties.td

@@ -1034,6 +1034,6 @@ let Class = PredefinedSugarType in {
     let Read = [{ static_cast<uint32_t>(node->getKind()) }];
   }
   def : Creator<[{
-    return ctx.getPredefinedSugarType(kind);
+    return ctx.getPredefinedSugarType(static_cast<PredefinedSugarType::Kind>(kind));
   }]>;
 }

clang/lib/AST/ASTContext.cpp

@@ -1524,10 +1524,9 @@ void ASTContext::InitBuiltinTypes(const TargetInfo &Target,
     // Using PredefinedSugarType makes these types as named sugar types rather
     // than standard integer types, enabling better hints and diagnostics.
     using Kind = PredefinedSugarType::Kind;
-    SizeType = getPredefinedSugarType(llvm::to_underlying(Kind::SizeT));
-    SignedSizeType =
-        getPredefinedSugarType(llvm::to_underlying(Kind::SignedSizeT));
-    PtrdiffType = getPredefinedSugarType(llvm::to_underlying(Kind::PtrdiffT));
+    SizeType = getPredefinedSugarType(Kind::SizeT);
+    SignedSizeType = getPredefinedSugarType(Kind::SignedSizeT);
+    PtrdiffType = getPredefinedSugarType(Kind::PtrdiffT);
   } else {
     SizeType = getFromTargetType(Target.getSizeType());
     SignedSizeType = getFromTargetType(Target.getSignedSizeType());
@@ -5237,7 +5236,8 @@ QualType ASTContext::getDependentBitIntType(bool IsUnsigned,
   return QualType(New, 0);
 }
 
-QualType ASTContext::getPredefinedSugarType(uint32_t KD) const {
+QualType
+ASTContext::getPredefinedSugarType(PredefinedSugarType::Kind KD) const {
   using Kind = PredefinedSugarType::Kind;
   auto getCanonicalType = [](const ASTContext &Ctx, Kind KDI) -> QualType {
     switch (KDI) {
@@ -5250,8 +5250,9 @@ QualType ASTContext::getPredefinedSugarType(uint32_t KD) const {
     }
     llvm_unreachable("unexpected kind");
   };
-  auto *New = new (*this, alignof(PredefinedSugarType)) PredefinedSugarType(
-      static_cast<Kind>(KD), getCanonicalType(*this, static_cast<Kind>(KD)));
+  auto *New = new (*this, alignof(PredefinedSugarType))
+      PredefinedSugarType(KD, &Idents.get(PredefinedSugarType::getName(KD)),
+                          getCanonicalType(*this, static_cast<Kind>(KD)));
   Types.push_back(New);
   return QualType(New, 0);
 }

clang/lib/AST/ASTImporter.cpp

@@ -1895,8 +1895,7 @@ ExpectedType clang::ASTNodeImporter::VisitDependentBitIntType(
 
 ExpectedType clang::ASTNodeImporter::VisitPredefinedSugarType(
     const clang::PredefinedSugarType *T) {
-  return Importer.getToContext().getPredefinedSugarType(
-      llvm::to_underlying(T->getKind()));
+  return Importer.getToContext().getPredefinedSugarType(T->getKind());
 }
 
 ExpectedType clang::ASTNodeImporter::VisitDependentSizedMatrixType(

clang/lib/AST/Type.cpp

@@ -5623,8 +5623,8 @@ HLSLAttributedResourceType::findHandleTypeOnResource(const Type *RT) {
   return nullptr;
 }
 
-StringRef PredefinedSugarType::getName() const {
-  switch (getKind()) {
+StringRef PredefinedSugarType::getName(Kind KD) {
+  switch (KD) {
   case Kind::SizeT:
     return "__size_t";
   case Kind::SignedSizeT:

clang/lib/AST/TypePrinter.cpp

@@ -1420,7 +1420,7 @@ void TypePrinter::printDependentBitIntAfter(const DependentBitIntType *T,
 
 void TypePrinter::printPredefinedSugarBefore(const PredefinedSugarType *T,
                                              raw_ostream &OS) {
-  OS << T->getName();
+  OS << T->getIdentifier()->getName();
   spaceBeforePlaceHolder(OS);
 }
 

clang/lib/Sema/TreeTransform.h

@@ -1278,7 +1278,7 @@ class TreeTransform {
   QualType RebuildDependentBitIntType(bool IsUnsigned, Expr *NumBitsExpr,
                                       SourceLocation Loc);
 
-  QualType RebuildPredefinedSugarType(uint32_t K);
+  QualType RebuildPredefinedSugarType(PredefinedSugarType::Kind K);
 
   /// Build a new template name given a nested name specifier, a flag
   /// indicating whether the "template" keyword was provided, and the template
@@ -7257,8 +7257,7 @@ QualType TreeTransform<Derived>::TransformPredefinedSugarType(
   QualType Result = TL.getType();
 
   if (getDerived().AlwaysRebuild()) {
-    Result = getDerived().RebuildPredefinedSugarType(
-        llvm::to_underlying(EIT->getKind()));
+    Result = getDerived().RebuildPredefinedSugarType(EIT->getKind());
   }
 
   PredefinedSugarTypeLoc NewTL = TLB.push<PredefinedSugarTypeLoc>(Result);
@@ -17448,7 +17447,8 @@ QualType TreeTransform<Derived>::RebuildDependentBitIntType(
 }
 
 template <typename Derived>
-QualType TreeTransform<Derived>::RebuildPredefinedSugarType(uint32_t K) {
+QualType TreeTransform<Derived>::RebuildPredefinedSugarType(
+    PredefinedSugarType::Kind K) {
   return SemaRef.Context.getPredefinedSugarType(K);
 }