Remove the unused function declaration and minor tweaks

Author: YexuanXiao

clang/include/clang/AST/ASTContext.h

@@ -1977,15 +1977,6 @@ class ASTContext : public RefCountedBase<ASTContext> {
   /// the integer type corresponding to size_t.
   QualType getSignedSizeType() const;
 
-  /// Return the unique type for "ptrdiff_t" (C99 7.17) defined in
-  /// <stddef.h>. Pointer - pointer requires this (C99 6.5.6p9).
-  QualType getPointerDiffType() const;
-
-  /// Return the unique unsigned counterpart of "ptrdiff_t"
-  /// integer type. The standard (C11 7.21.6.1p7) refers to this type
-  /// in the definition of %tu format specifier.
-  QualType getUnsignedPointerDiffType() const;
-
   /// Return the unique type for "intmax_t" (C99 7.18.1.5), defined in
   /// <stdint.h>.
   CanQualType getIntMaxType() const;
@@ -2025,6 +2016,15 @@ class ASTContext : public RefCountedBase<ASTContext> {
   /// as defined by the target.
   QualType getUIntPtrType() const;
 
+  /// Return the unique type for "ptrdiff_t" (C99 7.17) defined in
+  /// <stddef.h>. Pointer - pointer requires this (C99 6.5.6p9).
+  QualType getPointerDiffType() const;
+
+  /// Return the unique unsigned counterpart of "ptrdiff_t"
+  /// integer type. The standard (C11 7.21.6.1p7) refers to this type
+  /// in the definition of %tu format specifier.
+  QualType getUnsignedPointerDiffType() const;
+
   /// Return the unique type for "pid_t" defined in
   /// <sys/types.h>. We need this to compute the correct type for vfork().
   QualType getProcessIDType() const;

clang/include/clang/AST/Type.h

@@ -8092,16 +8092,15 @@ class PredefinedSugarType final : public Type {
 
 public:
   bool isSugared() const { return true; }
+
   QualType desugar() const { return getCanonicalTypeInternal(); }
+
   PredefinedSugarKind getKind() const {
     return PredefinedSugarKind(PredefinedSugarTypeBits.Kind);
   }
 
   StringRef getName() const;
 
-  static QualType makePredefinedSugarType(ASTContext &Ctx,
-                                          PredefinedSugarKind KD);
-
   static bool classof(const Type *T) {
     return T->getTypeClass() == PredefinedSugar;
   }

clang/include/clang/AST/TypeProperties.td

@@ -1030,10 +1030,10 @@ let Class = DependentBitIntType in {
 }
 
 let Class = PredefinedSugarType in {
-  def : Property<"k", UInt32> {
+  def : Property<"kind", UInt32> {
     let Read = [{ static_cast<uint32_t>(node->getKind()) }];
   }
   def : Creator<[{
-    return ctx.getPredefinedSugarType(k);
+    return ctx.getPredefinedSugarType(kind);
   }]>;
 }