[cfe-commits] r124383 - in /cfe/trunk: include/clang/Basic/DiagnosticSemaKinds.td lib/Sema/SemaAttr.cpp test/Sema/pragma-unused.c

[Argyrios Kyrtzidis]

Author: akirtzidis
Date: Thu Jan 27 12:16:48 2011
New Revision: 124383

URL: http://llvm.org/viewvc/llvm-project?rev=124383&view=rev
Log:
Allow #pragma unused to be used on global variables like gcc. Fixes rdar://8793832.

Modified:
    cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
    cfe/trunk/lib/Sema/SemaAttr.cpp
    cfe/trunk/test/Sema/pragma-unused.c

Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=124383&r1=124382&r2=124383&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Thu Jan 27 12:16:48 2011
@@ -279,8 +279,8 @@
 
 def warn_pragma_unused_undeclared_var : Warning<
   "undeclared variable %0 used as an argument for '#pragma unused'">;
-def warn_pragma_unused_expected_localvar : Warning<
-  "only local variables can be arguments to '#pragma unused'">;
+def warn_pragma_unused_expected_var_arg : Warning<
+  "only variables can be arguments to '#pragma unused'">;
 def err_unsupported_pragma_weak : Error<
   "using '#pragma weak' to refer to an undeclared identifier is not yet supported">;
 

Modified: cfe/trunk/lib/Sema/SemaAttr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaAttr.cpp?rev=124383&r1=124382&r2=124383&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaAttr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaAttr.cpp Thu Jan 27 12:16:48 2011
@@ -277,8 +277,8 @@
   }
 
   VarDecl *VD = Lookup.getAsSingle<VarDecl>();
-  if (!VD || !(VD->hasLocalStorage() || VD->isStaticLocal())) {
-    Diag(PragmaLoc, diag::warn_pragma_unused_expected_localvar)
+  if (!VD) {
+    Diag(PragmaLoc, diag::warn_pragma_unused_expected_var_arg)
       << Name << SourceRange(IdTok.getLocation());
     return;
   }

Modified: cfe/trunk/test/Sema/pragma-unused.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/pragma-unused.c?rev=124383&r1=124382&r2=124383&view=diff
==============================================================================
--- cfe/trunk/test/Sema/pragma-unused.c (original)
+++ cfe/trunk/test/Sema/pragma-unused.c Thu Jan 27 12:16:48 2011
@@ -1,16 +1,16 @@
-// RUN: %clang_cc1 -fsyntax-only -Wunused-parameter -Wused-but-marked-unused -verify %s
+// RUN: %clang_cc1 -fsyntax-only -Wunused-parameter -Wused-but-marked-unused -Wunused -verify %s
 
 void f1(void) {
   int x, y, z;
   #pragma unused(x)
   #pragma unused(y, z)
   
-  int w; // FIXME: We should emit a warning that 'w' is unused.  
+  int w; // expected-warning {{unused}}
   #pragma unused w // expected-warning{{missing '(' after '#pragma unused' - ignoring}}
 }
 
 void f2(void) {
-  int x, y;
+  int x, y; // expected-warning {{unused}} expected-warning {{unused}}
   #pragma unused(x,) // expected-warning{{expected '#pragma unused' argument to be a variable name}}
   #pragma unused() // expected-warning{{expected '#pragma unused' argument to be a variable name}}
 }
@@ -20,15 +20,10 @@
 }
 
 void f4(void) {
-  int w; // FIXME: We should emit a warning that 'w' is unused.
+  int w; // expected-warning {{unused}}
   #pragma unused((w)) // expected-warning{{expected '#pragma unused' argument to be a variable name}}
 }
 
-int k;
-void f5(void) {
-  #pragma unused(k) // expected-warning{{only local variables can be arguments to '#pragma unused'}}
-}
-
 void f6(void) {
   int z; // no-warning
   {
@@ -64,3 +59,7 @@
   #pragma unused(x) // expected-warning{{'x' was marked unused but was used}}
   return y;
 }
+
+// rdar://8793832
+static int glob_var = 0;
+#pragma unused(glob_var)