intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-24 00:20:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Properly determine the end location of an ObjCObjectPointerType.

Browse Source 
After rGa9db0a804a53, we correctly determined the end for pointer types
like `id` that are spelled without a `*`, but incorrectly determined the
end for pointer types spelled with a `*`.
This commit is contained in:
Richard Smith
2021-10-29 13:12:51 -07:00
parent 0412c007e3
commit 68ffcd5213
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
clang/lib/AST/TypeLoc.cpp
View File

@@ -240,6 +240,8 @@ SourceLocation TypeLoc::getEndLoc() const {
case IncompleteArray:
case VariableArray:
case FunctionNoProto:
// The innermost type with suffix syntax always determines the end of the
// type.
Last = Cur;
break;
case FunctionProto:
@@ -248,16 +250,22 @@ SourceLocation TypeLoc::getEndLoc() const {
else
Last = Cur;
break;
case ObjCObjectPointer:
// `id` and `id<...>` have no star location.
if (Cur.castAs<ObjCObjectPointerTypeLoc>().getStarLoc().isInvalid())
break;
LLVM_FALLTHROUGH;
case Pointer:
case BlockPointer:
case MemberPointer:
case LValueReference:
case RValueReference:
case PackExpansion:
// Types with prefix syntax only determine the end of the type if there
// is no suffix type.
if (!Last)
Last = Cur;
break;
case ObjCObjectPointer:
case Qualified:
case Elaborated:
break;

7
clang/test/AST/ast-dump-decl.mm
View File

@@ -61,5 +61,8 @@ struct Test {
@protocol P
@end;
using TestAlias = id<P>;
// CHECK: TypeAliasDecl {{.+}} <{{.+}}:[[@LINE-1]]:1, col:23> col:7 TestAlias 'id<P>'
using TestObjCPointerWithoutStar = id<P>;
// CHECK: TypeAliasDecl {{.+}} <{{.+}}:[[@LINE-1]]:1, col:40> col:7 TestObjCPointerWithoutStar 'id<P>'
using TestObjCPointerWithStar = A *;
// CHECK: TypeAliasDecl {{.+}} <{{.+}}:[[@LINE-1]]:1, col:35> col:7 TestObjCPointerWithStar 'A *'