summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaDecl.cpp
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@mac.com>2009-03-25 23:38:06 +0000
committerAnders Carlsson <andersca@mac.com>2009-03-25 23:38:06 +0000
commita28908d575ed0180eddfd4fa7f25ac267a1f0ca3 (patch)
treeec85bed6941f2dfb006f6f845d37066c7d7185fa /clang/lib/Sema/SemaDecl.cpp
parentef1a09a3368c4ac421c00d14923cd31902ba9dfb (diff)
downloadbcm5719-llvm-a28908d575ed0180eddfd4fa7f25ac267a1f0ca3.tar.gz
bcm5719-llvm-a28908d575ed0180eddfd4fa7f25ac267a1f0ca3.zip
Tighten the setAccess assert. We now allow AS_none if the decl contex is not a C++ record decl.
Also, fix fallout from the change. llvm-svn: 67717
Diffstat (limited to 'clang/lib/Sema/SemaDecl.cpp')
-rw-r--r--clang/lib/Sema/SemaDecl.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 220113734f0..835792ee2db 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -3384,7 +3384,9 @@ CreateNewDecl:
// lexical context will be different from the semantic context.
New->setLexicalDeclContext(CurContext);
- if (AS != AS_none)
+ if (PrevDecl)
+ New->setAccess(PrevDecl->getAccess());
+ else
New->setAccess(AS);
if (TK == TK_Definition)
OpenPOWER on IntegriCloud