Diagnostics: noformat modifier for Type

Sometimes, quotes or an "aka" for a type are not desirable in a
diagnostic, such as one describing a Requirement. This modifier
suppresses such additional formatting a Type in a diagnostic.

(cherry picked from commit 0ce97b8)

Author: kavon

include/swift/AST/DiagnosticsSema.def

@@ -7636,8 +7636,8 @@ ERROR(copyable_illegal_deinit, none,
       (const ValueDecl *))
 ERROR(inverse_cannot_be_conditional_on_requirement, none,
       "conditional conformance to suppressible %kind0 cannot depend on "
-      "'%1%select{:|:| ==|:| has same shape as}2 %3'",
-      (const ProtocolDecl *, StringRef, unsigned, StringRef))
+      "'%noformat1%select{:|:| ==|:| has same shape as}2 %noformat3'",
+      (const ProtocolDecl *, Type, unsigned, Type))
 ERROR(inverse_type_member_in_conforming_type,none,
       "%select{stored property %2|associated value %2}1 of "
       "'%4'-conforming %kind3 has non-%4 type %0",

lib/AST/DiagnosticEngine.cpp

@@ -757,7 +757,13 @@ static void formatDiagnosticArgument(StringRef Modifier,
   case DiagnosticArgumentKind::FullyQualifiedType:
   case DiagnosticArgumentKind::Type:
   case DiagnosticArgumentKind::WitnessType: {
-    assert(Modifier.empty() && "Improper modifier for Type argument");
+    std::optional<DiagnosticFormatOptions> TypeFormatOpts;
+    if (Modifier == "noformat") {
+      TypeFormatOpts.emplace(DiagnosticFormatOptions::formatForFixIts());
+    } else {
+      assert(Modifier.empty() && "Improper modifier for Type argument");
+      TypeFormatOpts.emplace(FormatOpts);
+    }
 
     // Strip extraneous parentheses; they add no value.
     Type type;
@@ -829,7 +835,7 @@ static void formatDiagnosticArgument(StringRef Modifier,
 
       auto descriptiveKind = opaqueTypeDecl->getDescriptiveKind();
 
-      Out << llvm::format(FormatOpts.OpaqueResultFormatString.c_str(),
+      Out << llvm::format(TypeFormatOpts->OpaqueResultFormatString.c_str(),
                           type->getString(printOptions).c_str(),
                           Decl::getDescriptiveKindName(descriptiveKind).data(),
                           NamingDeclText.c_str());
@@ -843,11 +849,11 @@ static void formatDiagnosticArgument(StringRef Modifier,
         llvm::raw_svector_ostream OutAka(AkaText);
 
         getAkaTypeForDisplay(type)->print(OutAka, printOptions);
-        Out << llvm::format(FormatOpts.AKAFormatString.c_str(),
+        Out << llvm::format(TypeFormatOpts->AKAFormatString.c_str(),
                             typeName.c_str(), AkaText.c_str());
       } else {
-        Out << FormatOpts.OpeningQuotationMark << typeName
-            << FormatOpts.ClosingQuotationMark;
+        Out << TypeFormatOpts->OpeningQuotationMark << typeName
+            << TypeFormatOpts->ClosingQuotationMark;
       }
     }
     break;

lib/Sema/TypeCheckInvertible.cpp

@@ -154,12 +154,13 @@ static void checkInvertibleConformanceCommon(DeclContext *dc,
       // In theory, it could depend on any invertible protocol, but it may be
       // confusing if we permitted that and this simplifies the model a bit.
       for (auto req : condReqs) {
-        std::optional<StringRef> illegalSecondTypeStr;
+        Type illegalSecondType;
 
         // If we are diagnosing, fill-in the second-type string of this req.
         switch (req.getKind()) {
         case RequirementKind::Layout:
-          illegalSecondTypeStr = req.getLayoutConstraint().getString();
+          assert(req.getLayoutConstraint()->isClass());
+          illegalSecondType = ctx.getAnyObjectType();
           break;
         case RequirementKind::Conformance:
           if (req.getProtocolDecl() == thisProto
@@ -169,19 +170,19 @@ static void checkInvertibleConformanceCommon(DeclContext *dc,
         case RequirementKind::Superclass:
         case RequirementKind::SameType:
         case RequirementKind::SameShape:
-          illegalSecondTypeStr = req.getSecondType().getString();
+          illegalSecondType = req.getSecondType();
           break;
         }
 
         static_assert((unsigned)RequirementKind::LAST_KIND == 4,
                       "update %select in diagnostic!");
-        if (illegalSecondTypeStr) {
-          ctx.Diags.diagnose(conformanceLoc,
+        if (illegalSecondType) {
+          auto t = ctx.Diags.diagnose(conformanceLoc,
                              diag::inverse_cannot_be_conditional_on_requirement,
                              thisProto,
-                             req.getFirstType().getString(),
+                             req.getFirstType(),
                              static_cast<unsigned>(req.getKind()),
-                             *illegalSecondTypeStr);
+                             illegalSecondType);
         }
       }
     }