[cfe-commits] r159282 - in /cfe/trunk: include/clang/Basic/DiagnosticSemaKinds.td lib/Sema/Sema.cpp test/SemaCXX/warn-static-function-inheader.cpp test/SemaCXX/warn-static-function-inheader.h

[Fariborz Jahanian]

Author: fjahanian
Date: Wed Jun 27 14:43:29 2012
New Revision: 159282

URL: http://llvm.org/viewvc/llvm-project?rev=159282&view=rev
Log:
patch to suggest 'static' function should be 'static inline' 
when it appears to be unused and occurs in a header.
// rdar://11202617

Added:
    cfe/trunk/test/SemaCXX/warn-static-function-inheader.cpp
    cfe/trunk/test/SemaCXX/warn-static-function-inheader.h
Modified:
    cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
    cfe/trunk/lib/Sema/Sema.cpp

Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=159282&r1=159281&r2=159282&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Wed Jun 27 14:43:29 2012
@@ -170,6 +170,10 @@
 def warn_unneeded_internal_decl : Warning<
   "%select{function|variable}0 %1 is not needed and will not be emitted">,
   InGroup<UnneededInternalDecl>, DefaultIgnore;
+def warn_unneeded_static_internal_decl : Warning<
+  "'static' function %0 declared in header file "
+  "should be declared 'static inline'">,
+  InGroup<UnneededInternalDecl>, DefaultIgnore;
 def warn_unneeded_member_function : Warning<
   "member function %0 is not needed and will not be emitted">,
   InGroup<UnneededMemberFunction>, DefaultIgnore;

Modified: cfe/trunk/lib/Sema/Sema.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/Sema.cpp?rev=159282&r1=159281&r2=159282&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/Sema.cpp (original)
+++ cfe/trunk/lib/Sema/Sema.cpp Wed Jun 27 14:43:29 2012
@@ -682,9 +682,17 @@
           if (isa<CXXMethodDecl>(DiagD))
             Diag(DiagD->getLocation(), diag::warn_unneeded_member_function)
                   << DiagD->getDeclName();
-          else
-            Diag(DiagD->getLocation(), diag::warn_unneeded_internal_decl)
-                  << /*function*/0 << DiagD->getDeclName();
+          else {
+            if (FD->getStorageClassAsWritten() == SC_Static &&
+                !FD->isInlineSpecified() &&
+                !SourceMgr.isFromMainFile(
+                   SourceMgr.getExpansionLoc(FD->getLocation())))
+              Diag(DiagD->getLocation(), diag::warn_unneeded_static_internal_decl)
+                << DiagD->getDeclName();
+            else
+              Diag(DiagD->getLocation(), diag::warn_unneeded_internal_decl)
+                   << /*function*/0 << DiagD->getDeclName();
+          }
         } else {
           Diag(DiagD->getLocation(),
                isa<CXXMethodDecl>(DiagD) ? diag::warn_unused_member_function

Added: cfe/trunk/test/SemaCXX/warn-static-function-inheader.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/warn-static-function-inheader.cpp?rev=159282&view=auto
==============================================================================
--- cfe/trunk/test/SemaCXX/warn-static-function-inheader.cpp (added)
+++ cfe/trunk/test/SemaCXX/warn-static-function-inheader.cpp Wed Jun 27 14:43:29 2012
@@ -0,0 +1,12 @@
+#include "warn-static-function-inheader.h"
+// RUN: %clang_cc1 -fsyntax-only -verify -Wall %s
+// rdar://11202617
+
+static void another(void) { // expected-warning {{function 'another' is not needed and will not be emitted}}
+}
+
+template <typename T>
+void foo(void) {
+        thing();
+	another();
+}

Added: cfe/trunk/test/SemaCXX/warn-static-function-inheader.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/warn-static-function-inheader.h?rev=159282&view=auto
==============================================================================
--- cfe/trunk/test/SemaCXX/warn-static-function-inheader.h (added)
+++ cfe/trunk/test/SemaCXX/warn-static-function-inheader.h Wed Jun 27 14:43:29 2012
@@ -0,0 +1,3 @@
+static void thing(void) { // expected-warning {{'static' function 'thing' declared in header file should be declared 'static inline'}}
+}
+