diff options
| author | Ted Kremenek <kremenek@apple.com> | 2010-04-08 21:10:56 +0000 |
|---|---|---|
| committer | Ted Kremenek <kremenek@apple.com> | 2010-04-08 21:10:56 +0000 |
| commit | 5c7f596b4c58b433d5c78f89d9a87ce4f28f50e7 (patch) | |
| tree | 3f2333e6c1d1c1a3b8fd0d3257d1c6db24fd074c | |
| parent | 54eba427ed4b415c636670aa0b1edaccf7b5ac9e (diff) | |
| download | bcm5719-llvm-5c7f596b4c58b433d5c78f89d9a87ce4f28f50e7.tar.gz bcm5719-llvm-5c7f596b4c58b433d5c78f89d9a87ce4f28f50e7.zip | |
Match GCC's behavior and do not include '-Wunused-parameter' in '-Wunused'.
llvm-svn: 100810
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticGroups.td | 3 | ||||
| -rw-r--r-- | clang/test/Sema/warn-unused-parameters.c | 15 | ||||
| -rw-r--r-- | clang/test/SemaObjC/unused.m | 2 |
3 files changed, 15 insertions, 5 deletions
diff --git a/clang/include/clang/Basic/DiagnosticGroups.td b/clang/include/clang/Basic/DiagnosticGroups.td index 524856880b9..1b2abfefd58 100644 --- a/clang/include/clang/Basic/DiagnosticGroups.td +++ b/clang/include/clang/Basic/DiagnosticGroups.td @@ -138,7 +138,8 @@ def Conversion : DiagGroup<"conversion", def Unused : DiagGroup<"unused", [UnusedArgument, UnusedFunction, UnusedLabel, - UnusedParameter, UnusedValue, UnusedVariable]>; + // UnusedParameter, (matches GCC's behavior) + UnusedValue, UnusedVariable]>; // Format settings. def Format : DiagGroup<"format", [FormatExtraArgs, FormatZeroLength, NonNull]>; diff --git a/clang/test/Sema/warn-unused-parameters.c b/clang/test/Sema/warn-unused-parameters.c index c6458cf9712..43ebdbff2b3 100644 --- a/clang/test/Sema/warn-unused-parameters.c +++ b/clang/test/Sema/warn-unused-parameters.c @@ -1,13 +1,22 @@ -// RUN: %clang -fblocks -fsyntax-only -Wunused-parameter %s -Xclang -verify +// RUN: %clang -fblocks -fsyntax-only -Wunused-parameter %s 2>&1 | FileCheck %s +// RUN: %clang -fblocks -fsyntax-only -Wunused %s 2>&1 | FileCheck -check-prefix=CHECK-unused %s int f0(int x, - int y, // expected-warning{{unused}} + int y, int z __attribute__((unused))) { return x; } void f1() { (void)^(int x, - int y, // expected-warning{{unused}} + int y, int z __attribute__((unused))) { return x; }; } + +// Used when testing '-Wunused' to see that we only emit one diagnostic, and no +// warnings for the above cases. +static void achor() {}; + +// CHECK: 5:12: warning: unused parameter 'y' +// CHECK: 12:15: warning: unused parameter 'y' +// CHECK-unused: 1 warning generated
\ No newline at end of file diff --git a/clang/test/SemaObjC/unused.m b/clang/test/SemaObjC/unused.m index a33a1bc02f9..7e1b10433df 100644 --- a/clang/test/SemaObjC/unused.m +++ b/clang/test/SemaObjC/unused.m @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 %s -verify -Wunused -fsyntax-only +// RUN: %clang_cc1 %s -verify -Wunused -Wunused-parameter -fsyntax-only int printf(const char *, ...); |
