diff options
| -rw-r--r-- | lib/Parse/ParseDecl.cpp | 6 | ||||
| -rw-r--r-- | lib/Parse/ParseDeclCXX.cpp | 6 | ||||
| -rw-r--r-- | test/Index/c-index-api-loadTU-test.m | 2 | ||||
| -rw-r--r-- | test/Index/load-exprs.c | 3 |
4 files changed, 12 insertions, 5 deletions
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp index b5ba8acafc..8cf7a63397 100644 --- a/lib/Parse/ParseDecl.cpp +++ b/lib/Parse/ParseDecl.cpp @@ -1878,10 +1878,12 @@ void Parser::ParseEnumSpecifier(SourceLocation StartLoc, DeclSpec &DS, if (Tok.is(tok::l_brace)) ParseEnumBody(StartLoc, TagDecl); - // TODO: semantic analysis on the declspec for enums. + // FIXME: The DeclSpec should keep the locations of both the keyword and the + // name (if there is one). + SourceLocation TSTLoc = NameLoc.isValid()? NameLoc : StartLoc; const char *PrevSpec = 0; unsigned DiagID; - if (DS.SetTypeSpecType(DeclSpec::TST_enum, StartLoc, PrevSpec, DiagID, + if (DS.SetTypeSpecType(DeclSpec::TST_enum, TSTLoc, PrevSpec, DiagID, TagDecl.getAs<void>(), Owned)) Diag(StartLoc, DiagID) << PrevSpec; } diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp index efaf8ee327..04845d3b41 100644 --- a/lib/Parse/ParseDeclCXX.cpp +++ b/lib/Parse/ParseDeclCXX.cpp @@ -917,7 +917,11 @@ void Parser::ParseClassSpecifier(tok::TokenKind TagTokKind, const char *PrevSpec = 0; unsigned DiagID; - if (DS.SetTypeSpecType(TagType, StartLoc, PrevSpec, DiagID, + // FIXME: The DeclSpec should keep the locations of both the keyword and the + // name (if there is one). + SourceLocation TSTLoc = NameLoc.isValid()? NameLoc : StartLoc; + + if (DS.SetTypeSpecType(TagType, TSTLoc, PrevSpec, DiagID, Result, Owned)) Diag(StartLoc, DiagID) << PrevSpec; } diff --git a/test/Index/c-index-api-loadTU-test.m b/test/Index/c-index-api-loadTU-test.m index cf0dbff457..891e18b67d 100644 --- a/test/Index/c-index-api-loadTU-test.m +++ b/test/Index/c-index-api-loadTU-test.m @@ -65,7 +65,7 @@ int main (int argc, const char * argv[]) { // CHECK: <invalid loc>:87:81: FieldDecl=overflow_arg_area:87:81 (Definition) // CHECK: <invalid loc>:87:107: FieldDecl=reg_save_area:87:107 (Definition) // CHECK: <invalid loc>:87:123: TypedefDecl=__va_list_tag:87:123 (Definition) -// CHECK: <invalid loc>:87:9: TypeRef=struct __va_list_tag:87:16 +// CHECK: <invalid loc>:87:16: TypeRef=struct __va_list_tag:87:16 // CHECK: <invalid loc>:87:159: TypedefDecl=__builtin_va_list:87:159 (Definition) // CHECK: <invalid loc>:87:145: TypeRef=__va_list_tag:87:123 // CHECK: <invalid loc>:87:177: UnexposedExpr= diff --git a/test/Index/load-exprs.c b/test/Index/load-exprs.c index a360efd755..ea4d0ea529 100644 --- a/test/Index/load-exprs.c +++ b/test/Index/load-exprs.c @@ -10,4 +10,5 @@ void f(void *ptr) { // CHECK: load-exprs.c:4:15: TypeRef=T:1:13 [Extent=4:15:4:15] // CHECK: load-exprs.c:5:16: TypeRef=T:1:13 [Extent=5:16:5:16] -// FIXME: the source location for "struct X" points at "struct", not "X" +// CHECK: load-exprs.c:6:10: TypeRef=struct X:2:8 [Extent=6:10:6:10] +// CHECK: load-exprs.c:6:24: TypeRef=struct X:2:8 [Extent=6:24:6:24] |