commit 90618ff0b53f063a880c4933d44c70d6c1cb8dc0
author Richard Smith <richard-llvm@metafoo.co.uk> Mon Sep 23 23:12:22 2013 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Mon Sep 23 23:12:22 2013 +0000
tree 338c7eaa1002ffa01b4f4b29aee9bea51d96463b
parent ff89d06413ff79fb2314b9196fa2508e244159fc

Revert change accidentally committed in r191150.


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

lib/Sema/SemaTemplateInstantiateDecl.cpp

diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp
index d712cec..e03e8c5 100644
--- a/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -3372,9 +3372,7 @@
       OldVar->isPreviousDeclInSameBlockScope());
   NewVar->setAccess(OldVar->getAccess());
 
-  // For local variables, inherit the 'used' and 'referenced' flags from the
-  // primary template.
-  if (OldVar->getLexicalDeclContext()->isFunctionOrMethod()) {
+  if (!OldVar->isStaticDataMember()) {
     NewVar->setIsUsed(OldVar->isUsed(false));
     NewVar->setReferenced(OldVar->isReferenced());
   }