[clang-tidy] Splits fuchsia-default-arguments

[DiegoAstiazaran]

Summary

Splits fuchsia-default-arguments check into two checks. fuchsia-default-arguments-calls warns if a function or method is called with default arguments. fuchsia-default-arguments-declarations warns if a function or method is declared with default parameters.

Resolves b38051

[Eugene.Zelenko]

Please mention renaming of existing check in Release Notes (after list of new checks).

clang-tools-extra/clang-tidy/fuchsia/DefaultArgumentsDeclarationsCheck.cpp

24

You could use auto instead of type because type is spelled in cast.

25

Please run clang-format.

[Eugene.Zelenko]

clang-tools-extra/clang-tidy/fuchsia/DefaultArgumentsCallsCheck.cpp

2

Please add space after clang-tidy.

clang-tools-extra/clang-tidy/fuchsia/DefaultArgumentsCallsCheck.h

1

Please narrow to 80 symbols and add space after clang-tidy.

clang-tools-extra/clang-tidy/fuchsia/DefaultArgumentsDeclarationsCheck.h

2

Please narrow to 80 symbols.

clang-tools-extra/clang-tidy/fuchsia/FuchsiaTidyModule.cpp

1

Please add space after clang-tidy.

[DiegoAstiazaran]

Reduces lines to 80 characters. The files have been also formatted by clang-format.
Types are replaced by auto in declarations where the type is spelled in cast.

[aaron.ballman]

It seems that the functional changes are missing from the patch -- all I see are formatting changes; have I missed something?

clang-tools-extra/clang-tidy/fuchsia/DefaultArgumentsCallsCheck.cpp

24–25

Given that the only change in the file is a formatting change, I would revert this. Feel free to commit separately as an NFC commit if you plan to do future work in the file.

clang-tools-extra/clang-tidy/fuchsia/DefaultArgumentsDeclarationsCheck.h

2

This should similarly be a separate NFC commit.

[DiegoAstiazaran]

Fix patch submitted.
Patch submitted with the last update was a new commit, functional changes were not included in that diff.
New patch includes functional changes (first patch) and format changes (second patch / first update).

[hokein]

@juliehockett could you take a look on this patch? I think you have the best knowledge about this check and fuchsia stuff.

[juliehockett]

Sorry for the delay!

clang-tools-extra/clang-tidy/fuchsia/DefaultArgumentsCallsCheck.cpp

24

Just if (!S) should be sufficient here.

clang-tools-extra/clang-tidy/fuchsia/DefaultArgumentsDeclarationsCheck.cpp

25

Same here for the if as above.

clang-tools-extra/docs/ReleaseNotes.rst

118–122

Also include a line about the addition of fuchsia-default-arguments-calls and the removal of fuchsia-default-arguments.

clang-tools-extra/test/clang-tidy/fuchsia-default-arguments-declarations.cpp

59–60

Remove this

[DiegoAstiazaran]

Complete documentation in ReleaseNotes

[Eugene.Zelenko]

clang-tools-extra/docs/ReleaseNotes.rst

122

Please highlight fuchsia-default-arguments with single back-ticks.

129

Please highlight fuchsia-default-arguments with single back-ticks.

167

Please add links to fuchsia-default-arguments-calls and fuchsia-default-arguments-declarations.

[DiegoAstiazaran]

Improve format of documentation in ReleaseNotes.

clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS support)
 
 add_clang_library(clangTidyFuchsiaModule
-  DefaultArgumentsCheck.cpp
+  DefaultArgumentsCallsCheck.cpp
+  DefaultArgumentsDeclarationsCheck.cpp
   FuchsiaTidyModule.cpp
   MultipleInheritanceCheck.cpp
   OverloadedOperatorCheck.cpp
   RestrictSystemIncludesCheck.cpp
   StaticallyConstructedObjectsCheck.cpp
   TrailingReturnCheck.cpp
   VirtualInheritanceCheck.cpp
 

clang-tools-extra/clang-tidy/fuchsia/DefaultArgumentsCallsCheck.h

-//===--- DefaultArgumentsCheck.h - clang-tidy--------------------*- C++ -*-===//
+//===--- DefaultArgumentsCallsCheck.h - clang-tidy --------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_FUCHSIA_DEFAULT_ARGUMENTS_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_FUCHSIA_DEFAULT_ARGUMENTS_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_FUCHSIA_DEFAULT_ARGUMENTS_CALLS_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_FUCHSIA_DEFAULT_ARGUMENTS_CALLS_H
 
 #include "../ClangTidyCheck.h"
 
 namespace clang {
 namespace tidy {
 namespace fuchsia {
 
-/// Default arguments are not allowed in declared or called functions.
+/// Default arguments are not allowed in called functions.
 ///
 /// For the user-facing documentation see:
-/// http://clang.llvm.org/extra/clang-tidy/checks/fuchsia-default-arguments.html
-class DefaultArgumentsCheck : public ClangTidyCheck {
+/// http://clang.llvm.org/extra/clang-tidy/checks/fuchsia-default-arguments-calls.html
+class DefaultArgumentsCallsCheck : public ClangTidyCheck {
 public:
-  DefaultArgumentsCheck(StringRef Name, ClangTidyContext *Context)
+  DefaultArgumentsCallsCheck(StringRef Name, ClangTidyContext *Context)
       : ClangTidyCheck(Name, Context) {}
   void registerMatchers(ast_matchers::MatchFinder *Finder) override;
   void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
 };
 
 } // namespace fuchsia
 } // namespace tidy
 } // namespace clang
 
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_FUCHSIA_DEFAULT_ARGUMENTS_H
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_FUCHSIA_DEFAULT_ARGUMENTS_CALLS_H

clang-tools-extra/clang-tidy/fuchsia/DefaultArgumentsCallsCheck.cpp

+//===--- DefaultArgumentsCallsCheck.cpp - clang-tidy-----------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "DefaultArgumentsCallsCheck.h"
+
+using namespace clang::ast_matchers;
+
+namespace clang {
+namespace tidy {
+namespace fuchsia {
+
+void DefaultArgumentsCallsCheck::registerMatchers(MatchFinder *Finder) {
+  // Calling a function which uses default arguments is disallowed.
+  Finder->addMatcher(cxxDefaultArgExpr().bind("stmt"), this);
+}
+
+void DefaultArgumentsCallsCheck::check(const MatchFinder::MatchResult &Result) {
+  const auto *S = Result.Nodes.getNodeAs<CXXDefaultArgExpr>("stmt");
+  if (S == nullptr)
+    return;
+
+  diag(S->getUsedLocation(),
+       "calling a function that uses a default argument is disallowed");
+  diag(S->getParam()->getBeginLoc(), "default parameter was declared here",
+       DiagnosticIDs::Note);
+}
+
+} // namespace fuchsia
+} // namespace tidy
+} // namespace clang

clang-tools-extra/clang-tidy/fuchsia/DefaultArgumentsCheck.cpp

-//===--- DefaultArgumentsCheck.cpp - clang-tidy----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "DefaultArgumentsCheck.h"
-
-using namespace clang::ast_matchers;
-
-namespace clang {
-namespace tidy {
-namespace fuchsia {
-
-void DefaultArgumentsCheck::registerMatchers(MatchFinder *Finder) {
-  // Calling a function which uses default arguments is disallowed.
-  Finder->addMatcher(cxxDefaultArgExpr().bind("stmt"), this);
-  // Declaring default parameters is disallowed.
-  Finder->addMatcher(parmVarDecl(hasDefaultArgument()).bind("decl"), this);
-}
-
-void DefaultArgumentsCheck::check(const MatchFinder::MatchResult &Result) {
-  if (const auto *S =
-          Result.Nodes.getNodeAs<CXXDefaultArgExpr>("stmt")) {
-    diag(S->getUsedLocation(),
-         "calling a function that uses a default argument is disallowed");
-    diag(S->getParam()->getBeginLoc(), "default parameter was declared here",
-         DiagnosticIDs::Note);
-  } else if (const ParmVarDecl *D =
-          Result.Nodes.getNodeAs<ParmVarDecl>("decl")) {
-    SourceRange DefaultArgRange = D->getDefaultArgRange();
-
-    if (DefaultArgRange.getEnd() != D->getEndLoc()) {
-      return;
-    } else if (DefaultArgRange.getBegin().isMacroID()) {
-      diag(D->getBeginLoc(),
-           "declaring a parameter with a default argument is disallowed");
-    } else {
-      SourceLocation StartLocation =
-          D->getName().empty() ? D->getBeginLoc() : D->getLocation();
-
-      SourceRange RemovalRange(Lexer::getLocForEndOfToken(
-             StartLocation, 0,
-             *Result.SourceManager,
-             Result.Context->getLangOpts()
-           ),
-           DefaultArgRange.getEnd()
-         );
-
-      diag(D->getBeginLoc(),
-           "declaring a parameter with a default argument is disallowed")
-          << D << FixItHint::CreateRemoval(RemovalRange);
-    }
-  }
-}
-
-} // namespace fuchsia
-} // namespace tidy
-} // namespace clang

clang-tools-extra/clang-tidy/fuchsia/DefaultArgumentsDeclarationsCheck.h

+//===--- DefaultArgumentsDeclarationsCheck.h - clang-tidy -------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_FUCHSIA_DEFAULT_ARGUMENTS_DECLARATIONS_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_FUCHSIA_DEFAULT_ARGUMENTS_DECLARATIONS_H
+
+#include "../ClangTidyCheck.h"
+
+namespace clang {
+namespace tidy {
+namespace fuchsia {
+
+/// Default parameters are not allowed in declared functions.
+///
+/// For the user-facing documentation see:
+/// http://clang.llvm.org/extra/clang-tidy/checks/fuchsia-default-parameters.html
+class DefaultArgumentsDeclarationsCheck : public ClangTidyCheck {
+public:
+  DefaultArgumentsDeclarationsCheck(StringRef Name, ClangTidyContext *Context)
+      : ClangTidyCheck(Name, Context) {}
+  void registerMatchers(ast_matchers::MatchFinder *Finder) override;
+  void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
+};
+
+} // namespace fuchsia
+} // namespace tidy
+} // namespace clang
+
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_FUCHSIA_DEFAULT_ARGUMENTS_DECLARATIONS_H

clang-tools-extra/clang-tidy/fuchsia/DefaultArgumentsDeclarationsCheck.cpp

+//===--- DefaultArgumentsDeclarationsCheck.cpp - clang-tidy ---------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "DefaultArgumentsDeclarationsCheck.h"
+
+using namespace clang::ast_matchers;
+
+namespace clang {
+namespace tidy {
+namespace fuchsia {
+
+void DefaultArgumentsDeclarationsCheck::registerMatchers(MatchFinder *Finder) {
+  // Declaring default parameters is disallowed.
+  Finder->addMatcher(parmVarDecl(hasDefaultArgument()).bind("decl"), this);
+}
+
+void DefaultArgumentsDeclarationsCheck::check(
+    const MatchFinder::MatchResult &Result) {
+  const auto *D = Result.Nodes.getNodeAs<ParmVarDecl>("decl");
+  if (D == nullptr)
+    return;
+
+  SourceRange DefaultArgRange = D->getDefaultArgRange();
+
+  if (DefaultArgRange.getEnd() != D->getEndLoc())
+    return;
+
+  if (DefaultArgRange.getBegin().isMacroID()) {
+    diag(D->getBeginLoc(),
+         "declaring a parameter with a default argument is disallowed");
+    return;
+  }
+
+  SourceLocation StartLocation =
+      D->getName().empty() ? D->getBeginLoc() : D->getLocation();
+
+  SourceRange RemovalRange(
+      Lexer::getLocForEndOfToken(StartLocation, 0, *Result.SourceManager,
+                                 Result.Context->getLangOpts()),
+      DefaultArgRange.getEnd());
+
+  diag(D->getBeginLoc(),
+       "declaring a parameter with a default argument is disallowed")
+      << D << FixItHint::CreateRemoval(RemovalRange);
+}
+
+} // namespace fuchsia
+} // namespace tidy
+} // namespace clang

clang-tools-extra/clang-tidy/fuchsia/FuchsiaTidyModule.cpp

-//===--- FuchsiaTidyModule.cpp - clang-tidy--------------------------------===//
+//===--- FuchsiaTidyModule.cpp - clang-tidy -------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "../ClangTidy.h"
 #include "../ClangTidyModule.h"
 #include "../ClangTidyModuleRegistry.h"
 #include "../google/UnnamedNamespaceInHeaderCheck.h"
-#include "DefaultArgumentsCheck.h"
+#include "DefaultArgumentsCallsCheck.h"
+#include "DefaultArgumentsDeclarationsCheck.h"
 #include "MultipleInheritanceCheck.h"
 #include "OverloadedOperatorCheck.h"
 #include "RestrictSystemIncludesCheck.h"
 #include "StaticallyConstructedObjectsCheck.h"
 #include "TrailingReturnCheck.h"
 #include "VirtualInheritanceCheck.h"
 
 using namespace clang::ast_matchers;
 
 namespace clang {
 namespace tidy {
 namespace fuchsia {
 
 /// This module is for Fuchsia-specific checks.
 class FuchsiaModule : public ClangTidyModule {
 public:
   void addCheckFactories(ClangTidyCheckFactories &CheckFactories) override {
-    CheckFactories.registerCheck<DefaultArgumentsCheck>(
-        "fuchsia-default-arguments");
+    CheckFactories.registerCheck<DefaultArgumentsCallsCheck>(
+        "fuchsia-default-arguments-calls");
+    CheckFactories.registerCheck<DefaultArgumentsDeclarationsCheck>(
+        "fuchsia-default-arguments-declarations");
     CheckFactories.registerCheck<google::build::UnnamedNamespaceInHeaderCheck>(
         "fuchsia-header-anon-namespaces");
     CheckFactories.registerCheck<MultipleInheritanceCheck>(
         "fuchsia-multiple-inheritance");
     CheckFactories.registerCheck<OverloadedOperatorCheck>(
         "fuchsia-overloaded-operator");
     CheckFactories.registerCheck<RestrictSystemIncludesCheck>(
         "fuchsia-restrict-system-includes");

clang-tools-extra/docs/ReleaseNotes.rst

 
 - New :doc:`bugprone-branch-clone
   <clang-tidy/checks/bugprone-branch-clone>` check.
 
   Checks for repeated branches in ``if/else if/else`` chains, consecutive
   repeated branches in ``switch`` statements and indentical true and false
   branches in conditional operators.
 
+- New :doc:`fuchsia-default-arguments-declarations
+  <clang-tidy/checks/fuchsia-default-arguments-declarations>` check.
+
+  Warns if a function or method is declared with default parameters.
+
 - New :doc:`google-readability-avoid-underscore-in-googletest-name
   <clang-tidy/checks/google-readability-avoid-underscore-in-googletest-name>`
   check.
 
   Checks whether there are underscores in googletest test and test case names in
   test macros, which is prohibited by the Googletest FAQ.
 
 - New :doc:`google-objc-avoid-nsobject-new
   <clang-tidy/checks/google-objc-avoid-nsobject-new>` check.
 
   Checks for calls to ``+new`` or overrides of it, which are prohibited by the
   Google Objective-C style guide.
 
 - New :doc:`objc-super-self <clang-tidy/checks/objc-super-self>` check.
 
- The :doc:`bugprone-too-small-loop-variable
   <clang-tidy/checks/bugprone-too-small-loop-variable>` now supports
   `MagnitudeBitsUpperLimit` option. The default value was set to 16,
   which greatly reduces warnings related to loops which are unlikely to
   cause an actual functional bug.
 
 - The :doc:`google-runtime-int <clang-tidy/checks/google-runtime-int>`
   check has been disabled in Objective-C++.
 
 - The `Acronyms` and `IncludeDefaultAcronyms` options for the
   :doc:`objc-property-declaration <clang-tidy/checks/objc-property-declaration>`
   check have been removed.
 
 - The :doc:`modernize-use-override
   <clang-tidy/checks/modernize-use-override>` now supports `OverrideSpelling`
   and `FinalSpelling` options.
 
 - New :doc:`llvm-prefer-isa-or-dyn-cast-in-conditionals

clang-tools-extra/docs/clang-tidy/checks/fuchsia-default-arguments-calls.rst

-.. title:: clang-tidy - fuchsia-default-arguments
+.. title:: clang-tidy - fuchsia-default-arguments-calls
 
-fuchsia-default-arguments
-=========================
+fuchsia-default-arguments-calls
+===============================
 
-Warns if a function or method is declared or called with default arguments.
+Warns if a function or method is called with default arguments.
 
-For example, the declaration:
+For example, given the declaration:
 
 .. code-block:: c++
 
   int foo(int value = 5) { return value; }
 
-will cause a warning.
-
 A function call expression that uses a default argument will be diagnosed.
 Calling it without defaults will not cause a warning:
 
 .. code-block:: c++
 
   foo();  // warning
   foo(0); // no warning
 
 See the features disallowed in Fuchsia at https://fuchsia.googlesource.com/zircon/+/master/docs/cxx.md

clang-tools-extra/docs/clang-tidy/checks/fuchsia-default-arguments-declarations.rst

+.. title:: clang-tidy - fuchsia-default-arguments-declarations
+
+fuchsia-default-arguments-declarations
+======================================
+
+Warns if a function or method is declared with default parameters.
+
+For example, the declaration:
+
+.. code-block:: c++
+
+  int foo(int value = 5) { return value; }
+
+will cause a warning.
+
+See the features disallowed in Fuchsia at https://fuchsia.googlesource.com/zircon/+/master/docs/cxx.md

clang-tools-extra/docs/clang-tidy/checks/list.rst

.. toctree::
    cppcoreguidelines-pro-type-cstyle-cast
    cppcoreguidelines-pro-type-member-init
    cppcoreguidelines-pro-type-reinterpret-cast
    cppcoreguidelines-pro-type-static-cast-downcast
    cppcoreguidelines-pro-type-union-access
    cppcoreguidelines-pro-type-vararg
    cppcoreguidelines-slicing
    cppcoreguidelines-special-member-functions
-   fuchsia-default-arguments
+   fuchsia-default-arguments-calls
+   fuchsia-default-arguments-declarations
    fuchsia-header-anon-namespaces (redirects to google-build-namespaces) <fuchsia-header-anon-namespaces>
    fuchsia-multiple-inheritance
    fuchsia-overloaded-operator
    fuchsia-restrict-system-includes
    fuchsia-statically-constructed-objects
    fuchsia-trailing-return
    fuchsia-virtual-inheritance
    google-build-explicit-make-pair

clang-tools-extra/test/clang-tidy/fuchsia-default-arguments-calls.cpp

+// RUN: %check_clang_tidy %s fuchsia-default-arguments-calls %t
+
+int foo(int value = 5) { return value; }
+
+int f() {
+  foo();
+  // CHECK-NOTES: [[@LINE-1]]:3: warning: calling a function that uses a default argument is disallowed [fuchsia-default-arguments-calls]
+  // CHECK-NOTES: [[@LINE-5]]:9: note: default parameter was declared here
+}
+
+int bar(int value) { return value; }
+
+int n() {
+  foo(0);
+  bar(0);
+}
+
+void x(int i = 12);
+
+struct S {
+  void x(int i);
+};
+
+void S::x(int i = 12) {}
+
+int main() {
+  S s;
+  s.x();
+  // CHECK-NOTES: [[@LINE-1]]:3: warning: calling a function that uses a default argument is disallowed [fuchsia-default-arguments-calls]
+  // CHECK-NOTES: [[@LINE-6]]:11: note: default parameter was declared here
+  // CHECK-NEXT: void S::x(int i = 12) {}
+  x();
+  // CHECK-NOTES: [[@LINE-1]]:3: warning: calling a function that uses a default argument is disallowed [fuchsia-default-arguments-calls]
+  // CHECK-NOTES: [[@LINE-16]]:8: note: default parameter was declared here
+  // CHECK-NEXT: void x(int i = 12);
+}

clang-tools-extra/test/clang-tidy/fuchsia-default-arguments-declarations.cpp

-// RUN: %check_clang_tidy %s fuchsia-default-arguments %t
+// RUN: %check_clang_tidy %s fuchsia-default-arguments-declarations %t
 
 int foo(int value = 5) { return value; }
-// CHECK-NOTES: [[@LINE-1]]:9: warning: declaring a parameter with a default argument is disallowed [fuchsia-default-arguments]
+// CHECK-NOTES: [[@LINE-1]]:9: warning: declaring a parameter with a default argument is disallowed [fuchsia-default-arguments-declarations]
 // CHECK-FIXES: int foo(int value) { return value; }
 
-int f() {
-  foo();
-  // CHECK-NOTES: [[@LINE-1]]:3: warning: calling a function that uses a default argument is disallowed [fuchsia-default-arguments]
-  // CHECK-NOTES: [[@LINE-7]]:9: note: default parameter was declared here
-}
-
 int bar(int value) { return value; }
 
-int n() {
-  foo(0);
-  bar(0);
-}
-
 class Baz {
 public:
   int a(int value = 5) { return value; }
-  // CHECK-NOTES: [[@LINE-1]]:9: warning: declaring a parameter with a default argument is disallowed [fuchsia-default-arguments]
+  // CHECK-NOTES: [[@LINE-1]]:9: warning: declaring a parameter with a default argument is disallowed [fuchsia-default-arguments-declarations]
   // CHECK-FIXES: int a(int value) { return value; }
 
   int b(int value) { return value; }
 };
 
 class Foo {
   // Fix should be suggested in declaration
   int a(int value = 53);
-  // CHECK-NOTES: [[@LINE-1]]:9: warning: declaring a parameter with a default argument is disallowed [fuchsia-default-arguments]
+  // CHECK-NOTES: [[@LINE-1]]:9: warning: declaring a parameter with a default argument is disallowed [fuchsia-default-arguments-declarations]
   // CHECK-FIXES: int a(int value);
 };
 
 // Fix shouldn't be suggested in implementation
 int Foo::a(int value) {
   return value;
 }
 
 // Elided functions
 void f(int = 5) {};
-// CHECK-NOTES: [[@LINE-1]]:8: warning: declaring a parameter with a default argument is disallowed [fuchsia-default-arguments]
+// CHECK-NOTES: [[@LINE-1]]:8: warning: declaring a parameter with a default argument is disallowed [fuchsia-default-arguments-declarations]
 // CHECK-FIXES: void f(int) {};
 
 void g(int) {};
 
 // Should not suggest fix for macro-defined parameters
 #define D(val) = val
 
 void h(int i D(5));
-// CHECK-NOTES: [[@LINE-1]]:8: warning: declaring a parameter with a default argument is disallowed [fuchsia-default-arguments]
+// CHECK-NOTES: [[@LINE-1]]:8: warning: declaring a parameter with a default argument is disallowed [fuchsia-default-arguments-declarations]
 // CHECK-FIXES-NOT: void h(int i);
 
 void x(int i);
 void x(int i = 12);
-// CHECK-NOTES: [[@LINE-1]]:8: warning: declaring a parameter with a default argument is disallowed [fuchsia-default-arguments]
+// CHECK-NOTES: [[@LINE-1]]:8: warning: declaring a parameter with a default argument is disallowed [fuchsia-default-arguments-declarations]
 // CHECK-FIXES: void x(int i);
 
 void x(int i) {}
 
 struct S {
   void x(int i);
 };
 
 void S::x(int i = 12) {}
-// CHECK-NOTES: [[@LINE-1]]:11: warning: declaring a parameter with a default argument is disallowed [fuchsia-default-arguments]
+// CHECK-NOTES: [[@LINE-1]]:11: warning: declaring a parameter with a default argument is disallowed [fuchsia-default-arguments-declarations]
 // CHECK-FIXES: void S::x(int i) {}
 
 int main() {
-  S s;
-  s.x();
-  // CHECK-NOTES: [[@LINE-1]]:3: warning: calling a function that uses a default argument is disallowed [fuchsia-default-arguments]
-  // CHECK-NOTES: [[@LINE-8]]:11: note: default parameter was declared here
-  // CHECK-NEXT: void S::x(int i = 12) {}
-  x();
-  // CHECK-NOTES: [[@LINE-1]]:3: warning: calling a function that uses a default argument is disallowed [fuchsia-default-arguments]
-  // CHECK-NOTES: [[@LINE-18]]:8: note: default parameter was declared here
-  // CHECK-NEXT: void x(int i = 12);
 }