Revert functional part of r166896 and just suppress -Wunneeded-internal-declaration for reference types for now. This needs more work; the cases we currently miss are a bit random.

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

2 files changed, 10 insertions, 10 deletions

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 6eef427731..0eb123105b 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -1204,18 +1204,17 @@ bool Sema::ShouldWarnIfUnusedFileScopedDecl(const DeclaratorDecl *D) const {
         Context.DeclMustBeEmitted(FD))
       return false;
   } else if (const VarDecl *VD = dyn_cast<VarDecl>(D)) {
+    // Don't warn on variables of const-qualified or reference type, since their
+    // values can be used even if though they're not odr-used, and because const
+    // qualified variables can appear in headers in contexts where they're not
+    // intended to be used.
+    // FIXME: Use more principled rules for these exemptions.
     if (!VD->isFileVarDecl() ||
+        VD->getType().isConstQualified() ||
+        VD->getType()->isReferenceType() ||
         Context.DeclMustBeEmitted(VD))
       return false;
 
-    // If a variable is usable in constant expressions and it's not odr-used,
-    // its value may still have been used. Conservatively suppress the warning
-    // in this case.
-    const VarDecl *VDWithInit = 0;
-    if (VD->isUsableInConstantExpressions(Context) &&
-        VD->getAnyInitializer(VDWithInit) && VDWithInit->checkInitIsICE())
-      return false;
-
     if (VD->isStaticDataMember() &&
         VD->getTemplateSpecializationKind() == TSK_ImplicitInstantiation)
       return false;
diff --git a/test/SemaCXX/warn-unused-filescoped.cpp b/test/SemaCXX/warn-unused-filescoped.cpp
index 328d8bbb5b..ad896b5212 100644
--- a/test/SemaCXX/warn-unused-filescoped.cpp
+++ b/test/SemaCXX/warn-unused-filescoped.cpp
@@ -95,8 +95,9 @@ namespace test5 {
   int f(int &);
   int k = f(r);
 
-  static const int m = n; // expected-warning {{not needed and will not be emitted}}
+  // FIXME: We should produce warnings for both of these.
+  static const int m = n;
   int x = sizeof(m);
-  static const double d = 0.0; // expected-warning {{not needed and will not be emitted}}
+  static const double d = 0.0;
   int y = sizeof(d);
 }