Cleanup

Author: vvuksanovic

clang/docs/ReleaseNotes.rst

@@ -401,8 +401,9 @@ Improvements to Clang's diagnostics
   or continue (#GH166013)
 - Clang now emits a diagnostic in case `vector_size` or `ext_vector_type`
   attributes are used with a negative size (#GH165463).
-- Clang now detects potential missing format attributes on function declarations
-  when calling format functions. (#GH60718)
+- Clang now detects potential missing format and format_matches attributes on function,
+  Objective-C method and block declarations when calling format functions. It is part
+  of the format-nonliteral diagnostic (#GH60718)
 
 Improvements to Clang's time-trace
 ----------------------------------

clang/lib/Sema/SemaChecking.cpp

@@ -7013,19 +7013,6 @@ bool Sema::CheckFormatString(const FormatMatchesAttr *Format,
   return false;
 }
 
-std::string escapeFormatString(StringRef Input) {
-  std::string Result;
-  llvm::raw_string_ostream OS(Result);
-  for (char C : Input) {
-    StringRef Escaped = escapeCStyle<EscapeChar::Double>(C);
-    if (Escaped.empty())
-      OS << C;
-    else
-      OS << Escaped;
-  }
-  return Result;
-}
-
 static bool CheckMissingFormatAttribute(
     Sema *S, ArrayRef<const Expr *> Args, Sema::FormatArgumentPassingKind APK,
     StringLiteral *ReferenceFormatString, unsigned FormatIdx,
@@ -7094,15 +7081,17 @@ static bool CheckMissingFormatAttribute(
   NamedDecl *ND = dyn_cast<NamedDecl>(Caller);
   do {
     std::string Attr, Fixit;
-    if (APK != Sema::FormatArgumentPassingKind::FAPK_Elsewhere)
-      llvm::raw_string_ostream(Attr)
-          << "format(" << FormatTypeName << ", " << FormatStringIndex << ", "
-          << FirstArgumentIndex << ")";
-    else
-      llvm::raw_string_ostream(Attr)
-          << "format_matches(" << FormatTypeName << ", " << FormatStringIndex
-          << ", \"" << escapeFormatString(ReferenceFormatString->getString())
-          << "\")";
+    llvm::raw_string_ostream AttrOS(Attr);
+    if (APK != Sema::FormatArgumentPassingKind::FAPK_Elsewhere) {
+      AttrOS << "format(" << FormatTypeName << ", " << FormatStringIndex << ", "
+             << FirstArgumentIndex << ")";
+    } else {
+      AttrOS << "format_matches(" << FormatTypeName << ", " << FormatStringIndex
+             << ", \"";
+      AttrOS.write_escaped(ReferenceFormatString->getString());
+      AttrOS << "\")";
+    }
+    AttrOS.flush();
     auto DB = S->Diag(Loc, diag::warn_missing_format_attribute) << Attr;
     if (ND)
       DB << ND;