diff options
Diffstat (limited to 'lib/Sema')
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 5 | ||||
| -rw-r--r-- | lib/Sema/SemaDeclCXX.cpp | 4 | ||||
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 4 |
3 files changed, 12 insertions, 1 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 9c0a40e74a..fdc4aff031 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -1149,6 +1149,7 @@ Sema::ActOnDeclarator(Scope *S, Declarator &D, DeclTy *lastDecl) { // an error here Diag(D.getIdentifierLoc(), diag::err_mutable_nonmember); InvalidDecl = true; + break; } IdentifierInfo *II = Name.getAsIdentifierInfo(); @@ -2603,7 +2604,9 @@ Sema::DeclTy *Sema::ActOnField(Scope *S, if (getLangOptions().CPlusPlus) { // FIXME: Replace CXXFieldDecls with FieldDecls for simple structs. NewFD = CXXFieldDecl::Create(Context, cast<CXXRecordDecl>(CurContext), - Loc, II, T, BitWidth); + Loc, II, T, + D.getDeclSpec().getStorageClassSpec() == + DeclSpec::SCS_mutable, BitWidth); if (II) PushOnScopeChains(NewFD, S); } diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index f601fe4dc6..68dcdc8d2b 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -447,6 +447,8 @@ Sema::ActOnCXXMemberDeclarator(Scope *S, AccessSpecifier AS, Declarator &D, else Diag(DS.getThreadSpecLoc(), diag::err_mutable_function); + // FIXME: It would be nicer if the keyword was ignored only for this + // declarator. Otherwise we could get follow-up errors. D.getMutableDeclSpec().ClearStorageClassSpecs(); } else { QualType T = GetTypeForDeclarator(D, S); @@ -460,6 +462,8 @@ Sema::ActOnCXXMemberDeclarator(Scope *S, AccessSpecifier AS, Declarator &D, Diag(DS.getStorageClassSpecLoc(), err); else Diag(DS.getThreadSpecLoc(), err); + // FIXME: It would be nicer if the keyword was ignored only for this + // declarator. Otherwise we could get follow-up errors. D.getMutableDeclSpec().ClearStorageClassSpecs(); } } diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 0506b4076e..2b621f2a2e 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -951,6 +951,10 @@ ActOnMemberReferenceExpr(ExprTy *Base, SourceLocation OpLoc, QualType MemberType = MemberDecl->getType(); unsigned combinedQualifiers = MemberType.getCVRQualifiers() | BaseType.getCVRQualifiers(); + if (CXXFieldDecl *CXXMember = dyn_cast<CXXFieldDecl>(MemberDecl)) { + if (CXXMember->isMutable()) + combinedQualifiers &= ~QualType::Const; + } MemberType = MemberType.getQualifiedType(combinedQualifiers); return new MemberExpr(BaseExpr, OpKind == tok::arrow, MemberDecl, |