Minor edits

Author: ojhunt

clang/include/clang/Driver/Options.td

@@ -3545,11 +3545,11 @@ def : Flag<["-"], "fno-aligned-new">, Alias<fno_aligned_allocation>;
 def faligned_new_EQ : Joined<["-"], "faligned-new=">;
 defm cxx_type_aware_allocators : BoolFOption<"experimental-cxx-type-aware-allocators",
   LangOpts<"TypeAwareAllocators">, DefaultFalse,
-  PosFlag<SetTrue, [], [ClangOption], "Enable C++YY type aware allocator operators">,
+  PosFlag<SetTrue, [], [ClangOption], "Enable experimental C++YY type aware allocator operators">,
   NegFlag<SetFalse>, BothFlags<[], [ClangOption, CC1Option]>>;
-defm cxx_type_aware_destroying_delete : BoolFOption<"cxx-type-aware-destroying-delete",
+defm cxx_type_aware_destroying_delete : BoolFOption<"experimental-cxx-type-aware-destroying-delete",
   LangOpts<"TypeAwareDestroyingDelete">, DefaultFalse,
-  PosFlag<SetTrue, [], [ClangOption], "Enable C++YY type aware allocator operators">,
+  PosFlag<SetTrue, [], [ClangOption], "Enable experimental C++YY type aware allocator operators for destroying delete">,
   NegFlag<SetFalse>, BothFlags<[], [ClangOption, CC1Option]>>;
 def fobjc_legacy_dispatch : Flag<["-"], "fobjc-legacy-dispatch">, Group<f_Group>;
 def fobjc_new_property : Flag<["-"], "fobjc-new-property">, Group<clang_ignored_f_Group>;

clang/lib/Driver/ToolChains/Clang.cpp

@@ -7153,7 +7153,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
 
   if (Args.hasFlag(options::OPT_fcxx_type_aware_destroying_delete,
                    options::OPT_fno_cxx_type_aware_destroying_delete, false))
-    CmdArgs.push_back("-fcxx-type-aware-destroying-delete");
+    CmdArgs.push_back("-fexperimental-cxx-type-aware-destroying-delete");
 
   Args.AddLastArg(CmdArgs, options::OPT_fdouble_square_bracket_attributes,
                   options::OPT_fno_double_square_bracket_attributes);

clang/lib/Sema/SemaExprCXX.cpp

@@ -2967,8 +2967,10 @@ bool Sema::FindAllocationFunctions(
     if (R.empty()) {
       if (NewScope == AFS_Class)
         return true;
+
       LookupQualifiedName(R, Context.getTranslationUnitDecl());
     }
+
     if (getLangOpts().OpenCLCPlusPlus && R.empty()) {
       if (PlaceArgs.empty()) {
         Diag(StartLoc, diag::err_openclcxx_not_supported) << "default new";
@@ -3171,7 +3173,7 @@ bool Sema::FindAllocationFunctions(
           << NewDiagIndex << OperatorNew;
       Diag(OperatorDelete->getLocation(),
            diag::note_type_aware_operator_declared)
-          << DeleteDiagIndex << OperatorDelete->getDeclName();
+          << DeleteDiagIndex << OperatorDelete;
     }
     if (IAP.PassTypeIdentity &&
         OperatorDelete->getDeclContext() != OperatorNew->getDeclContext()) {
@@ -3182,7 +3184,7 @@ bool Sema::FindAllocationFunctions(
       Diag(OperatorNew->getLocation(), diag::err_type_aware_operator_found)
           << OperatorNew << OperatorNew->getDeclContext();
       Diag(OperatorDelete->getLocation(), diag::err_type_aware_operator_found)
-          << OperatorDelete->getDeclName() << OperatorDelete->getDeclContext();
+          << OperatorDelete << OperatorDelete->getDeclContext();
     }
 
     // C++1z [expr.new]p23:

clang/test/SemaCXX/type-aware-new-delete-basic-in-class-declarations.cpp

@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s -DNO_TADD -std=c++17    -fexperimental-cxx-type-aware-allocators
-// RUN: %clang_cc1 -fsyntax-only -verify %s           -std=c++17    -fexperimental-cxx-type-aware-allocators -fcxx-type-aware-destroying-delete
+// RUN: %clang_cc1 -fsyntax-only -verify %s           -std=c++17    -fexperimental-cxx-type-aware-allocators -fexperimental-cxx-type-aware-destroying-delete
 // RUN: %clang_cc1 -fsyntax-only -verify %s -DNO_TAA  -std=c++17 -fno-experimental-cxx-type-aware-allocators
 
 namespace std {

clang/test/SemaCXX/type-aware-new-delete-basic-resolution.cpp

@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s        -std=c++2c -fexperimental-cxx-type-aware-allocators -fexceptions
-// RUN: %clang_cc1 -fsyntax-only -verify %s -DTADD -std=c++2c -fexperimental-cxx-type-aware-allocators -fcxx-type-aware-destroying-delete -fexceptions
+// RUN: %clang_cc1 -fsyntax-only -verify %s -DTADD -std=c++2c -fexperimental-cxx-type-aware-allocators -fexperimental-cxx-type-aware-destroying-delete -fexceptions
 
 namespace std {
   template <class T> struct type_identity {};
@@ -355,12 +355,12 @@ void test() {
   SubClass6_1 *O22 = new SubClass6_1;
   // expected-error@-1 {{type aware 'operator new<SubClass6_1>' requires matching 'operator delete' in 'SubClass6_1'}}
   // expected-note@#62 {{type aware 'operator new<SubClass6_1>' found in 'SubClass6_1'}}
-  // expected-note@#61 {{type aware 'operator delete' found in 'BaseClass6'}}
+  // expected-note@#61 {{type aware 'operator delete<SubClass6_1>' found in 'BaseClass6'}}
   delete O22;
 
   SubClass6_2 *O23 = new SubClass6_2;
   // expected-error@-1 {{type aware 'operator new<SubClass6_2>' requires matching 'operator delete' in 'BaseClass6'}}
   // expected-note@#60 {{type aware 'operator new<SubClass6_2>' found in 'BaseClass6'}}
-  // expected-note@#63 {{type aware 'operator delete' found in 'SubClass6_2'}}
+  // expected-note@#63 {{type aware 'operator delete<SubClass6_2>' found in 'SubClass6_2'}}
   delete O23;
 }