not 'here' version

Author: MillePlateaux

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -3171,7 +3171,7 @@ def note_musttail_mismatch : Note<
     "%diff{ (expected $ but has $)|}1,2"
     "|has different return type%diff{ ($ expected but has $)|}1,2}0">;
 def note_musttail_disabled_by_not_tail_called : Note<
-  "'not_tail_called' attribute here prevents being called as a tail call">;
+  "'not_tail_called' attribute prevents being called as a tail call">;
 def err_musttail_callconv_mismatch : Error<
   "cannot perform a tail call to function%select{| %1}0 because it uses an "
   "incompatible calling convention">;

clang/lib/Sema/SemaStmt.cpp

@@ -720,7 +720,7 @@ 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) << /*show-function-callee=*/true << CalleeDecl;
-    Diag(CalleeDecl->getLocation(), diag::note_musttail_disabled_by_not_tail_called) << CalleeDecl;
+    Diag(CalleeDecl->getLocation(), diag::note_musttail_disabled_by_not_tail_called);
     return false;
   }
 

clang/test/Sema/attr-musttail.cpp

@@ -1,13 +1,13 @@
 // RUN: %clang_cc1 -verify -fsyntax-only %s
 
-int __attribute__((not_tail_called)) foo1(int a) {// expected-note {{'not_tail_called' attribute here prevents being called as a tail call}}
+int __attribute__((not_tail_called)) foo1(int a) {// expected-note {{'not_tail_called' attribute prevents being called as a tail call}}
     return a + 1;  
 }
 
 
 int foo2(int a) {
     [[clang::musttail]] 
-    return foo1(a);  // expected-error {{cannot perform a tail call to function 'foo1' because its signature is incompatible with the calling function}}    `note: 'not_tail_called' attribute here prevents being called as a tail call'
+    return foo1(a);  // expected-error {{cannot perform a tail call to function 'foo1' because its signature is incompatible with the calling function}} 
 }
 
 int main() {