Move the "used but marked unused" warning behind a special warning flag for now.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@117219 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/clang.xcodeproj/project.pbxproj b/clang.xcodeproj/project.pbxproj
index 9c95d0a3dee5c0ed6924daa5c0242b6448d219d0..fa1e24574e8f6ff71d0892d96891c27ec9d1669e 100644 (file)
--- a/clang.xcodeproj/project.pbxproj
+++ b/clang.xcodeproj/project.pbxproj
@@ -2039,6 +2039,7 @@
                        isa = PBXProject;
                        buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "clang" */;
                        compatibilityVersion = "Xcode 2.4";
+                       developmentRegion = English;
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,

diff --git a/include/clang/Basic/DiagnosticGroups.td b/include/clang/Basic/DiagnosticGroups.td
index 6894f79524705f4a73d283cd1b1236f9321f6fbe..2b7d44338519c37bd09bd3ffa3d7bacd9853c383 100644 (file)
--- a/include/clang/Basic/DiagnosticGroups.td
+++ b/include/clang/Basic/DiagnosticGroups.td
@@ -142,6 +142,7 @@ def UnusedLabel : DiagGroup<"unused-label">;
 def UnusedParameter : DiagGroup<"unused-parameter">;
 def UnusedValue    : DiagGroup<"unused-value">;
 def UnusedVariable : DiagGroup<"unused-variable">;
+def UsedBytMarkedUnused : DiagGroup<"used-but-marked-unused">;
 def ReadOnlySetterAttrs : DiagGroup<"readonly-setter-attrs">;
 def Reorder : DiagGroup<"reorder">;
 def UndeclaredSelector : DiagGroup<"undeclared-selector">;

diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index 553769cbf46fac2457d207ecbfd6a092c2a51eb2..35feca28039bbd5db061868cbad333a3d91bbe47 100644 (file)
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -109,7 +109,7 @@ def warn_unused_function : Warning<"unused function %0">,
 def warn_unused_member_function : Warning<"unused member function %0">,
   InGroup<UnusedMemberFunction>, DefaultIgnore;
 def warn_used_but_marked_unused: Warning<"%0 was marked unused but was used">,
-  InGroup<Unused>;
+  InGroup<UsedBytMarkedUnused>, DefaultIgnore;
 
 def warn_implicit_function_decl : Warning<
   "implicit declaration of function %0">,

diff --git a/test/Sema/attr-unused.c b/test/Sema/attr-unused.c
index 795b08312339a3607b92851f09bbfa739098413e..6a7ea951a36097e64ac7f3773f70580194e4e1fe 100644 (file)
--- a/test/Sema/attr-unused.c
+++ b/test/Sema/attr-unused.c
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -verify -Wunused -Wunused-parameter -Wunused -fsyntax-only %s
+// RUN: %clang_cc1 -verify -Wunused -Wused-but-marked-unused -Wunused-parameter -Wunused -fsyntax-only %s
 
 static void (*fp0)(void) __attribute__((unused));
 

diff --git a/test/Sema/pragma-unused.c b/test/Sema/pragma-unused.c
index 272f3a2f380a90680efb8ac2c7e54a7ef6d4047e..5f379458a2146f82a015de809c6f14906bf13b60 100644 (file)
--- a/test/Sema/pragma-unused.c
+++ b/test/Sema/pragma-unused.c
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -Wunused-parameter -verify %s
+// RUN: %clang_cc1 -fsyntax-only -Wunused-parameter -Wused-but-marked-unused -verify %s
 
 void f1(void) {
   int x, y, z;