diff options
| -rw-r--r-- | clang/Driver/RewriteObjC.cpp | 20 | ||||
| -rw-r--r-- | clang/include/clang/AST/DeclObjC.h | 8 | ||||
| -rw-r--r-- | clang/lib/AST/DeclObjC.cpp | 4 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaDecl.cpp | 3 |
4 files changed, 21 insertions, 14 deletions
diff --git a/clang/Driver/RewriteObjC.cpp b/clang/Driver/RewriteObjC.cpp index 73277d163a6..535cc0be3dc 100644 --- a/clang/Driver/RewriteObjC.cpp +++ b/clang/Driver/RewriteObjC.cpp @@ -2779,13 +2779,19 @@ void RewriteObjC::RewriteObjCCategoryImplDecl(ObjCCategoryImplDecl *IDecl, void RewriteObjC::SynthesizeIvarOffsetComputation(ObjCImplementationDecl *IDecl, ObjCIvarDecl *ivar, std::string &Result) { - Result += "__OFFSETOFIVAR__(struct "; - Result += IDecl->getName(); - if (LangOpts.Microsoft) - Result += "_IMPL"; - Result += ", "; - Result += ivar->getName(); - Result += ")"; + if (ivar->isBitField()) { + // FIXME: The hack below doesn't work for bitfields. For now, we simply + // place all bitfields at offset 0. + Result += "0"; + } else { + Result += "__OFFSETOFIVAR__(struct "; + Result += IDecl->getName(); + if (LangOpts.Microsoft) + Result += "_IMPL"; + Result += ", "; + Result += ivar->getName(); + Result += ")"; + } } //===----------------------------------------------------------------------===// diff --git a/clang/include/clang/AST/DeclObjC.h b/clang/include/clang/AST/DeclObjC.h index 2a79dd278d5..641ebb40357 100644 --- a/clang/include/clang/AST/DeclObjC.h +++ b/clang/include/clang/AST/DeclObjC.h @@ -451,12 +451,12 @@ public: /// } /// class ObjCIvarDecl : public FieldDecl { - ObjCIvarDecl(SourceLocation L, IdentifierInfo *Id, QualType T) - : FieldDecl(ObjCIvar, L, Id, T) {} + ObjCIvarDecl(SourceLocation L, IdentifierInfo *Id, QualType T, Expr *BW) + : FieldDecl(ObjCIvar, L, Id, T, BW) {} public: static ObjCIvarDecl *Create(ASTContext &C, SourceLocation L, - IdentifierInfo *Id, QualType T); - + IdentifierInfo *Id, QualType T, Expr *BW = NULL); + enum AccessControl { None, Private, Protected, Public, Package }; diff --git a/clang/lib/AST/DeclObjC.cpp b/clang/lib/AST/DeclObjC.cpp index ce9379f19c1..ef3b2d74fb9 100644 --- a/clang/lib/AST/DeclObjC.cpp +++ b/clang/lib/AST/DeclObjC.cpp @@ -89,9 +89,9 @@ void ObjCInterfaceDecl::Destroy(ASTContext& C) { ObjCIvarDecl *ObjCIvarDecl::Create(ASTContext &C, SourceLocation L, - IdentifierInfo *Id, QualType T) { + IdentifierInfo *Id, QualType T, Expr *BW) { void *Mem = C.getAllocator().Allocate<ObjCIvarDecl>(); - return new (Mem) ObjCIvarDecl(L, Id, T); + return new (Mem) ObjCIvarDecl(L, Id, T, BW); } ObjCProtocolDecl *ObjCProtocolDecl::Create(ASTContext &C, diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index f4d9da60147..00c73ea765c 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -1946,7 +1946,8 @@ Sema::DeclTy *Sema::ActOnIvar(Scope *S, InvalidDecl = true; } - ObjCIvarDecl *NewID = ObjCIvarDecl::Create(Context, Loc, II, T); + ObjCIvarDecl *NewID = ObjCIvarDecl::Create(Context, Loc, II, T, + (Expr *)BitfieldWidth); ProcessDeclAttributes(NewID, D); |
