diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-09-23 23:12:22 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-09-23 23:12:22 +0000 |
| commit | 0b5511971e07f719fae115a6eca252d569b04aa5 (patch) | |
| tree | a17a6f6bb1a981209a32b03249167bd03e73355c /clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | |
| parent | ccac5c4bf91ad4ad1c6584b3ddb8d60c686ef089 (diff) | |
| download | bcm5719-llvm-0b5511971e07f719fae115a6eca252d569b04aa5.tar.gz bcm5719-llvm-0b5511971e07f719fae115a6eca252d569b04aa5.zip | |
Revert change accidentally committed in r191150.
llvm-svn: 191237
Diffstat (limited to 'clang/lib/Sema/SemaTemplateInstantiateDecl.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp index d712cec2204..e03e8c55c9a 100644 --- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -3372,9 +3372,7 @@ void Sema::BuildVariableInstantiation( 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()); } |
