diff options
| -rw-r--r-- | lib/Parse/ParseDeclCXX.cpp | 13 | ||||
| -rw-r--r-- | test/Index/annotate-attribute.cpp | 28 |
2 files changed, 21 insertions, 20 deletions
diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp index 09f8ab2fc1..472c64b221 100644 --- a/lib/Parse/ParseDeclCXX.cpp +++ b/lib/Parse/ParseDeclCXX.cpp @@ -2147,11 +2147,6 @@ void Parser::ParseCXXMemberSpecification(SourceLocation RecordLoc, SourceLocation EndLoc; if (Tok.is(tok::colon)) { EndLoc = Tok.getLocation(); - if (Actions.ActOnAccessSpecifier(AS, ASLoc, EndLoc, - AccessAttrs.getList())) { - // found another attribute than only annotations - AccessAttrs.clear(); - } ConsumeToken(); } else if (Tok.is(tok::semi)) { EndLoc = Tok.getLocation(); @@ -2163,7 +2158,13 @@ void Parser::ParseCXXMemberSpecification(SourceLocation RecordLoc, Diag(EndLoc, diag::err_expected_colon) << FixItHint::CreateInsertion(EndLoc, ":"); } - Actions.ActOnAccessSpecifier(AS, ASLoc, EndLoc); + + if (Actions.ActOnAccessSpecifier(AS, ASLoc, EndLoc, + AccessAttrs.getList())) { + // found another attribute than only annotations + AccessAttrs.clear(); + } + continue; } diff --git a/test/Index/annotate-attribute.cpp b/test/Index/annotate-attribute.cpp index 6721371ca7..d822210e49 100644 --- a/test/Index/annotate-attribute.cpp +++ b/test/Index/annotate-attribute.cpp @@ -17,17 +17,17 @@ protected: }; // CHECK: ClassDecl=Test:3:7 (Definition) Extent=[3:1 - 17:2] -// CHECK: CXXAccessSpecifier=:4:1 (Definition) Extent=[4:1 - 4:8] -// CHECK: CXXMethod=aMethod:5:51 Extent=[5:3 - 5:60] -// CHECK: attribute(annotate)=spiffy_method Extent=[5:18 - 5:43] -// CHECK: CXXAccessSpecifier=:7:1 (Definition) Extent=[7:1 - 7:43] -// CHECK: attribute(annotate)=works Extent=[7:23 - 7:40] -// CHECK: CXXMethod=anotherMethod:8:8 Extent=[8:3 - 8:23] -// CHECK: attribute(annotate)=works Extent=[7:23 - 7:40] -// CHECK: CXXAccessSpecifier=:10:1 (Definition) Extent=[10:1 - 10:53] -// CHECK: attribute(annotate)=investigations Extent=[10:24 - 10:50] -// CHECK: CXXMethod=inlineMethod:12:8 (Definition) Extent=[12:3 - 12:25] -// CHECK: attribute(annotate)=investigations Extent=[10:24 - 10:50] -// CHECK: CompoundStmt= Extent=[12:23 - 12:25] -// CHECK: CXXAccessSpecifier=:14:1 (Definition) Extent=[14:1 - 14:11] -// CHECK: CXXMethod=methodWithoutAttribute:16:8 Extent=[16:3 - 16:32] +// CHECK-NEXT: CXXAccessSpecifier=:4:1 (Definition) Extent=[4:1 - 4:8] +// CHECK-NEXT: CXXMethod=aMethod:5:51 Extent=[5:3 - 5:60] +// CHECK-NEXT: attribute(annotate)=spiffy_method Extent=[5:18 - 5:43] +// CHECK-NEXT: CXXAccessSpecifier=:7:1 (Definition) Extent=[7:1 - 7:43] +// CHECK-NEXT: attribute(annotate)=works Extent=[7:23 - 7:40] +// CHECK-NEXT: CXXMethod=anotherMethod:8:8 Extent=[8:3 - 8:23] +// CHECK-NEXT: attribute(annotate)=works Extent=[7:23 - 7:40] +// CHECK-NEXT: CXXAccessSpecifier=:10:1 (Definition) Extent=[10:1 - 10:53] +// CHECK-NEXT: attribute(annotate)=investigations Extent=[10:24 - 10:50] +// CHECK-NEXT: CXXMethod=inlineMethod:12:8 (Definition) Extent=[12:3 - 12:25] +// CHECK-NEXT: attribute(annotate)=investigations Extent=[10:24 - 10:50] +// CHECK-NEXT: CompoundStmt= Extent=[12:23 - 12:25] +// CHECK-NEXT: CXXAccessSpecifier=:14:1 (Definition) Extent=[14:1 - 14:11] +// CHECK-NEXT: CXXMethod=methodWithoutAttribute:16:8 Extent=[16:3 - 16:32] |