Correct naming, add preprocessor define

Author: ojhunt

clang/include/clang/Sema/Sema.h

@@ -4890,7 +4890,7 @@ class Sema final : public SemaBase {
   ///
   /// \returns The instantiated template, or null if std::type_identity is not
   /// declared
-  QualType TryBuildStdTypeIdentity(QualType Type, SourceLocation Loc);
+  QualType tryBuildStdTypeIdentity(QualType Type, SourceLocation Loc);
 
   /// Determine whether Ctor is an initializer-list constructor, as
   /// defined in [dcl.init.list]p2.

clang/lib/Frontend/InitPreprocessor.cpp

@@ -772,6 +772,10 @@ static void InitializeCPlusPlusFeatureTestMacros(const LangOptions &LangOpts,
   if (LangOpts.Char8)
     Builder.defineMacro("__cpp_char8_t", "202207L");
   Builder.defineMacro("__cpp_impl_destroying_delete", "201806L");
+
+  // TODO: Final number?
+  if (LangOpts.TypeAwareAllocators)
+    Builder.defineMacro("__cpp_type_aware_allocators", "202500L");
 }
 
 /// InitializeOpenCLFeatureTestMacros - Define OpenCL macros based on target

clang/lib/Sema/SemaDeclCXX.cpp

@@ -12183,7 +12183,7 @@ QualType Sema::BuildStdInitializerList(QualType Element, SourceLocation Loc) {
   return BuildStdClassTemplate(*this, StdInitializerList, Element, Loc);
 }
 
-QualType Sema::TryBuildStdTypeIdentity(QualType Type, SourceLocation Loc) {
+QualType Sema::tryBuildStdTypeIdentity(QualType Type, SourceLocation Loc) {
   if (!StdTypeIdentity) {
     StdTypeIdentity = LookupStdClassTemplate(*this, Loc, "type_identity",
                                              /* WasMalformed */ nullptr);
@@ -16339,7 +16339,7 @@ Sema::BuildTypeAwareUsualDelete(FunctionTemplateDecl *FnTemplateDecl,
       return nullptr;
   }
 
-  QualType SpecializedTypeIdentity = TryBuildStdTypeIdentity(DeallocType, Loc);
+  QualType SpecializedTypeIdentity = tryBuildStdTypeIdentity(DeallocType, Loc);
   if (SpecializedTypeIdentity.isNull())
     return nullptr;
 

clang/lib/Sema/SemaExprCXX.cpp

@@ -1811,7 +1811,7 @@ namespace {
         }
         QualType TypeIdentityTag = FD->getParamDecl(0)->getType();
         QualType ExpectedTypeIdentityTag =
-            S.TryBuildStdTypeIdentity(AllocType, Loc);
+            S.tryBuildStdTypeIdentity(AllocType, Loc);
         if (ExpectedTypeIdentityTag.isNull()) {
           FD = nullptr;
           return;
@@ -2957,7 +2957,7 @@ bool Sema::FindAllocationFunctions(
   QualType TypeIdentity = Context.getSizeType();
   if (isTypeAwareAllocation(IAP.PassTypeIdentity)) {
     QualType SpecializedTypeIdentity =
-        TryBuildStdTypeIdentity(IAP.Type, StartLoc);
+        tryBuildStdTypeIdentity(IAP.Type, StartLoc);
     if (!SpecializedTypeIdentity.isNull()) {
       TypeIdentity = SpecializedTypeIdentity;
       if (RequireCompleteType(StartLoc, TypeIdentity,