#GH134465 Modified version

Author: MillePlateaux

clang/docs/ReleaseNotes.rst

@@ -325,7 +325,7 @@ Improvements to Clang's diagnostics
 - Now correctly diagnose a tentative definition of an array with static
   storage duration in pedantic mode in C. (#GH50661)
 
-- The ``-err-musttail-mismatch`` error is emitted when a musttail call is made to a function marked with the not_tail_called attribute.(#133509).
+- An error is now emitted when a ``musttail`` call is made to a function marked with the ``not_tail_called`` attribute. (#GH133509).
 
 
 Improvements to Clang's time-trace

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -3134,7 +3134,6 @@ def warn_function_attribute_ignored_in_stmt : Warning<
   "use '%0' on statements">,
   InGroup<IgnoredAttributes>;
 
-
 def err_musttail_needs_trivial_args : Error<
   "tail call requires that the return value, all parameters, and any "
   "temporaries created by the expression are trivially destructible">;
@@ -3162,7 +3161,7 @@ def err_musttail_member_mismatch : Error<
 def note_musttail_callee_defined_here : Note<"%0 declared here">;
 def note_tail_call_required : Note<"tail call required by %0 attribute here">;
 def err_musttail_mismatch : Error<
-  "cannot perform a tail call to function%select{| %1}0 because its signature "
+  "cannot perform a tail call to function %select{| %1}0 because its signature "
   "is incompatible with the calling function">;
 def note_musttail_mismatch : Note<
     "target function "

clang/lib/Sema/SemaStmt.cpp

@@ -718,10 +718,9 @@ bool Sema::checkMustTailAttr(const Stmt *St, const Attr &MTA) {
   }
 
   if (const FunctionDecl *CalleeDecl = CE->getDirectCallee();
-     CalleeDecl && CalleeDecl->hasAttr<NotTailCalledAttr>()) {
-      Diag(St->getBeginLoc(), diag::err_musttail_mismatch)
-      << &MTA;
-     return false;
+      CalleeDecl && CalleeDecl->hasAttr<NotTailCalledAttr>()) {
+    Diag(St->getBeginLoc(), diag::err_musttail_mismatch) << &MTA;
+    return false;
   }
 
   if (const auto *EWC = dyn_cast<ExprWithCleanups>(E)) {

clang/test/Sema/attr-musttail.cpp

@@ -7,10 +7,11 @@ int __attribute__((not_tail_called)) foo1(int a) {
 
 int foo2(int a) {
     [[clang::musttail]] 
-    return foo1(a);  // expected-error{{cannot perform a tail call to function'musttail' because its signature is incompatible with the calling function}}
+    return foo1(a);  // expected-error{{cannot perform a tail call to function 'musttail' because its signature is incompatible with the calling function}}
 }
 
 int main() {
     int result = foo2(10);      
     return 0;
-}
+}
+