diff --git a/clang-tools-extra/clang-tidy/misc/UnusedParametersCheck.cpp b/clang-tools-extra/clang-tidy/misc/UnusedParametersCheck.cpp --- a/clang-tools-extra/clang-tidy/misc/UnusedParametersCheck.cpp +++ b/clang-tools-extra/clang-tidy/misc/UnusedParametersCheck.cpp @@ -138,16 +138,20 @@ Indexer = llvm::make_unique(*Result.Context); } - // Comment out parameter name for non-local functions. + // Cannot remove parameter for non-local functions. if (Function->isExternallyVisible() || !Result.SourceManager->isInMainFile(Function->getLocation()) || !Indexer->getOtherRefs(Function).empty() || isOverrideMethod(Function)) { - SourceRange RemovalRange(Param->getLocation()); - // Note: We always add a space before the '/*' to not accidentally create a - // '*/*' for pointer types, which doesn't start a comment. clang-format will - // clean this up afterwards. - MyDiag << FixItHint::CreateReplacement( - RemovalRange, (Twine(" /*") + Param->getName() + "*/").str()); + + // Comment out parameter name. + if (Result.Context->getLangOpts().CPlusPlus) { + SourceRange RemovalRange(Param->getLocation()); + // Note: We always add a space before the '/*' to not accidentally create + // a '*/*' for pointer types, which doesn't start a comment. clang-format + // will clean this up afterwards. + MyDiag << FixItHint::CreateReplacement( + RemovalRange, (Twine(" /*") + Param->getName() + "*/").str()); + } return; } diff --git a/clang-tools-extra/test/clang-tidy/misc-unused-parameters.c b/clang-tools-extra/test/clang-tidy/misc-unused-parameters.c --- a/clang-tools-extra/test/clang-tidy/misc-unused-parameters.c +++ b/clang-tools-extra/test/clang-tidy/misc-unused-parameters.c @@ -4,7 +4,7 @@ // ============= void a(int i) {;} // CHECK-MESSAGES: :[[@LINE-1]]:12: warning: parameter 'i' is unused [misc-unused-parameters] -// CHECK-FIXES: {{^}}void a(int /*i*/) {;}{{$}} +// CHECK-FIXES: {{^}}void a(int i) {;}{{$}} static void b(); // In C, forward declarations can leave out parameters. static void b(int i) {;}