remove duplicate note diagnostic

Author: a-tarasyuk

clang/include/clang/Basic/DiagnosticCommonKinds.td

@@ -83,7 +83,6 @@ let CategoryName = "Parse Issue" in {
 def err_expected : Error<"expected %0">;
 def err_expected_either : Error<"expected %0 or %1">;
 def err_expected_after : Error<"expected %1 after %0">;
-def note_macro_expansion : Note<"expanded from macro '%0'">;
 
 def err_param_redefinition : Error<"redefinition of parameter %0">;
 def warn_method_param_redefinition : Warning<"redefinition of method parameter %0">;

clang/lib/Parse/ParseStmt.cpp

@@ -833,22 +833,15 @@ StmtResult Parser::ParseCaseStatement(ParsedStmtContext StmtCtx,
           << FixItHint::CreateReplacement(ColonLoc, ":");
     } else {
       SourceLocation ExpectedLoc = PP.getLocForEndOfToken(PrevTokLocation);
-      SourceLocation ExprLoc =
-          LHS.get() ? LHS.get()->getExprLoc() : SourceLocation();
-
-      if (ExpectedLoc.isInvalid() && ExprLoc.isMacroID()) {
-        ExpectedLoc = PP.getSourceManager().getSpellingLoc(ExprLoc);
+      if (ExpectedLoc.isInvalid() && LHS.get()) {
+        ExpectedLoc =
+            PP.getSourceManager().getSpellingLoc(LHS.get()->getExprLoc());
       }
 
       Diag(ExpectedLoc, diag::err_expected_after)
           << "'case'" << tok::colon
-          << FixItHint::CreateInsertion(ExpectedLoc, ":");
-
-      if (ExprLoc.isMacroID()) {
-        Diag(ExprLoc, diag::note_macro_expansion)
-            << Lexer::getImmediateMacroNameForDiagnostics(
-                   ExprLoc, PP.getSourceManager(), getLangOpts());
-      }
+          << FixItHint::CreateInsertion(ExpectedLoc,
+                                        tok::getTokenName(tok::colon));
 
       ColonLoc = ExpectedLoc;
     }

clang/test/Parser/switch-recovery.cpp

@@ -235,7 +235,7 @@ namespace GH143216 {
 
 int f(int x) {
   switch (x) {
-  case FOO // expected-note {{expanded from macro 'FOO'}}
+  case FOO
     return 0;
   default:
     return 1;