commit 0b5511971e07f719fae115a6eca252d569b04aa5
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 a17a6f6bb1a981209a32b03249167bd03e73355c
parent ccac5c4bf91ad4ad1c6584b3ddb8d60c686ef089

Revert change accidentally committed in r191150.

llvm-svn: 191237

clang/lib/Sema/SemaTemplateInstantiateDecl.cpp

diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index d712cec..e03e8c5 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/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());
   }