AttributeList *MSPropertyAttr =
getMSPropertyAttr(D.getDeclSpec().getAttributes().getList());
- if (MSPropertyAttr) {\r
- Member = HandleMSProperty(S, cast<CXXRecordDecl>(CurContext), Loc, D,\r
- BitWidth, InitStyle, AS, MSPropertyAttr);\r
- if (!Member)\r
- return 0;\r
- isInstField = false;\r
- } else {\r
- Member = HandleField(S, cast<CXXRecordDecl>(CurContext), Loc, D,\r
- BitWidth, InitStyle, AS);\r
- assert(Member && "HandleField never returns null");\r
- }\r
- } else {\r
- assert(InitStyle == ICIS_NoInit || D.getDeclSpec().getStorageClassSpec() == DeclSpec::SCS_static);\r
-\r
- Member = HandleDeclarator(S, D, TemplateParameterLists);\r
- if (!Member)\r
- return 0;\r
-\r
- // Non-instance-fields can't have a bitfield.\r
- if (BitWidth) {\r
+ if (MSPropertyAttr) {
+ Member = HandleMSProperty(S, cast<CXXRecordDecl>(CurContext), Loc, D,
+ BitWidth, InitStyle, AS, MSPropertyAttr);
+ if (!Member)
+ return 0;
+ isInstField = false;
+ } else {
+ Member = HandleField(S, cast<CXXRecordDecl>(CurContext), Loc, D,
+ BitWidth, InitStyle, AS);
+ assert(Member && "HandleField never returns null");
+ }
+ } else {
+ assert(InitStyle == ICIS_NoInit || D.getDeclSpec().getStorageClassSpec() == DeclSpec::SCS_static);
+
+ Member = HandleDeclarator(S, D, TemplateParameterLists);
+ if (!Member)
+ return 0;
+
+ // Non-instance-fields can't have a bitfield.
+ if (BitWidth) {
if (Member->isInvalidDecl()) {
// don't emit another diagnostic.
} else if (isa<VarDecl>(Member)) {