diff options
Diffstat (limited to 'test/Index')
32 files changed, 995 insertions, 429 deletions
diff --git a/test/Index/TestClassDecl.m b/test/Index/TestClassDecl.m index 1aa26ac77c12..2e11191dca63 100644 --- a/test/Index/TestClassDecl.m +++ b/test/Index/TestClassDecl.m @@ -28,6 +28,6 @@ void function(Foo * arg) // CHECK-scan: [14:1 - 16:2] UnexposedStmt= // CHECK-load: TestClassDecl.m:10:12: ObjCInterfaceDecl=Foo:10:12 Extent=[10:1 - 11:5] -// CHECK-load: TestClassDecl.m:13:6: FunctionDecl=function:13:6 (Definition) Extent=[13:6 - 16:2] +// CHECK-load: TestClassDecl.m:13:6: FunctionDecl=function:13:6 (Definition) Extent=[13:1 - 16:2] // CHECK-load: TestClassDecl.m:13:21: ParmDecl=arg:13:21 (Definition) Extent=[13:15 - 13:24] diff --git a/test/Index/annotate-context-sensitive.cpp b/test/Index/annotate-context-sensitive.cpp new file mode 100644 index 000000000000..307bced59f9b --- /dev/null +++ b/test/Index/annotate-context-sensitive.cpp @@ -0,0 +1,42 @@ +class Base { +public: + virtual void f(); +}; + +class Derived final : public Base { + virtual void f() override final; + + struct final { }; +}; + +typedef int override; +struct Base2 { + virtual int override(); +}; + +struct Derived2 : Base2 { + ::override override() override; +}; + +// RUN: c-index-test -test-annotate-tokens=%s:6:1:19:1 %s | FileCheck -check-prefix=CHECK-OVERRIDE-FINAL %s + +// CHECK-OVERRIDE-FINAL: Keyword: "class" [6:1 - 6:6] ClassDecl=Derived:6:7 (Definition) +// CHECK-OVERRIDE-FINAL: Identifier: "Derived" [6:7 - 6:14] ClassDecl=Derived:6:7 (Definition) +// CHECK-OVERRIDE-FINAL: Keyword: "final" [6:15 - 6:20] ClassDecl=Derived:6:7 (Definition) +// CHECK-OVERRIDE-FINAL: Punctuation: ":" [6:21 - 6:22] ClassDecl=Derived:6:7 (Definition) +// CHECK-OVERRIDE-FINAL: Keyword: "public" [6:23 - 6:29] C++ base class specifier=class Base:1:7 [access=public isVirtual=false] +// CHECK-OVERRIDE-FINAL: Identifier: "Base" [6:30 - 6:34] TypeRef=class Base:1:7 +// CHECK-OVERRIDE-FINAL: Punctuation: "{" [6:35 - 6:36] ClassDecl=Derived:6:7 (Definition) +// CHECK-OVERRIDE-FINAL: Keyword: "virtual" [7:3 - 7:10] ClassDecl=Derived:6:7 (Definition) +// CHECK-OVERRIDE-FINAL: Keyword: "void" [7:11 - 7:15] CXXMethod=f:7:16 [Overrides @3:16] +// CHECK-OVERRIDE-FINAL: Identifier: "f" [7:16 - 7:17] CXXMethod=f:7:16 [Overrides @3:16] +// CHECK-OVERRIDE-FINAL: Punctuation: "(" [7:17 - 7:18] CXXMethod=f:7:16 [Overrides @3:16] +// CHECK-OVERRIDE-FINAL: Punctuation: ")" [7:18 - 7:19] CXXMethod=f:7:16 [Overrides @3:16] +// CHECK-OVERRIDE-FINAL: Keyword: "override" [7:20 - 7:28] CXXMethod=f:7:16 [Overrides @3:16] +// CHECK-OVERRIDE-FINAL: Keyword: "final" [7:29 - 7:34] CXXMethod=f:7:16 [Overrides @3:16] +// CHECK-OVERRIDE-FINAL: Punctuation: ";" [7:34 - 7:35] ClassDecl=Derived:6:7 (Definition) +// CHECK-OVERRIDE-FINAL: Keyword: "struct" [9:3 - 9:9] StructDecl=final:9:10 (Definition) +// CHECK-OVERRIDE-FINAL: Identifier: "final" [9:10 - 9:15] StructDecl=final:9:10 (Definition) +// CHECK-OVERRIDE-FINAL: Punctuation: "{" [9:16 - 9:17] StructDecl=final:9:10 (Definition) +// CHECK-OVERRIDE-FINAL: Punctuation: "}" [9:18 - 9:19] StructDecl=final:9:10 (Definition) +// CHECK-OVERRIDE-FINAL: Punctuation: ";" [9:19 - 9:20] ClassDecl=Derived:6:7 (Definition) diff --git a/test/Index/annotate-nested-name-specifier.cpp b/test/Index/annotate-nested-name-specifier.cpp index 70d84889e996..7c83740f0888 100644 --- a/test/Index/annotate-nested-name-specifier.cpp +++ b/test/Index/annotate-nested-name-specifier.cpp @@ -58,7 +58,86 @@ struct X3 { } }; -// RUN: c-index-test -test-annotate-tokens=%s:13:1:60:1 %s | FileCheck %s +namespace outer { + namespace inner { + void f(int); + void f(double); + } +} + +template<typename T> +struct X4 { + typedef T type; + void g(int); + void g(float); + + void h(T t) { + ::outer_alias::inner::f(t); + ::X4<type>::g(t); + this->::X4<type>::g(t); + } +}; + +typedef int Integer; +template<> +struct X4<Integer> { + typedef Integer type; + + void g(int); + void g(float); + + void h(type t) { + ::outer_alias::inner::f(t); + ::X4<type>::g(t); + this->::X4<type>::g(t); + } +}; + + +template<typename T> +struct X5 { + typedef T type; + typedef typename outer_alias::inner::vector<type>::iterator iter_type; + typedef typename outer_alias::inner::vector<int>::iterator int_ptr_type; +}; + +template<typename T> +struct X6 { + typedef T* type; + typedef typename outer_alias::inner::vector<type>::template rebind<type> type1; + typedef typename outer_alias::inner::vector<type>::template rebind<type>::other type2; + typedef class outer_alias::inner::vector<type>::template rebind<type> type3; + typedef class outer_alias::inner::vector<type>::template rebind<type>::other type4; +}; + +namespace outer { + namespace inner { + template<typename T, template<class> class TT> + struct apply_meta { + typedef typename TT<T>::type type; + }; + } +} + +template<typename T, typename U> +struct X7 { + typedef T T_type; + typedef U U_type; + typedef outer_alias::inner::apply_meta<T_type, U_type::template apply> type; +}; + +struct X8 { + void f(); +}; + +struct X9 : X8 { + typedef X8 inherited; + void f() { + inherited::f(); + } +}; + +// RUN: c-index-test -test-annotate-tokens=%s:13:1:137:1 %s | FileCheck %s // CHECK: Keyword: "using" [14:1 - 14:6] UsingDeclaration=vector[4:12] // CHECK: Identifier: "outer_alias" [14:7 - 14:18] NamespaceRef=outer_alias:10:11 @@ -67,7 +146,18 @@ struct X3 { // CHECK: Punctuation: "::" [14:25 - 14:27] UsingDeclaration=vector[4:12] // CHECK: Identifier: "vector" [14:27 - 14:33] OverloadedDeclRef=vector[4:12] // CHECK: Punctuation: ";" [14:33 - 14:34] -// FIXME: Base specifiers, too + +// Base specifiers +// CHECK: Identifier: "outer_alias" [16:19 - 16:30] NamespaceRef=outer_alias:10:11 +// CHECK: Punctuation: "::" [16:30 - 16:32] C++ base class specifier=outer_alias::inner::vector<X>:4:12 [access=public isVirtual=false] +// CHECK: Identifier: "inner" [16:32 - 16:37] NamespaceRef=inner:2:13 +// CHECK: Punctuation: "::" [16:37 - 16:39] C++ base class specifier=outer_alias::inner::vector<X>:4:12 [access=public isVirtual=false] +// CHECK: Identifier: "vector" [16:39 - 16:45] TemplateRef=vector:4:12 +// CHECK: Punctuation: "<" [16:45 - 16:46] C++ base class specifier=outer_alias::inner::vector<X>:4:12 [access=public isVirtual=false] +// CHECK: Identifier: "X" [16:46 - 16:47] TypeRef=struct X:12:8 +// CHECK: Punctuation: ">" [16:47 - 16:48] C++ base class specifier=outer_alias::inner::vector<X>:4:12 [access=public isVirtual=false] + + // CHECK: Keyword: "using" [17:3 - 17:8] UsingDeclaration=iterator[5:18] // CHECK: Identifier: "outer_alias" [17:9 - 17:20] NamespaceRef=outer_alias:10:11 // CHECK: Punctuation: "::" [17:20 - 17:22] UsingDeclaration=iterator[5:18] @@ -80,7 +170,38 @@ struct X3 { // CHECK: Punctuation: "::" [17:38 - 17:40] UsingDeclaration=iterator[5:18] // CHECK: Identifier: "iterator" [17:40 - 17:48] OverloadedDeclRef=iterator[5:18] -// FIXME: Check nested-name-specifiers on VarDecl, CXXMethodDecl. +// CHECK: Keyword: "void" [31:1 - 31:5] CXXMethod=foo:31:33 (Definition) +// CHECK: Identifier: "outer" [31:6 - 31:11] NamespaceRef=outer:20:11 +// CHECK: Punctuation: "::" [31:11 - 31:13] CXXMethod=foo:31:33 (Definition) +// CHECK: Identifier: "inner" [31:13 - 31:18] NamespaceRef=inner:21:13 +// CHECK: Punctuation: "::" [31:18 - 31:20] CXXMethod=foo:31:33 (Definition) +// CHECK: Identifier: "array" [31:20 - 31:25] TemplateRef=array:23:12 +// CHECK: Punctuation: "<" [31:25 - 31:26] CXXMethod=foo:31:33 (Definition) +// CHECK: Identifier: "T" [31:26 - 31:27] TypeRef=T:30:19 +// CHECK: Punctuation: "," [31:27 - 31:28] CXXMethod=foo:31:33 (Definition) +// CHECK: Identifier: "N" [31:29 - 31:30] DeclRefExpr=N:30:31 +// CHECK: Punctuation: ">" [31:30 - 31:31] CXXMethod=foo:31:33 (Definition) +// CHECK: Punctuation: "::" [31:31 - 31:33] CXXMethod=foo:31:33 (Definition) +// CHECK: Identifier: "foo" [31:33 - 31:36] CXXMethod=foo:31:33 (Definition) +// CHECK: Punctuation: "(" [31:36 - 31:37] CXXMethod=foo:31:33 (Definition) +// CHECK: Punctuation: ")" [31:37 - 31:38] CXXMethod=foo:31:33 (Definition) + +// CHECK: Keyword: "int" [35:1 - 35:4] VarDecl=max_size:35:32 (Definition) +// CHECK: Identifier: "outer" [35:5 - 35:10] NamespaceRef=outer:20:11 +// CHECK: Punctuation: "::" [35:10 - 35:12] VarDecl=max_size:35:32 (Definition) +// CHECK: Identifier: "inner" [35:12 - 35:17] NamespaceRef=inner:21:13 +// CHECK: Punctuation: "::" [35:17 - 35:19] VarDecl=max_size:35:32 (Definition) +// CHECK: Identifier: "array" [35:19 - 35:24] TemplateRef=array:23:12 +// CHECK: Punctuation: "<" [35:24 - 35:25] VarDecl=max_size:35:32 (Definition) +// CHECK: Identifier: "T" [35:25 - 35:26] TypeRef=T:34:19 +// CHECK: Punctuation: "," [35:26 - 35:27] VarDecl=max_size:35:32 (Definition) +// CHECK: Identifier: "N" [35:28 - 35:29] DeclRefExpr=N:34:31 +// CHECK: Punctuation: ">" [35:29 - 35:30] VarDecl=max_size:35:32 (Definition) +// CHECK: Punctuation: "::" [35:30 - 35:32] VarDecl=max_size:35:32 (Definition) +// CHECK: Identifier: "max_size" [35:32 - 35:40] VarDecl=max_size:35:32 (Definition) +// CHECK: Punctuation: "=" [35:41 - 35:42] VarDecl=max_size:35:32 (Definition) +// CHECK: Literal: "17" [35:43 - 35:45] UnexposedExpr= +// CHECK: Punctuation: ";" [35:45 - 35:46] // CHECK: Keyword: "using" [40:3 - 40:8] UsingDeclaration=iterator:40:46 // CHECK: Keyword: "typename" [40:9 - 40:17] UsingDeclaration=iterator:40:46 @@ -138,13 +259,208 @@ struct X3 { // CHECK: Keyword: "template" [57:30 - 57:38] UnexposedExpr= // CHECK: Identifier: "vector" [57:39 - 57:45] TemplateRef=vector:4:12 // CHECK: Punctuation: "<" [57:45 - 57:46] UnexposedExpr= -// CHECK: Identifier: "T" [57:46 - 57:47] UnexposedExpr= +// CHECK: Identifier: "T" [57:46 - 57:47] TypeRef=T:54:19 // CHECK: Punctuation: ">" [57:47 - 57:48] UnexposedExpr= // CHECK: Punctuation: "::" [57:48 - 57:50] UnexposedExpr= // CHECK: Punctuation: "~" [57:50 - 57:51] UnexposedExpr= // CHECK: Identifier: "vector" [57:51 - 57:57] TemplateRef=vector:4:12 // CHECK: Punctuation: "<" [57:57 - 57:58] UnexposedExpr= -// CHECK: Identifier: "T" [57:58 - 57:59] UnexposedExpr= -// CHECK: Punctuation: ">" [57:59 - 57:60] UnexposedExpr= +// CHECK: Identifier: "T" [57:58 - 57:59] TypeRef=T:54:19 +// CHECK: Punctuation: ">" [57:59 - 57:60] CallExpr= // CHECK: Punctuation: "(" [57:60 - 57:61] CallExpr= // CHECK: Punctuation: ")" [57:61 - 57:62] CallExpr= + +// Unresolved member and non-member references +// CHECK: Punctuation: "::" [75:5 - 75:7] UnexposedExpr=[63:10, 64:10] +// CHECK: Identifier: "outer_alias" [75:7 - 75:18] NamespaceRef=outer_alias:10:11 +// CHECK: Punctuation: "::" [75:18 - 75:20] UnexposedExpr=[63:10, 64:10] +// CHECK: Identifier: "inner" [75:20 - 75:25] NamespaceRef=inner:62:13 +// CHECK: Punctuation: "::" [75:25 - 75:27] UnexposedExpr=[63:10, 64:10] +// CHECK: Identifier: "f" [75:27 - 75:28] OverloadedDeclRef=f[63:10, 64:10] +// CHECK: Punctuation: "(" [75:28 - 75:29] CallExpr= +// CHECK: Identifier: "t" [75:29 - 75:30] DeclRefExpr=t:74:12 +// CHECK: Punctuation: ")" [75:30 - 75:31] CallExpr= +// CHECK: Punctuation: "::" [76:5 - 76:7] UnexposedExpr=[71:8, 72:8] +// CHECK: Identifier: "X4" [76:7 - 76:9] TemplateRef=X4:69:8 +// CHECK: Punctuation: "<" [76:9 - 76:10] UnexposedExpr=[71:8, 72:8] +// CHECK: Identifier: "type" [76:10 - 76:14] TypeRef=type:70:13 +// CHECK: Punctuation: ">" [76:14 - 76:15] UnexposedExpr=[71:8, 72:8] +// CHECK: Punctuation: "::" [76:15 - 76:17] UnexposedExpr=[71:8, 72:8] +// CHECK: Identifier: "g" [76:17 - 76:18] OverloadedDeclRef=g[71:8, 72:8] +// CHECK: Punctuation: "(" [76:18 - 76:19] CallExpr= +// CHECK: Identifier: "t" [76:19 - 76:20] DeclRefExpr=t:74:12 +// CHECK: Punctuation: ")" [76:20 - 76:21] CallExpr= +// CHECK: Punctuation: ";" [76:21 - 76:22] UnexposedStmt= +// CHECK: Keyword: "this" [77:5 - 77:9] UnexposedExpr= +// CHECK: Punctuation: "->" [77:9 - 77:11] UnexposedExpr= +// CHECK: Punctuation: "::" [77:11 - 77:13] UnexposedExpr= +// CHECK: Identifier: "X4" [77:13 - 77:15] TemplateRef=X4:69:8 +// CHECK: Punctuation: "<" [77:15 - 77:16] UnexposedExpr= +// CHECK: Identifier: "type" [77:16 - 77:20] TypeRef=type:70:13 +// CHECK: Punctuation: ">" [77:20 - 77:21] UnexposedExpr= +// CHECK: Punctuation: "::" [77:21 - 77:23] UnexposedExpr= +// CHECK: Identifier: "g" [77:23 - 77:24] UnexposedExpr= +// CHECK: Punctuation: "(" [77:24 - 77:25] CallExpr= +// CHECK: Identifier: "t" [77:25 - 77:26] DeclRefExpr=t:74:12 +// CHECK: Punctuation: ")" [77:26 - 77:27] CallExpr= + +// Resolved member and non-member references +// CHECK: Punctuation: "::" [90:5 - 90:7] DeclRefExpr=f:63:10 +// CHECK: Identifier: "outer_alias" [90:7 - 90:18] NamespaceRef=outer_alias:10:11 +// CHECK: Punctuation: "::" [90:18 - 90:20] DeclRefExpr=f:63:10 +// CHECK: Identifier: "inner" [90:20 - 90:25] NamespaceRef=inner:62:13 +// CHECK: Punctuation: "::" [90:25 - 90:27] DeclRefExpr=f:63:10 +// CHECK: Identifier: "f" [90:27 - 90:28] DeclRefExpr=f:63:10 +// CHECK: Punctuation: "(" [90:28 - 90:29] CallExpr=f:63:10 +// CHECK: Identifier: "t" [90:29 - 90:30] DeclRefExpr=t:89:15 +// CHECK: Punctuation: ")" [90:30 - 90:31] CallExpr=f:63:10 +// CHECK: Punctuation: ";" [90:31 - 90:32] UnexposedStmt= +// CHECK: Punctuation: "::" [91:5 - 91:7] MemberRefExpr=g:86:8 +// CHECK: Identifier: "X4" [91:7 - 91:9] TemplateRef=X4:69:8 +// CHECK: Punctuation: "<" [91:9 - 91:10] MemberRefExpr=g:86:8 +// CHECK: Identifier: "type" [91:10 - 91:14] TypeRef=type:84:19 +// CHECK: Punctuation: ">" [91:14 - 91:15] MemberRefExpr=g:86:8 +// CHECK: Punctuation: "::" [91:15 - 91:17] MemberRefExpr=g:86:8 +// CHECK: Identifier: "g" [91:17 - 91:18] MemberRefExpr=g:86:8 +// CHECK: Punctuation: "(" [91:18 - 91:19] CallExpr=g:86:8 +// CHECK: Identifier: "t" [91:19 - 91:20] DeclRefExpr=t:89:15 +// CHECK: Punctuation: ")" [91:20 - 91:21] CallExpr=g:86:8 +// CHECK: Punctuation: ";" [91:21 - 91:22] UnexposedStmt= +// CHECK: Keyword: "this" [92:5 - 92:9] UnexposedExpr= +// CHECK: Punctuation: "->" [92:9 - 92:11] MemberRefExpr=g:86:8 +// CHECK: Punctuation: "::" [92:11 - 92:13] MemberRefExpr=g:86:8 +// CHECK: Identifier: "X4" [92:13 - 92:15] TemplateRef=X4:69:8 +// CHECK: Punctuation: "<" [92:15 - 92:16] MemberRefExpr=g:86:8 +// CHECK: Identifier: "type" [92:16 - 92:20] TypeRef=type:84:19 +// CHECK: Punctuation: ">" [92:20 - 92:21] MemberRefExpr=g:86:8 +// CHECK: Punctuation: "::" [92:21 - 92:23] MemberRefExpr=g:86:8 +// CHECK: Identifier: "g" [92:23 - 92:24] MemberRefExpr=g:86:8 +// CHECK: Punctuation: "(" [92:24 - 92:25] CallExpr=g:86:8 +// CHECK: Identifier: "t" [92:25 - 92:26] DeclRefExpr=t:89:15 +// CHECK: Punctuation: ")" [92:26 - 92:27] CallExpr=g:86:8 + +// Dependent name type +// CHECK: Keyword: "typedef" [100:3 - 100:10] ClassTemplate=X5:98:8 (Definition) +// CHECK: Keyword: "typename" [100:11 - 100:19] TypedefDecl=iter_type:100:63 (Definition) +// CHECK: Identifier: "outer_alias" [100:20 - 100:31] NamespaceRef=outer_alias:10:11 +// CHECK: Punctuation: "::" [100:31 - 100:33] TypedefDecl=iter_type:100:63 (Definition) +// CHECK: Identifier: "inner" [100:33 - 100:38] NamespaceRef=inner:62:13 +// CHECK: Punctuation: "::" [100:38 - 100:40] TypedefDecl=iter_type:100:63 (Definition) +// CHECK: Identifier: "vector" [100:40 - 100:46] TemplateRef=vector:4:12 +// CHECK: Punctuation: "<" [100:46 - 100:47] TypedefDecl=iter_type:100:63 (Definition) +// CHECK: Identifier: "type" [100:47 - 100:51] TypeRef=type:99:13 +// CHECK: Punctuation: ">" [100:51 - 100:52] TypedefDecl=iter_type:100:63 (Definition) +// CHECK: Punctuation: "::" [100:52 - 100:54] TypedefDecl=iter_type:100:63 (Definition) +// CHECK: Identifier: "iterator" [100:54 - 100:62] TypedefDecl=iter_type:100:63 (Definition) +// CHECK: Identifier: "iter_type" [100:63 - 100:72] TypedefDecl=iter_type:100:63 (Definition) + +// CHECK: Keyword: "typedef" [101:3 - 101:10] ClassTemplate=X5:98:8 (Definition) +// CHECK: Keyword: "typename" [101:11 - 101:19] TypedefDecl=int_ptr_type:101:62 (Definition) +// CHECK: Identifier: "outer_alias" [101:20 - 101:31] NamespaceRef=outer_alias:10:11 +// CHECK: Punctuation: "::" [101:31 - 101:33] TypedefDecl=int_ptr_type:101:62 (Definition) +// CHECK: Identifier: "inner" [101:33 - 101:38] NamespaceRef=inner:62:13 +// CHECK: Punctuation: "::" [101:38 - 101:40] TypedefDecl=int_ptr_type:101:62 (Definition) +// CHECK: Identifier: "vector" [101:40 - 101:46] TemplateRef=vector:4:12 +// CHECK: Punctuation: "<" [101:46 - 101:47] TypedefDecl=int_ptr_type:101:62 (Definition) +// CHECK: Keyword: "int" [101:47 - 101:50] TypedefDecl=int_ptr_type:101:62 (Definition) +// CHECK: Punctuation: ">" [101:50 - 101:51] TypedefDecl=int_ptr_type:101:62 (Definition) +// CHECK: Punctuation: "::" [101:51 - 101:53] TypedefDecl=int_ptr_type:101:62 (Definition) +// CHECK: Identifier: "iterator" [101:53 - 101:61] TypeRef=iterator:5:18 +// CHECK: Identifier: "int_ptr_type" [101:62 - 101:74] TypedefDecl=int_ptr_type:101:62 (Definition) + +// Dependent template specialization types +// CHECK: Keyword: "typename" [107:11 - 107:19] TypedefDecl=type1:107:76 (Definition) +// CHECK: Identifier: "outer_alias" [107:20 - 107:31] NamespaceRef=outer_alias:10:11 +// CHECK: Punctuation: "::" [107:31 - 107:33] TypedefDecl=type1:107:76 (Definition) +// CHECK: Identifier: "inner" [107:33 - 107:38] NamespaceRef=inner:62:13 +// CHECK: Punctuation: "::" [107:38 - 107:40] TypedefDecl=type1:107:76 (Definition) +// CHECK: Identifier: "vector" [107:40 - 107:46] TemplateRef=vector:4:12 +// CHECK: Punctuation: "<" [107:46 - 107:47] TypedefDecl=type1:107:76 (Definition) +// CHECK: Identifier: "type" [107:47 - 107:51] TypeRef=type:106:14 +// CHECK: Punctuation: ">" [107:51 - 107:52] TypedefDecl=type1:107:76 (Definition) +// CHECK: Punctuation: "::" [107:52 - 107:54] TypedefDecl=type1:107:76 (Definition) +// CHECK: Keyword: "template" [107:54 - 107:62] TypedefDecl=type1:107:76 (Definition) +// CHECK: Identifier: "rebind" [107:63 - 107:69] TypedefDecl=type1:107:76 (Definition) +// CHECK: Punctuation: "<" [107:69 - 107:70] TypedefDecl=type1:107:76 (Definition) +// CHECK: Identifier: "type" [107:70 - 107:74] TypeRef=type:106:14 +// CHECK: Punctuation: ">" [107:74 - 107:75] TypedefDecl=type1:107:76 (Definition) +// CHECK: Identifier: "type1" [107:76 - 107:81] TypedefDecl=type1:107:76 (Definition) + +// CHECK: Keyword: "typedef" [108:3 - 108:10] ClassTemplate=X6:105:8 (Definition) +// CHECK: Keyword: "typename" [108:11 - 108:19] TypedefDecl=type2:108:83 (Definition) +// CHECK: Identifier: "outer_alias" [108:20 - 108:31] NamespaceRef=outer_alias:10:11 +// CHECK: Punctuation: "::" [108:31 - 108:33] TypedefDecl=type2:108:83 (Definition) +// CHECK: Identifier: "inner" [108:33 - 108:38] NamespaceRef=inner:62:13 +// CHECK: Punctuation: "::" [108:38 - 108:40] TypedefDecl=type2:108:83 (Definition) +// CHECK: Identifier: "vector" [108:40 - 108:46] TemplateRef=vector:4:12 +// CHECK: Punctuation: "<" [108:46 - 108:47] TypedefDecl=type2:108:83 (Definition) +// CHECK: Identifier: "type" [108:47 - 108:51] TypeRef=type:106:14 +// CHECK: Punctuation: ">" [108:51 - 108:52] TypedefDecl=type2:108:83 (Definition) +// CHECK: Punctuation: "::" [108:52 - 108:54] TypedefDecl=type2:108:83 (Definition) +// CHECK: Keyword: "template" [108:54 - 108:62] TypedefDecl=type2:108:83 (Definition) +// CHECK: Identifier: "rebind" [108:63 - 108:69] TypedefDecl=type2:108:83 (Definition) +// CHECK: Punctuation: "<" [108:69 - 108:70] TypedefDecl=type2:108:83 (Definition) +// CHECK: Identifier: "type" [108:70 - 108:74] TypeRef=type:106:14 +// CHECK: Punctuation: ">" [108:74 - 108:75] TypedefDecl=type2:108:83 (Definition) +// CHECK: Punctuation: "::" [108:75 - 108:77] TypedefDecl=type2:108:83 (Definition) +// CHECK: Identifier: "other" [108:77 - 108:82] TypedefDecl=type2:108:83 (Definition) +// CHECK: Identifier: "type2" [108:83 - 108:88] TypedefDecl=type2:108:83 (Definition) + +// CHECK: Keyword: "typedef" [109:3 - 109:10] ClassTemplate=X6:105:8 (Definition) +// CHECK: Keyword: "class" [109:11 - 109:16] TypedefDecl=type3:109:73 (Definition) +// CHECK: Identifier: "outer_alias" [109:17 - 109:28] NamespaceRef=outer_alias:10:11 +// CHECK: Punctuation: "::" [109:28 - 109:30] TypedefDecl=type3:109:73 (Definition) +// CHECK: Identifier: "inner" [109:30 - 109:35] NamespaceRef=inner:62:13 +// CHECK: Punctuation: "::" [109:35 - 109:37] TypedefDecl=type3:109:73 (Definition) +// CHECK: Identifier: "vector" [109:37 - 109:43] TemplateRef=vector:4:12 +// CHECK: Punctuation: "<" [109:43 - 109:44] TypedefDecl=type3:109:73 (Definition) +// CHECK: Identifier: "type" [109:44 - 109:48] TypeRef=type:106:14 +// CHECK: Punctuation: ">" [109:48 - 109:49] TypedefDecl=type3:109:73 (Definition) +// CHECK: Punctuation: "::" [109:49 - 109:51] TypedefDecl=type3:109:73 (Definition) +// CHECK: Keyword: "template" [109:51 - 109:59] TypedefDecl=type3:109:73 (Definition) +// CHECK: Identifier: "rebind" [109:60 - 109:66] TypedefDecl=type3:109:73 (Definition) +// CHECK: Punctuation: "<" [109:66 - 109:67] TypedefDecl=type3:109:73 (Definition) +// CHECK: Identifier: "type" [109:67 - 109:71] TypeRef=type:106:14 +// CHECK: Punctuation: ">" [109:71 - 109:72] TypedefDecl=type3:109:73 (Definition) +// CHECK: Identifier: "type3" [109:73 - 109:78] TypedefDecl=type3:109:73 (Definition) + +// CHECK: Keyword: "class" [110:11 - 110:16] TypedefDecl=type4:110:80 (Definition) +// CHECK: Identifier: "outer_alias" [110:17 - 110:28] NamespaceRef=outer_alias:10:11 +// CHECK: Punctuation: "::" [110:28 - 110:30] TypedefDecl=type4:110:80 (Definition) +// CHECK: Identifier: "inner" [110:30 - 110:35] NamespaceRef=inner:62:13 +// CHECK: Punctuation: "::" [110:35 - 110:37] TypedefDecl=type4:110:80 (Definition) +// CHECK: Identifier: "vector" [110:37 - 110:43] TemplateRef=vector:4:12 +// CHECK: Punctuation: "<" [110:43 - 110:44] TypedefDecl=type4:110:80 (Definition) +// CHECK: Identifier: "type" [110:44 - 110:48] TypeRef=type:106:14 +// CHECK: Punctuation: ">" [110:48 - 110:49] TypedefDecl=type4:110:80 (Definition) +// CHECK: Punctuation: "::" [110:49 - 110:51] TypedefDecl=type4:110:80 (Definition) +// CHECK: Keyword: "template" [110:51 - 110:59] TypedefDecl=type4:110:80 (Definition) +// CHECK: Identifier: "rebind" [110:60 - 110:66] TypedefDecl=type4:110:80 (Definition) +// CHECK: Punctuation: "<" [110:66 - 110:67] TypedefDecl=type4:110:80 (Definition) +// CHECK: Identifier: "type" [110:67 - 110:71] TypeRef=type:106:14 +// CHECK: Punctuation: ">" [110:71 - 110:72] TypedefDecl=type4:110:80 (Definition) +// CHECK: Punctuation: "::" [110:72 - 110:74] TypedefDecl=type4:110:80 (Definition) +// CHECK: Identifier: "other" [110:74 - 110:79] TypedefDecl=type4:110:80 (Definition) +// CHECK: Identifier: "type4" [110:80 - 110:85] TypedefDecl=type4:110:80 (Definition) + +// Template template arguments +// CHECK: Keyword: "typedef" [126:3 - 126:10] ClassTemplate=X7:123:8 (Definition) +// CHECK: Identifier: "outer_alias" [126:11 - 126:22] NamespaceRef=outer_alias:10:11 +// CHECK: Punctuation: "::" [126:22 - 126:24] TypedefDecl=type:126:74 (Definition) +// CHECK: Identifier: "inner" [126:24 - 126:29] NamespaceRef=inner:114:13 +// CHECK: Punctuation: "::" [126:29 - 126:31] TypedefDecl=type:126:74 (Definition) +// CHECK: Identifier: "apply_meta" [126:31 - 126:41] TemplateRef=apply_meta:116:12 +// CHECK: Punctuation: "<" [126:41 - 126:42] TypedefDecl=type:126:74 (Definition) +// CHECK: Identifier: "T_type" [126:42 - 126:48] TypeRef=T_type:124:13 +// CHECK: Punctuation: "," [126:48 - 126:49] TypedefDecl=type:126:74 (Definition) +// CHECK: Identifier: "U_type" [126:50 - 126:56] TypeRef=U_type:125:13 +// CHECK: Punctuation: "::" [126:56 - 126:58] TypedefDecl=type:126:74 (Definition) +// CHECK: Keyword: "template" [126:58 - 126:66] TypedefDecl=type:126:74 (Definition) +// CHECK: Identifier: "apply" [126:67 - 126:72] TypedefDecl=type:126:74 (Definition) +// CHECK: Punctuation: ">" [126:72 - 126:73] TypedefDecl=type:126:74 (Definition) +// CHECK: Identifier: "type" [126:74 - 126:78] TypedefDecl=type:126:74 (Definition) + +// Member access expressions +// CHECK: Identifier: "inherited" [136:5 - 136:14] TypeRef=inherited:134:14 +// CHECK: Punctuation: "::" [136:14 - 136:16] MemberRefExpr=f:130:8 +// CHECK: Identifier: "f" [136:16 - 136:17] MemberRefExpr=f:130:8 diff --git a/test/Index/annotate-tokens.c b/test/Index/annotate-tokens.c index d692bd3bbac6..162a224ed684 100644 --- a/test/Index/annotate-tokens.c +++ b/test/Index/annotate-tokens.c @@ -8,9 +8,9 @@ void f(void *ptr) { void *xx = ptr ? : &x; const char * hello = "Hello"; } - +enum Color { Red, Green, Blue }; typedef int Int; -void g(int i, ...) { +enum Color g(int i, ...) { __builtin_va_list va; (void)__builtin_va_arg(va, Int); (void)__builtin_types_compatible_p(Int, Int); @@ -19,9 +19,21 @@ void g(int i, ...) { do { x.a++; } while (x.a < 10); + + enum Color c; + switch (c) { + case Red: + return Green; + + case Green: + return Blue; + + case Blue: + return Red; + } } -// RUN: c-index-test -test-annotate-tokens=%s:4:1:22:1 %s | FileCheck %s +// RUN: c-index-test -test-annotate-tokens=%s:4:1:34:1 %s | FileCheck %s // CHECK: Identifier: "T" [4:3 - 4:4] TypeRef=T:1:13 // CHECK: Punctuation: "*" [4:4 - 4:5] VarDecl=t_ptr:4:6 (Definition) // CHECK: Identifier: "t_ptr" [4:6 - 4:11] VarDecl=t_ptr:4:6 (Definition) @@ -41,7 +53,7 @@ void g(int i, ...) { // CHECK: Punctuation: ")" [5:17 - 5:18] UnexposedExpr= // CHECK: Punctuation: ";" [5:18 - 5:19] UnexposedStmt= // CHECK: Comment: "/* A comment */" [6:3 - 6:18] UnexposedStmt= -// CHECK: Keyword: "struct" [7:3 - 7:9] UnexposedStmt= +// CHECK: Keyword: "struct" [7:3 - 7:9] VarDecl=x:7:12 (Definition) // CHECK: Identifier: "X" [7:10 - 7:11] TypeRef=struct X:2:8 // CHECK: Identifier: "x" [7:12 - 7:13] VarDecl=x:7:12 (Definition) // CHECK: Punctuation: "=" [7:14 - 7:15] VarDecl=x:7:12 (Definition) @@ -79,7 +91,7 @@ void g(int i, ...) { // CHECK: Identifier: "Int" [16:38 - 16:41] TypeRef=Int:12:13 // CHECK: Punctuation: "," [16:41 - 16:42] UnexposedExpr= // CHECK: Identifier: "Int" [16:43 - 16:46] TypeRef=Int:12:13 -// CHECK: Keyword: "struct" [18:3 - 18:9] UnexposedStmt= +// CHECK: Keyword: "struct" [18:3 - 18:9] VarDecl=x:18:12 (Definition) // CHECK: Identifier: "X" [18:10 - 18:11] TypeRef=struct X:2:8 // CHECK: Identifier: "x" [18:12 - 18:13] VarDecl=x:18:12 (Definition) // CHECK: Keyword: "do" [19:3 - 19:5] UnexposedStmt= @@ -95,5 +107,33 @@ void g(int i, ...) { // CHECK: Punctuation: "." [21:13 - 21:14] MemberRefExpr=a:2:16 // CHECK: Identifier: "a" [21:14 - 21:15] MemberRefExpr=a:2:16 +// CHECK: Keyword: "enum" [23:3 - 23:7] VarDecl=c:23:14 (Definition) +// CHECK: Identifier: "Color" [23:8 - 23:13] TypeRef=enum Color:11:6 +// CHECK: Identifier: "c" [23:14 - 23:15] VarDecl=c:23:14 (Definition) +// CHECK: Punctuation: ";" [23:15 - 23:16] UnexposedStmt= +// CHECK: Keyword: "switch" [24:3 - 24:9] UnexposedStmt= +// CHECK: Punctuation: "(" [24:10 - 24:11] UnexposedStmt= +// CHECK: Identifier: "c" [24:11 - 24:12] DeclRefExpr=c:23:14 +// CHECK: Punctuation: ")" [24:12 - 24:13] UnexposedStmt= +// CHECK: Punctuation: "{" [24:14 - 24:15] UnexposedStmt= +// CHECK: Keyword: "case" [25:3 - 25:7] UnexposedStmt= +// CHECK: Identifier: "Red" [25:8 - 25:11] DeclRefExpr=Red:11:14 +// CHECK: Punctuation: ":" [25:11 - 25:12] UnexposedStmt= +// CHECK: Keyword: "return" [26:5 - 26:11] UnexposedStmt= +// CHECK: Identifier: "Green" [26:12 - 26:17] DeclRefExpr=Green:11:19 +// CHECK: Punctuation: ";" [26:17 - 26:18] UnexposedStmt= +// CHECK: Keyword: "case" [28:3 - 28:7] UnexposedStmt= +// CHECK: Identifier: "Green" [28:8 - 28:13] DeclRefExpr=Green:11:19 +// CHECK: Punctuation: ":" [28:13 - 28:14] UnexposedStmt= +// CHECK: Keyword: "return" [29:5 - 29:11] UnexposedStmt= +// CHECK: Identifier: "Blue" [29:12 - 29:16] DeclRefExpr=Blue:11:26 +// CHECK: Punctuation: ";" [29:16 - 29:17] UnexposedStmt= +// CHECK: Keyword: "case" [31:3 - 31:7] UnexposedStmt= +// CHECK: Identifier: "Blue" [31:8 - 31:12] DeclRefExpr=Blue:11:26 +// CHECK: Punctuation: ":" [31:12 - 31:13] UnexposedStmt= +// CHECK: Keyword: "return" [32:5 - 32:11] UnexposedStmt= +// CHECK: Identifier: "Red" [32:12 - 32:15] DeclRefExpr=Red:11:14 +// CHECK: Punctuation: ";" [32:15 - 32:16] UnexposedStmt= + // RUN: c-index-test -test-annotate-tokens=%s:4:1:165:32 %s | FileCheck %s // RUN: c-index-test -test-annotate-tokens=%s:4:1:165:38 %s | FileCheck %s diff --git a/test/Index/annotate-tokens.cpp b/test/Index/annotate-tokens.cpp index 3138babf0aaf..ccc9e9602843 100644 --- a/test/Index/annotate-tokens.cpp +++ b/test/Index/annotate-tokens.cpp @@ -4,7 +4,22 @@ void test(bonk X) { __is_base_of(bonk, bonk); } -// RUN: c-index-test -test-annotate-tokens=%s:1:1:6:5 %s | FileCheck %s +struct X { + X operator++(); + X operator++(int); +}; +void test2(X x) { + ++(x); + (x)++; +} + +struct S1 { void f(); }; +struct S2 { S1 *operator->(); }; +void test3(S2 s2) { + s2->f(); +} + +// RUN: c-index-test -test-annotate-tokens=%s:1:1:20:1 %s | FileCheck %s // CHECK: Keyword: "struct" [1:1 - 1:7] StructDecl=bonk:1:8 (Definition) // CHECK: Identifier: "bonk" [1:8 - 1:12] StructDecl=bonk:1:8 (Definition) // CHECK: Punctuation: "{" [1:13 - 1:14] StructDecl=bonk:1:8 (Definition) @@ -29,3 +44,75 @@ void test(bonk X) { // CHECK: Punctuation: ")" [4:28 - 4:29] UnexposedExpr= // CHECK: Punctuation: ";" [4:29 - 4:30] UnexposedStmt= // CHECK: Punctuation: "}" [5:1 - 5:2] UnexposedStmt= +// CHECK: Keyword: "struct" [7:1 - 7:7] StructDecl=X:7:8 (Definition) +// CHECK: Identifier: "X" [7:8 - 7:9] StructDecl=X:7:8 (Definition) +// CHECK: Punctuation: "{" [7:10 - 7:11] StructDecl=X:7:8 (Definition) +// CHECK: Identifier: "X" [8:3 - 8:4] TypeRef=struct X:7:8 +// CHECK: Keyword: "operator" [8:5 - 8:13] CXXMethod=operator++:8:5 +// CHECK: Punctuation: "++" [8:13 - 8:15] CXXMethod=operator++:8:5 +// CHECK: Punctuation: "(" [8:15 - 8:16] CXXMethod=operator++:8:5 +// CHECK: Punctuation: ")" [8:16 - 8:17] CXXMethod=operator++:8:5 +// CHECK: Punctuation: ";" [8:17 - 8:18] StructDecl=X:7:8 (Definition) +// CHECK: Identifier: "X" [9:3 - 9:4] TypeRef=struct X:7:8 +// CHECK: Keyword: "operator" [9:5 - 9:13] CXXMethod=operator++:9:5 +// CHECK: Punctuation: "++" [9:13 - 9:15] CXXMethod=operator++:9:5 +// CHECK: Punctuation: "(" [9:15 - 9:16] CXXMethod=operator++:9:5 +// CHECK: Keyword: "int" [9:16 - 9:19] ParmDecl=:9:19 (Definition) +// CHECK: Punctuation: ")" [9:19 - 9:20] ParmDecl=:9:19 (Definition) +// CHECK: Punctuation: ";" [9:20 - 9:21] StructDecl=X:7:8 (Definition) +// CHECK: Punctuation: "}" [10:1 - 10:2] StructDecl=X:7:8 (Definition) +// CHECK: Punctuation: ";" [10:2 - 10:3] +// CHECK: Keyword: "void" [11:1 - 11:5] FunctionDecl=test2:11:6 (Definition) +// CHECK: Identifier: "test2" [11:6 - 11:11] FunctionDecl=test2:11:6 (Definition) +// CHECK: Punctuation: "(" [11:11 - 11:12] FunctionDecl=test2:11:6 (Definition) +// CHECK: Identifier: "X" [11:12 - 11:13] TypeRef=struct X:7:8 +// CHECK: Identifier: "x" [11:14 - 11:15] ParmDecl=x:11:14 (Definition) +// CHECK: Punctuation: ")" [11:15 - 11:16] FunctionDecl=test2:11:6 (Definition) +// CHECK: Punctuation: "{" [11:17 - 11:18] UnexposedStmt= +// CHECK: Punctuation: "++" [12:3 - 12:5] CallExpr=operator++:8:5 +// CHECK: Punctuation: "(" [12:5 - 12:6] UnexposedExpr= +// CHECK: Identifier: "x" [12:6 - 12:7] DeclRefExpr=x:11:14 +// CHECK: Punctuation: ")" [12:7 - 12:8] UnexposedExpr= +// CHECK: Punctuation: ";" [12:8 - 12:9] UnexposedStmt= +// CHECK: Punctuation: "(" [13:3 - 13:4] UnexposedExpr= +// CHECK: Identifier: "x" [13:4 - 13:5] DeclRefExpr=x:11:14 +// CHECK: Punctuation: ")" [13:5 - 13:6] UnexposedExpr= +// CHECK: Punctuation: "++" [13:6 - 13:8] CallExpr=operator++:9:5 +// CHECK: Punctuation: ";" [13:8 - 13:9] UnexposedStmt= +// CHECK: Punctuation: "}" [14:1 - 14:2] UnexposedStmt= +// CHECK: Keyword: "struct" [16:1 - 16:7] StructDecl=S1:16:8 (Definition) +// CHECK: Identifier: "S1" [16:8 - 16:10] StructDecl=S1:16:8 (Definition) +// CHECK: Punctuation: "{" [16:11 - 16:12] StructDecl=S1:16:8 (Definition) +// CHECK: Keyword: "void" [16:13 - 16:17] CXXMethod=f:16:18 +// CHECK: Identifier: "f" [16:18 - 16:19] CXXMethod=f:16:18 +// CHECK: Punctuation: "(" [16:19 - 16:20] CXXMethod=f:16:18 +// CHECK: Punctuation: ")" [16:20 - 16:21] CXXMethod=f:16:18 +// CHECK: Punctuation: ";" [16:21 - 16:22] StructDecl=S1:16:8 (Definition) +// CHECK: Punctuation: "}" [16:23 - 16:24] StructDecl=S1:16:8 (Definition) +// CHECK: Punctuation: ";" [16:24 - 16:25] +// CHECK: Keyword: "struct" [17:1 - 17:7] StructDecl=S2:17:8 (Definition) +// CHECK: Identifier: "S2" [17:8 - 17:10] StructDecl=S2:17:8 (Definition) +// CHECK: Punctuation: "{" [17:11 - 17:12] StructDecl=S2:17:8 (Definition) +// CHECK: Identifier: "S1" [17:13 - 17:15] TypeRef=struct S1:16:8 +// CHECK: Punctuation: "*" [17:16 - 17:17] CXXMethod=operator->:17:17 +// CHECK: Keyword: "operator" [17:17 - 17:25] CXXMethod=operator->:17:17 +// CHECK: Punctuation: "->" [17:25 - 17:27] CXXMethod=operator->:17:17 +// CHECK: Punctuation: "(" [17:27 - 17:28] CXXMethod=operator->:17:17 +// CHECK: Punctuation: ")" [17:28 - 17:29] CXXMethod=operator->:17:17 +// CHECK: Punctuation: ";" [17:29 - 17:30] StructDecl=S2:17:8 (Definition) +// CHECK: Punctuation: "}" [17:31 - 17:32] StructDecl=S2:17:8 (Definition) +// CHECK: Punctuation: ";" [17:32 - 17:33] +// CHECK: Keyword: "void" [18:1 - 18:5] FunctionDecl=test3:18:6 (Definition) +// CHECK: Identifier: "test3" [18:6 - 18:11] FunctionDecl=test3:18:6 (Definition) +// CHECK: Punctuation: "(" [18:11 - 18:12] FunctionDecl=test3:18:6 (Definition) +// CHECK: Identifier: "S2" [18:12 - 18:14] TypeRef=struct S2:17:8 +// CHECK: Identifier: "s2" [18:15 - 18:17] ParmDecl=s2:18:15 (Definition) +// CHECK: Punctuation: ")" [18:17 - 18:18] FunctionDecl=test3:18:6 (Definition) +// CHECK: Punctuation: "{" [18:19 - 18:20] UnexposedStmt= +// CHECK: Identifier: "s2" [19:3 - 19:5] DeclRefExpr=s2:18:15 +// CHECK: Punctuation: "->" [19:5 - 19:7] MemberRefExpr=f:16:18 +// CHECK: Identifier: "f" [19:7 - 19:8] MemberRefExpr=f:16:18 +// CHECK: Punctuation: "(" [19:8 - 19:9] CallExpr=f:16:18 +// CHECK: Punctuation: ")" [19:9 - 19:10] CallExpr=f:16:18 +// CHECK: Punctuation: ";" [19:10 - 19:11] UnexposedStmt= +// CHECK: Punctuation: "}" [20:1 - 20:2] UnexposedStmt= diff --git a/test/Index/annotate-tokens.m b/test/Index/annotate-tokens.m index f4d47ac4ae55..f977e5c3dfe8 100644 --- a/test/Index/annotate-tokens.m +++ b/test/Index/annotate-tokens.m @@ -30,12 +30,12 @@ typedef int * barType; // Since there are no source ranges for attributes, we currently don't // annotate them. @interface IBActionTests -- (IBAction) actionMethod:(id)arg; +- (IBAction) actionMethod:(in id)arg; - (void)foo:(int)x; @end extern int ibaction_test(void); @implementation IBActionTests -- (IBAction) actionMethod:(id)arg +- (IBAction) actionMethod:(in id)arg { ibaction_test(); [self foo:0]; @@ -231,10 +231,11 @@ static Rdar8595462_A * Rdar8595462_staticVar; // CHECK: Identifier: "actionMethod" [33:14 - 33:26] ObjCInstanceMethodDecl=actionMethod::33:1 // CHECK: Punctuation: ":" [33:26 - 33:27] ObjCInstanceMethodDecl=actionMethod::33:1 // CHECK: Punctuation: "(" [33:27 - 33:28] ObjCInstanceMethodDecl=actionMethod::33:1 -// CHECK: Identifier: "id" [33:28 - 33:30] TypeRef=id:0:0 -// CHECK: Punctuation: ")" [33:30 - 33:31] ParmDecl=arg:33:31 (Definition) -// CHECK: Identifier: "arg" [33:31 - 33:34] ParmDecl=arg:33:31 (Definition) -// CHECK: Punctuation: ";" [33:34 - 33:35] ObjCInstanceMethodDecl=actionMethod::33:1 +// CHECK: Keyword: "in" [33:28 - 33:30] ObjCInstanceMethodDecl=actionMethod::33:1 +// CHECK: Identifier: "id" [33:31 - 33:33] TypeRef=id:0:0 +// CHECK: Punctuation: ")" [33:33 - 33:34] ParmDecl=arg:33:34 (Definition) +// CHECK: Identifier: "arg" [33:34 - 33:37] ParmDecl=arg:33:34 (Definition) +// CHECK: Punctuation: ";" [33:37 - 33:38] ObjCInstanceMethodDecl=actionMethod::33:1 // CHECK: Punctuation: "-" [34:1 - 34:2] ObjCInstanceMethodDecl=foo::34:1 // CHECK: Punctuation: "(" [34:3 - 34:4] ObjCInstanceMethodDecl=foo::34:1 // CHECK: Keyword: "void" [34:4 - 34:8] ObjCInstanceMethodDecl=foo::34:1 @@ -264,10 +265,10 @@ static Rdar8595462_A * Rdar8595462_staticVar; // CHECK: Punctuation: ")" [38:12 - 38:13] ObjCInstanceMethodDecl=actionMethod::38:1 (Definition) // CHECK: Identifier: "actionMethod" [38:14 - 38:26] ObjCInstanceMethodDecl=actionMethod::38:1 (Definition) // CHECK: Punctuation: ":" [38:26 - 38:27] ObjCInstanceMethodDecl=actionMethod::38:1 (Definition) -// CHECK: Punctuation: "(" [38:27 - 38:28] ObjCInstanceMethodDecl=actionMethod::38:1 (Definition) -// CHECK: Identifier: "id" [38:28 - 38:30] TypeRef=id:0:0 -// CHECK: Punctuation: ")" [38:30 - 38:31] ParmDecl=arg:38:31 (Definition) -// CHECK: Identifier: "arg" [38:31 - 38:34] ParmDecl=arg:38:31 (Definition) +// CHECK: Keyword: "in" [38:28 - 38:30] ObjCInstanceMethodDecl=actionMethod::38:1 (Definition) [Overrides @33:1] +// CHECK: Identifier: "id" [38:31 - 38:33] TypeRef=id:0:0 +// CHECK: Punctuation: ")" [38:33 - 38:34] ParmDecl=arg:38:34 (Definition) +// CHECK: Identifier: "arg" [38:34 - 38:37] ParmDecl=arg:38:34 (Definition) // CHECK: Punctuation: "{" [39:1 - 39:2] UnexposedStmt= // CHECK: Identifier: "ibaction_test" [40:5 - 40:18] DeclRefExpr=ibaction_test:36:12 // CHECK: Punctuation: "(" [40:18 - 40:19] CallExpr=ibaction_test:36:12 @@ -484,16 +485,16 @@ static Rdar8595462_A * Rdar8595462_staticVar; // CHECK: Punctuation: "@" [110:1 - 110:2] ObjCPropertyDecl=foo:110:33 // CHECK: Keyword: "property" [110:2 - 110:10] ObjCPropertyDecl=foo:110:33 // CHECK: Punctuation: "(" [110:11 - 110:12] ObjCPropertyDecl=foo:110:33 -// CHECK: Identifier: "readonly" [110:12 - 110:20] ObjCPropertyDecl=foo:110:33 +// CHECK: Keyword: "readonly" [110:12 - 110:20] ObjCPropertyDecl=foo:110:33 // CHECK: Punctuation: "," [110:20 - 110:21] ObjCPropertyDecl=foo:110:33 -// CHECK: Identifier: "copy" [110:22 - 110:26] ObjCPropertyDecl=foo:110:33 +// CHECK: Keyword: "copy" [110:22 - 110:26] ObjCPropertyDecl=foo:110:33 // CHECK: Punctuation: ")" [110:26 - 110:27] ObjCPropertyDecl=foo:110:33 // CHECK: Identifier: "Foo" [110:28 - 110:31] ObjCClassRef=Foo:1:12 // CHECK: Punctuation: "*" [110:32 - 110:33] ObjCPropertyDecl=foo:110:33 // CHECK: Identifier: "foo" [110:33 - 110:36] ObjCPropertyDecl=foo:110:33 // CHECK: Keyword: "property" [111:2 - 111:10] ObjCPropertyDecl=foo2:111:27 // CHECK: Punctuation: "(" [111:11 - 111:12] ObjCPropertyDecl=foo2:111:27 -// CHECK: Identifier: "readonly" [111:12 - 111:20] ObjCPropertyDecl=foo2:111:27 +// CHECK: Keyword: "readonly" [111:12 - 111:20] ObjCPropertyDecl=foo2:111:27 // CHECK: Punctuation: ")" [111:20 - 111:21] ObjCPropertyDecl=foo2:111:27 // CHECK: Identifier: "Foo" [111:22 - 111:25] ObjCClassRef=Foo:1:12 // CHECK: Punctuation: "*" [111:26 - 111:27] ObjCPropertyDecl=foo2:111:27 @@ -539,9 +540,9 @@ static Rdar8595462_A * Rdar8595462_staticVar; // CHECK-PROP-AFTER-METHOD: Punctuation: "@" [136:1 - 136:2] ObjCPropertyDecl=blah:136:38 // CHECK-PROP-AFTER-METHOD: Keyword: "property" [136:2 - 136:10] ObjCPropertyDecl=blah:136:38 // CHECK-PROP-AFTER-METHOD: Punctuation: "(" [136:11 - 136:12] ObjCPropertyDecl=blah:136:38 -// CHECK-PROP-AFTER-METHOD: Identifier: "readonly" [136:12 - 136:20] ObjCPropertyDecl=blah:136:38 +// CHECK-PROP-AFTER-METHOD: Keyword: "readonly" [136:12 - 136:20] ObjCPropertyDecl=blah:136:38 // CHECK-PROP-AFTER-METHOD: Punctuation: "," [136:20 - 136:21] ObjCPropertyDecl=blah:136:38 -// CHECK-PROP-AFTER-METHOD: Identifier: "nonatomic" [136:22 - 136:31] ObjCPropertyDecl=blah:136:38 +// CHECK-PROP-AFTER-METHOD: Keyword: "nonatomic" [136:22 - 136:31] ObjCPropertyDecl=blah:136:38 // CHECK-PROP-AFTER-METHOD: Punctuation: ")" [136:31 - 136:32] ObjCPropertyDecl=blah:136:38 // CHECK-PROP-AFTER-METHOD: Identifier: "Foo" [136:33 - 136:36] ObjCClassRef=Foo:1:12 // CHECK-PROP-AFTER-METHOD: Punctuation: "*" [136:37 - 136:38] ObjCPropertyDecl=blah:136:38 diff --git a/test/Index/blocks.c b/test/Index/blocks.c index a8965d2aa670..633e171ffa37 100644 --- a/test/Index/blocks.c +++ b/test/Index/blocks.c @@ -9,17 +9,17 @@ void test() { ^ int_t(struct foo *foo) { return (int_t) foo->x + i; }(&_foo); } -// CHECK: blocks.c:6:6: FunctionDecl=test:6:6 (Definition) Extent=[6:6 - 10:2] +// CHECK: blocks.c:6:6: FunctionDecl=test:6:6 (Definition) Extent=[6:1 - 10:2] // CHECK: blocks.c:6:13: UnexposedStmt= Extent=[6:13 - 10:2] // CHECK: blocks.c:7:3: UnexposedStmt= Extent=[7:3 - 7:26] -// CHECK: blocks.c:7:21: VarDecl=_foo:7:21 (Definition) Extent=[7:17 - 7:25] +// CHECK: blocks.c:7:21: VarDecl=_foo:7:21 (Definition) Extent=[7:3 - 7:25] // CHECK: blocks.c:7:17: TypeRef=struct foo:4:8 Extent=[7:17 - 7:20] -// CHECK: blocks.c:8:11: VarDecl=i:8:11 (Definition) Extent=[8:11 - 8:16] +// CHECK: blocks.c:8:11: VarDecl=i:8:11 (Definition) Extent=[8:3 - 8:16] // CHECK: blocks.c:8:15: UnexposedExpr= Extent=[8:15 - 8:16] // CHECK: blocks.c:9:3: CallExpr= Extent=[9:3 - 9:65] // CHECK: blocks.c:9:3: UnexposedExpr= Extent=[9:3 - 9:58] // CHECK: blocks.c:9:5: TypeRef=int_t:3:13 Extent=[9:5 - 9:10] -// CHECK: blocks.c:9:23: ParmDecl=foo:9:23 (Definition) Extent=[9:18 - 9:26] +// CHECK: blocks.c:9:23: ParmDecl=foo:9:23 (Definition) Extent=[9:11 - 9:26] // CHECK: blocks.c:9:18: TypeRef=struct foo:4:8 Extent=[9:18 - 9:21] // CHECK: blocks.c:9:28: UnexposedStmt= Extent=[9:28 - 9:58] // CHECK: blocks.c:9:30: UnexposedStmt= Extent=[9:30 - 9:55] diff --git a/test/Index/c-index-api-loadTU-test.m b/test/Index/c-index-api-loadTU-test.m index f34593f3e85e..98a41d837fdc 100644 --- a/test/Index/c-index-api-loadTU-test.m +++ b/test/Index/c-index-api-loadTU-test.m @@ -71,7 +71,7 @@ struct X0; struct X0 {}; // CHECK: c-index-api-loadTU-test.m:4:12: ObjCInterfaceDecl=Foo:4:12 Extent=[4:1 - 12:5] -// CHECK: c-index-api-loadTU-test.m:6:32: ObjCIvarDecl=myoutlet:6:32 (Definition) Extent=[6:32 - 6:40] +// CHECK: c-index-api-loadTU-test.m:6:32: ObjCIvarDecl=myoutlet:6:32 (Definition) Extent=[6:3 - 6:40] // CHECK: <invalid loc>:0:0: attribute(iboutlet)= // CHECK: c-index-api-loadTU-test.m:6:29: TypeRef=id:0:0 Extent=[6:29 - 6:31] // CHECK: c-index-api-loadTU-test.m:8:1: ObjCInstanceMethodDecl=myMessage::8:1 Extent=[8:1 - 8:54] @@ -95,14 +95,14 @@ struct X0 {}; // CHECK: c-index-api-loadTU-test.m:33:12: ObjCInterfaceDecl=Baz:33:12 Extent=[33:1 - 40:5] // CHECK: c-index-api-loadTU-test.m:33:18: ObjCSuperClassRef=Bar:14:12 Extent=[33:18 - 33:21] // CHECK: c-index-api-loadTU-test.m:33:23: ObjCProtocolRef=SubP:29:1 Extent=[33:23 - 33:27] -// CHECK: c-index-api-loadTU-test.m:35:9: ObjCIvarDecl=_anIVar:35:9 (Definition) Extent=[35:9 - 35:16] +// CHECK: c-index-api-loadTU-test.m:35:9: ObjCIvarDecl=_anIVar:35:9 (Definition) Extent=[35:5 - 35:16] // CHECK: c-index-api-loadTU-test.m:38:1: ObjCInstanceMethodDecl=bazMethod:38:1 Extent=[38:1 - 38:21] // CHECK: c-index-api-loadTU-test.m:38:4: ObjCClassRef=Foo:4:12 Extent=[38:4 - 38:7] // CHECK: c-index-api-loadTU-test.m:42:1: EnumDecl=:42:1 (Definition) Extent=[42:1 - 44:2] // CHECK: c-index-api-loadTU-test.m:43:3: EnumConstantDecl=someEnum:43:3 (Definition) Extent=[43:3 - 43:11] -// CHECK: c-index-api-loadTU-test.m:46:5: FunctionDecl=main:46:5 (Definition) Extent=[46:5 - 55:2] +// CHECK: c-index-api-loadTU-test.m:46:5: FunctionDecl=main:46:5 (Definition) Extent=[46:1 - 55:2] // CHECK: c-index-api-loadTU-test.m:46:15: ParmDecl=argc:46:15 (Definition) Extent=[46:11 - 46:19] -// CHECK: c-index-api-loadTU-test.m:46:34: ParmDecl=argv:46:34 (Definition) Extent=[46:27 - 46:38] +// CHECK: c-index-api-loadTU-test.m:46:34: ParmDecl=argv:46:34 (Definition) Extent=[46:21 - 46:40] // CHECK: c-index-api-loadTU-test.m:47:8: VarDecl=bee:47:8 (Definition) Extent=[47:2 - 47:11] // CHECK: c-index-api-loadTU-test.m:47:2: ObjCClassRef=Baz:33:12 Extent=[47:2 - 47:5] // CHECK: c-index-api-loadTU-test.m:48:5: VarDecl=a:48:5 (Definition) Extent=[48:2 - 48:18] @@ -135,9 +135,9 @@ struct X0 {}; // CHECK: c-index-api-loadTU-test.m:54:18: UnexposedExpr=bee:47:8 Extent=[54:18 - 54:36] // CHECK: c-index-api-loadTU-test.m:54:33: DeclRefExpr=bee:47:8 Extent=[54:33 - 54:36] // CHECK: c-index-api-loadTU-test.m:62:12: ObjCInterfaceDecl=TestAttributes:62:12 Extent=[62:1 - 67:5] -// CHECK: c-index-api-loadTU-test.m:63:19: ObjCIvarDecl=anOutlet:63:19 (Definition) Extent=[63:19 - 63:27] +// CHECK: c-index-api-loadTU-test.m:63:19: ObjCIvarDecl=anOutlet:63:19 (Definition) Extent=[58:18 - 63:27] // CHECK: <invalid loc>:0:0: attribute(iboutlet)= -// CHECK: c-index-api-loadTU-test.m:64:29: ObjCIvarDecl=anOutletCollection:64:29 (Definition) Extent=[64:29 - 64:47] +// CHECK: c-index-api-loadTU-test.m:64:29: ObjCIvarDecl=anOutletCollection:64:29 (Definition) Extent=[59:39 - 64:47] // CHECK: <invalid loc>:0:0: attribute(iboutletcollection)= [IBOutletCollection=ObjCObjectPointer] // CHECK: c-index-api-loadTU-test.m:64:26: TypeRef=id:0:0 Extent=[64:26 - 64:28] // CHECK: c-index-api-loadTU-test.m:66:1: ObjCInstanceMethodDecl=actionMethod::66:1 Extent=[66:1 - 66:35] @@ -145,7 +145,7 @@ struct X0 {}; // CHECK: c-index-api-loadTU-test.m:66:31: ParmDecl=arg:66:31 (Definition) Extent=[66:28 - 66:34] // CHECK: c-index-api-loadTU-test.m:66:28: TypeRef=id:0:0 Extent=[66:28 - 66:30] // CHECK: c-index-api-loadTU-test.m:69:16: StructDecl=X0:69:16 Extent=[69:9 - 69:18] -// CHECK: c-index-api-loadTU-test.m:69:19: TypedefDecl=X1:69:19 (Definition) Extent=[69:19 - 69:21] +// CHECK: c-index-api-loadTU-test.m:69:19: TypedefDecl=X1:69:19 (Definition) Extent=[69:1 - 69:21] // CHECK: c-index-api-loadTU-test.m:69:16: TypeRef=struct X0:71:8 Extent=[69:16 - 69:18] // CHECK: c-index-api-loadTU-test.m:70:8: StructDecl=X0:70:8 Extent=[70:1 - 70:10] // CHECK: c-index-api-loadTU-test.m:71:8: StructDecl=X0:71:8 (Definition) Extent=[71:1 - 71:14] diff --git a/test/Index/c-index-getCursor-test.m b/test/Index/c-index-getCursor-test.m index 91482eb798a4..c2ff6963c9ff 100644 --- a/test/Index/c-index-getCursor-test.m +++ b/test/Index/c-index-getCursor-test.m @@ -108,9 +108,9 @@ void f() { // CHECK: [42:2 - 44:1] Invalid Cursor => NoDeclFound // CHECK: [44:1 - 44:11] FunctionDecl=main:44:5 (Definition) // CHECK: [44:11 - 44:19] ParmDecl=argc:44:15 (Definition) -// CHECK: [44:19 - 44:27] FunctionDecl=main:44:5 (Definition) -// CHECK: [44:27 - 44:38] ParmDecl=argv:44:34 (Definition) -// CHECK: [44:38 - 44:42] FunctionDecl=main:44:5 (Definition) +// CHECK: [44:19 - 44:21] FunctionDecl=main:44:5 (Definition) +// CHECK: [44:21 - 44:40] ParmDecl=argv:44:34 (Definition) +// CHECK: [44:40 - 44:42] FunctionDecl=main:44:5 (Definition) // CHECK: [44:42 - 45:2] UnexposedStmt= // CHECK: [45:2 - 45:5] ObjCClassRef=Baz:31:12 // CHECK: [45:5 - 45:11] VarDecl=bee:45:8 (Definition) diff --git a/test/Index/cindex-on-invalid.m b/test/Index/cindex-on-invalid.m index d2d952d8b19e..6eff24baf808 100644 --- a/test/Index/cindex-on-invalid.m +++ b/test/Index/cindex-on-invalid.m @@ -1,6 +1,21 @@ // RUN: c-index-test -test-load-source local %s 2>&1 | FileCheck %s +// <rdar://problem/9123493> +void test() { + goto exit; +} + int foo; + +#define NO 0 + +void f(int y) { + if (y = NO); +} + int -// CHECK: cindex-on-invalid.m:6:70: error: expected identifier or '('
\ No newline at end of file +// CHECK: cindex-on-invalid.m:5:8: error: use of undeclared label 'exit' +// CHECK: cindex-on-invalid.m:13:9:{13:7-13:13} +// CHECK: cindex-on-invalid.m:21:1: error: expected identifier or '(' + diff --git a/test/Index/complete-objc-message.m b/test/Index/complete-objc-message.m index 0658d53c651b..0ea33850560e 100644 --- a/test/Index/complete-objc-message.m +++ b/test/Index/complete-objc-message.m @@ -175,6 +175,12 @@ void test_missing_open_more() { A *a = A class_method3]; } +void test_block_invoke(A *(^block1)(int), + int (^block2)(int), + id (^block3)(int)) { + [block1(5) init]; +} + // RUN: c-index-test -code-completion-at=%s:23:19 %s | FileCheck -check-prefix=CHECK-CC1 %s // CHECK-CC1: {TypedText categoryClassMethod} // CHECK-CC1: {TypedText classMethod1:}{Placeholder (id)}{HorizontalSpace }{TypedText withKeyword:}{Placeholder (int)} @@ -285,6 +291,12 @@ void test_missing_open_more() { // CHECK-CLASS-RESULT: ObjCClassMethodDecl:{ResultType void}{TypedText class_method3} (35) // CHECK-CLASS-RESULT: ObjCClassMethodDecl:{ResultType void}{TypedText class_method4} (35) +// RUN: c-index-test -code-completion-at=%s:181:4 %s | FileCheck -check-prefix=CHECK-BLOCK-RECEIVER %s +// CHECK-BLOCK-RECEIVER: ObjCInterfaceDecl:{TypedText A} (50) +// CHECK-BLOCK-RECEIVER: ObjCInterfaceDecl:{TypedText B} (50) +// CHECK-BLOCK-RECEIVER: ParmDecl:{ResultType A *(^)(int)}{TypedText block1} (34) +// CHECK-BLOCK-RECEIVER-NEXT: ParmDecl:{ResultType id (^)(int)}{TypedText block3} (34) + // Test code completion with a missing opening bracket: // RUN: c-index-test -code-completion-at=%s:135:5 %s | FileCheck -check-prefix=CHECK-CCI %s // RUN: c-index-test -code-completion-at=%s:139:7 %s | FileCheck -check-prefix=CHECK-CC7 %s diff --git a/test/Index/complete-properties.m b/test/Index/complete-properties.m index 725f180f7c29..ce1870e6511b 100644 --- a/test/Index/complete-properties.m +++ b/test/Index/complete-properties.m @@ -29,6 +29,22 @@ id test(I3 *i3) { return i3.Prop3; } +@interface I4 +@property id Prop2; +@end + +@interface I4 () { + I4 *Prop1; +} +@end + +@implementation I4 { + id Prop2_; +} + +@synthesize Prop2 = Prop2_; +@end + // RUN: c-index-test -code-completion-at=%s:20:13 %s | FileCheck -check-prefix=CHECK-CC1 %s // CHECK-CC1: ObjCPropertyDecl:{ResultType int}{TypedText Prop0} // CHECK-CC1: ObjCPropertyDecl:{ResultType int}{TypedText Prop1} @@ -41,8 +57,10 @@ id test(I3 *i3) { // CHECK-CC2-NEXT: ObjCPropertyDecl:{ResultType id}{TypedText Prop3} // CHECK-CC2: ObjCPropertyDecl:{ResultType id}{TypedText Prop4} // RUN: c-index-test -code-completion-at=%s:20:35 %s | FileCheck -check-prefix=CHECK-CC3 %s -// CHECK-CC3: ObjCIvarDecl:{ResultType int}{TypedText RandomIVar} -// CHECK-CC3: ObjCIvarDecl:{ResultType id}{TypedText StoredProp3} +// CHECK-CC3: ObjCIvarDecl:{ResultType id}{TypedText _Prop3} (36) +// CHECK-CC3: ObjCIvarDecl:{ResultType int}{TypedText RandomIVar} (35) +// CHECK-CC3: ObjCIvarDecl:{ResultType id}{TypedText StoredProp3} (8) + // RUN: c-index-test -code-completion-at=%s:21:10 %s | FileCheck -check-prefix=CHECK-CC4 %s // CHECK-CC4: ObjCPropertyDecl:{ResultType int}{TypedText Prop0} // CHECK-CC4-NEXT: ObjCPropertyDecl:{ResultType id}{TypedText Prop4} @@ -57,3 +75,8 @@ id test(I3 *i3) { // RUN: c-index-test -code-completion-at=%s:9:11 %s | FileCheck -check-prefix=CHECK-CC6 %s // CHECK-CC6: ObjCInterfaceDecl:{TypedText MyClass} (50) + +// RUN: c-index-test -code-completion-at=%s:45:21 -fobjc-nonfragile-abi %s | FileCheck -check-prefix=CHECK-CC7 %s +// CHECK-CC7-NOT: ObjCIvarDecl:{ResultType id}{TypedText _Prop2} +// CHECK-CC7: ObjCIvarDecl:{ResultType I4 *}{TypedText Prop1} (17) +// CHECK-CC7: ObjCIvarDecl:{ResultType id}{TypedText Prop2_} (7) diff --git a/test/Index/index-templates.cpp b/test/Index/index-templates.cpp index 3def6001a10a..abc95545c53b 100644 --- a/test/Index/index-templates.cpp +++ b/test/Index/index-templates.cpp @@ -102,7 +102,7 @@ struct SuperPair : Pair<int, int>, Pair<T, U> { }; // RUN: c-index-test -test-load-source all %s | FileCheck -check-prefix=CHECK-LOAD %s // CHECK-LOAD: index-templates.cpp:4:6: FunctionTemplate=f:4:6 Extent=[3:1 - 4:22] -// CHECK-LOAD: index-templates.cpp:3:19: TemplateTypeParameter=T:3:19 (Definition) Extent=[3:19 - 3:20] +// CHECK-LOAD: index-templates.cpp:3:19: TemplateTypeParameter=T:3:19 (Definition) Extent=[3:10 - 3:20] // CHECK-LOAD: index-templates.cpp:3:24: NonTypeTemplateParameter=Value:3:24 (Definition) Extent=[3:22 - 3:29] // FIXME: Need the template type parameter here // CHECK-LOAD: index-templates.cpp:3:66: TemplateTemplateParameter=X:3:66 (Definition) Extent=[3:31 - 3:67] @@ -111,49 +111,49 @@ struct SuperPair : Pair<int, int>, Pair<T, U> { }; // FIXME: Need the template type parameter here // CHECK-LOAD: index-templates.cpp:4:13: DeclRefExpr=Value:3:24 Extent=[4:13 - 4:18] // CHECK-LOAD: index-templates.cpp:6:28: ClassTemplate=allocator:6:28 Extent=[6:1 - 6:37] -// CHECK-LOAD: index-templates.cpp:6:19: TemplateTypeParameter=T:6:19 (Definition) Extent=[6:19 - 6:20] +// CHECK-LOAD: index-templates.cpp:6:19: TemplateTypeParameter=T:6:19 (Definition) Extent=[6:10 - 6:20] // CHECK-LOAD: index-templates.cpp:9:7: ClassTemplate=vector:9:7 (Definition) Extent=[8:1 - 11:2] -// CHECK-LOAD: index-templates.cpp:8:19: TemplateTypeParameter=T:8:19 (Definition) Extent=[8:19 - 8:20] -// CHECK-LOAD: index-templates.cpp:8:31: TemplateTypeParameter=Alloc:8:31 (Definition) Extent=[8:31 - 8:36] +// CHECK-LOAD: index-templates.cpp:8:19: TemplateTypeParameter=T:8:19 (Definition) Extent=[8:10 - 8:20] +// CHECK-LOAD: index-templates.cpp:8:31: TemplateTypeParameter=Alloc:8:31 (Definition) Extent=[8:22 - 8:51] // CHECK-LOAD: index-templates.cpp:8:39: TemplateRef=allocator:6:28 Extent=[8:39 - 8:48] -// CHECK-LOAD: index-templates.cpp:10:8: CXXMethod=clear:10:8 Extent=[10:8 - 10:15] +// CHECK-LOAD: index-templates.cpp:10:8: CXXMethod=clear:10:8 Extent=[10:3 - 10:15] // CHECK-LOAD: index-templates.cpp:14:7: ClassTemplatePartialSpecialization=vector:14:7 (Definition) [Specialization of vector:9:7] Extent=[13:1 - 14:21] -// CHECK-LOAD: index-templates.cpp:13:19: TemplateTypeParameter=T:13:19 (Definition) Extent=[13:19 - 13:20] +// CHECK-LOAD: index-templates.cpp:13:19: TemplateTypeParameter=T:13:19 (Definition) Extent=[13:10 - 13:20] // CHECK-LOAD: index-templates.cpp:16:8: StructDecl=Z1:16:8 (Definition) Extent=[16:1 - 16:14] -// CHECK-LOAD: index-templates.cpp:18:16: ClassDecl=vector:18:16 (Definition) [Specialization of vector:9:7] Extent=[18:1 - 18:22] +// CHECK-LOAD: index-templates.cpp:18:16: ClassDecl=vector:18:16 (Definition) [Specialization of vector:9:7] Extent=[18:1 - 18:26] // CHECK-LOAD: index-templates.cpp:18:23: TypeRef=struct Z1:16:8 Extent=[18:23 - 18:25] // CHECK-LOAD-NOT: CXXMethod=clear // CHECK-LOAD: index-templates.cpp:20:8: StructDecl=Z2:20:8 (Definition) Extent=[20:1 - 20:14] // CHECK-LOAD: index-templates.cpp:23:7: ClassDecl=vector:23:7 (Definition) [Specialization of vector:9:7] Extent=[22:1 - 25:2] // CHECK-LOAD: index-templates.cpp:23:14: TypeRef=struct Z2:20:8 Extent=[23:14 - 23:16] -// CHECK-LOAD: index-templates.cpp:24:8: CXXMethod=clear:24:8 Extent=[24:8 - 24:15] +// CHECK-LOAD: index-templates.cpp:24:8: CXXMethod=clear:24:8 Extent=[24:3 - 24:15] // CHECK-LOAD: index-templates.cpp:28:8: ClassTemplate=Y:28:8 (Definition) Extent=[27:1 - 31:2] -// CHECK-LOAD: index-templates.cpp:27:19: TemplateTypeParameter=T:27:19 (Definition) Extent=[27:19 - 27:20] -// CHECK-LOAD: index-templates.cpp:27:31: TemplateTypeParameter=U:27:31 (Definition) Extent=[27:31 - 27:32] +// CHECK-LOAD: index-templates.cpp:27:19: TemplateTypeParameter=T:27:19 (Definition) Extent=[27:10 - 27:20] +// CHECK-LOAD: index-templates.cpp:27:31: TemplateTypeParameter=U:27:31 (Definition) Extent=[27:22 - 27:32] // CHECK-LOAD: index-templates.cpp:29:21: UsingDeclaration=type:29:21 Extent=[29:3 - 29:25] // CHECK-LOAD: index-templates.cpp:30:12: UsingDeclaration=operator Z2:30:12 Extent=[30:3 - 30:23] // CHECK-LOAD: index-templates.cpp:30:21: TypeRef=struct Z2:20:8 Extent=[30:21 - 30:23] -// CHECK-LOAD: index-templates.cpp:35:16: VarDecl=OneDimension:35:16 (Definition) Extent=[35:7 - 35:32] +// CHECK-LOAD: index-templates.cpp:35:16: VarDecl=OneDimension:35:16 (Definition) Extent=[35:1 - 35:32] // CHECK-LOAD: index-templates.cpp:35:31: UnexposedExpr= Extent=[35:31 - 35:32] // CHECK-LOAD: index-templates.cpp:35:31: UnexposedExpr= Extent=[35:31 - 35:32] // CHECK-LOAD: index-templates.cpp:37:8: ClassTemplate=array:37:8 (Definition) Extent=[36:1 - 37:17] -// CHECK-LOAD: index-templates.cpp:36:19: TemplateTypeParameter=T:36:19 (Definition) Extent=[36:19 - 36:20] -// CHECK-LOAD: index-templates.cpp:36:31: NonTypeTemplateParameter=Dimensions:36:31 (Definition) Extent=[36:22 - 36:41] +// CHECK-LOAD: index-templates.cpp:36:19: TemplateTypeParameter=T:36:19 (Definition) Extent=[36:10 - 36:20] +// CHECK-LOAD: index-templates.cpp:36:31: NonTypeTemplateParameter=Dimensions:36:31 (Definition) Extent=[36:22 - 36:56] // CHECK-LOAD: index-templates.cpp:36:44: DeclRefExpr=OneDimension:35:16 Extent=[36:44 - 36:56] // CHECK-LOAD: index-templates.cpp:40:8: ClassTemplate=storage:40:8 (Definition) Extent=[39:1 - 40:19] // CHECK-LOAD: index-templates.cpp:39:45: TemplateTemplateParameter=DataStructure:39:45 (Definition) Extent=[39:10 - 39:66] // CHECK-LOAD: index-templates.cpp:39:19: TemplateTypeParameter=:39:19 (Definition) Extent=[39:19 - 39:27] // CHECK-LOAD: index-templates.cpp:39:37: NonTypeTemplateParameter=:39:37 (Definition) Extent=[39:29 - 39:38] // CHECK-LOAD: index-templates.cpp:39:61: TemplateRef=array:37:8 Extent=[39:61 - 39:66] -// CHECK-LOAD: index-templates.cpp:42:18: TypedefDecl=Unsigned:42:18 (Definition) Extent=[42:18 - 42:26] +// CHECK-LOAD: index-templates.cpp:42:18: TypedefDecl=Unsigned:42:18 (Definition) Extent=[42:1 - 42:26] // CHECK-LOAD: index-templates.cpp:45:8: ClassTemplate=value_c:45:8 Extent=[44:1 - 45:15] -// CHECK-LOAD: index-templates.cpp:44:19: TemplateTypeParameter=T:44:19 (Definition) Extent=[44:19 - 44:20] +// CHECK-LOAD: index-templates.cpp:44:19: TemplateTypeParameter=T:44:19 (Definition) Extent=[44:10 - 44:20] // CHECK-LOAD: index-templates.cpp:44:31: NonTypeTemplateParameter=Value:44:31 (Definition) Extent=[44:22 - 44:36] // CHECK-LOAD: index-templates.cpp:44:22: TypeRef=Unsigned:42:18 Extent=[44:22 - 44:30] -// CHECK-LOAD: index-templates.cpp:47:16: ClassDecl=vector:47:16 (Definition) [Specialization of vector:14:7] Extent=[47:1 - 47:22] +// CHECK-LOAD: index-templates.cpp:47:16: ClassDecl=vector:47:16 (Definition) [Specialization of vector:14:7] Extent=[47:1 - 47:28] // CHECK-LOAD: index-templates.cpp:49:8: StructDecl=Z4:49:8 (Definition) Extent=[49:1 - 51:2] // CHECK-LOAD: index-templates.cpp:50:26: FunctionTemplate=getAs:50:26 Extent=[50:3 - 50:33] -// CHECK-LOAD: index-templates.cpp:50:21: TemplateTypeParameter=T:50:21 (Definition) Extent=[50:21 - 50:22] +// CHECK-LOAD: index-templates.cpp:50:21: TemplateTypeParameter=T:50:21 (Definition) Extent=[50:12 - 50:22] // CHECK-LOAD: index-templates.cpp:53:6: FunctionDecl=template_exprs:53:6 (Definition) // CHECK-LOAD: index-templates.cpp:54:3: CallExpr=f:4:6 Extent=[54:3 - 54:68] // CHECK-LOAD: index-templates.cpp:54:3: UnexposedExpr=f:4:6 Extent=[54:3 - 54:35] @@ -174,34 +174,34 @@ struct SuperPair : Pair<int, int>, Pair<T, U> { }; // CHECK-LOAD: index-templates.cpp:85:23: TypeRef=second_type:83:13 Extent=[85:23 - 85:34] // CHECK-LOAD: index-templates.cpp:85:35: DeclRefExpr=u:82:23 Extent=[85:35 - 85:36] // CHECK-LOAD: index-templates.cpp:101:8: ClassTemplate=SuperPair:101:8 (Definition) Extent=[100:1 - 101:50] -// CHECK-LOAD: index-templates.cpp:100:19: TemplateTypeParameter=T:100:19 (Definition) Extent=[100:19 - 100:20] -// CHECK-LOAD: index-templates.cpp:100:31: TemplateTypeParameter=U:100:31 (Definition) Extent=[100:31 - 100:32] +// CHECK-LOAD: index-templates.cpp:100:19: TemplateTypeParameter=T:100:19 (Definition) Extent=[100:10 - 100:20] +// CHECK-LOAD: index-templates.cpp:100:31: TemplateTypeParameter=U:100:31 (Definition) Extent=[100:22 - 100:32] // CHECK-LOAD: index-templates.cpp:101:20: C++ base class specifier=Pair<int, int>:98:16 [access=public isVirtual=false] Extent=[101:20 - 101:34] // CHECK-LOAD: index-templates.cpp:101:36: C++ base class specifier=Pair<T, U>:76:8 [access=public isVirtual=false] Extent=[101:36 - 101:46] // RUN: c-index-test -test-load-source-usrs all %s | FileCheck -check-prefix=CHECK-USRS %s // CHECK-USRS: index-templates.cpp c:@FT@>3#T#Nt0.0#t>2#T#Nt1.0f#>t0.22S0_# Extent=[3:1 - 4:22] -// CHECK-USRS: index-templates.cpp c:index-templates.cpp@79 Extent=[3:19 - 3:20] +// CHECK-USRS: index-templates.cpp c:index-templates.cpp@70 Extent=[3:10 - 3:20] // CHECK-USRS: index-templates.cpp c:index-templates.cpp@82 Extent=[3:22 - 3:29] // CHECK-USRS: index-templates.cpp c:index-templates.cpp@91 Extent=[3:31 - 3:67] // CHECK-USRS: index-templates.cpp c:index-templates.cpp@136@FT@>3#T#Nt0.0#t>2#T#Nt1.0f#>t0.22S0_#@x Extent=[4:8 - 4:21] // CHECK-USRS: index-templates.cpp c:@CT>1#T@allocator Extent=[6:1 - 6:37] -// CHECK-USRS: index-templates.cpp c:index-templates.cpp@171 Extent=[6:19 - 6:20] +// CHECK-USRS: index-templates.cpp c:index-templates.cpp@162 Extent=[6:10 - 6:20] // CHECK-USRS: index-templates.cpp c:@CT>2#T#T@vector Extent=[8:1 - 11:2] -// CHECK-USRS: index-templates.cpp c:index-templates.cpp@210 Extent=[8:19 - 8:20] -// CHECK-USRS: index-templates.cpp c:index-templates.cpp@222 Extent=[8:31 - 8:36] -// CHECK-USRS: index-templates.cpp c:@CT>2#T#T@vector@F@clear# Extent=[10:8 - 10:15] +// CHECK-USRS: index-templates.cpp c:index-templates.cpp@201 Extent=[8:10 - 8:20] +// CHECK-USRS: index-templates.cpp c:index-templates.cpp@213 Extent=[8:22 - 8:51] +// CHECK-USRS: index-templates.cpp c:@CT>2#T#T@vector@F@clear# Extent=[10:3 - 10:15] // CHECK-USRS: index-templates.cpp c:@CP>1#T@vector>#*t0.0#>@CT>1#T@allocator1S0_ Extent=[13:1 - 14:21] -// CHECK-USRS: index-templates.cpp c:index-templates.cpp@298 Extent=[13:19 - 13:20] +// CHECK-USRS: index-templates.cpp c:index-templates.cpp@289 Extent=[13:10 - 13:20] // CHECK-USRS: index-templates.cpp c:@S@Z1 Extent=[16:1 - 16:14] -// CHECK-USRS: index-templates.cpp c:@C@vector>#$@S@Z1#$@C@allocator>#S0_ Extent=[18:1 - 18:22] +// CHECK-USRS: index-templates.cpp c:@C@vector>#$@S@Z1#$@C@allocator>#S0_ Extent=[18:1 - 18:26] // CHECK-USRS: index-templates.cpp c:@S@Z2 Extent=[20:1 - 20:14] // CHECK-USRS: index-templates.cpp c:@C@vector>#$@S@Z2#$@C@allocator>#S0_ Extent=[22:1 - 25:2] -// CHECK-USRS: index-templates.cpp c:@C@vector>#$@S@Z2#$@C@allocator>#S0_@F@clear# Extent=[24:8 - 24:15] +// CHECK-USRS: index-templates.cpp c:@C@vector>#$@S@Z2#$@C@allocator>#S0_@F@clear# Extent=[24:3 - 24:15] // CHECK-USRS: index-templates.cpp c:@ST>2#T#T@Y Extent=[27:1 - 31:2] -// CHECK-USRS: index-templates.cpp c:index-templates.cpp@452 Extent=[27:19 - 27:20] -// CHECK-USRS: index-templates.cpp c:index-templates.cpp@464 Extent=[27:31 - 27:32] +// CHECK-USRS: index-templates.cpp c:index-templates.cpp@443 Extent=[27:10 - 27:20] +// CHECK-USRS: index-templates.cpp c:index-templates.cpp@455 Extent=[27:22 - 27:32] // CHECK-USRS-NOT: type // CHECK-USRS: index-templates.cpp c:@S@Z3 Extent=[33:1 - 33:14] // CHECK-USRS: index-templates.cpp c:@F@f#$@S@map>#$@S@Z4#$@S@Pair>#I#S1_#$@S@compare>#$@S@Pair>#S1_#S2_#$@C@allocator>#S4_# diff --git a/test/Index/initializer-memory.cpp b/test/Index/initializer-memory.cpp new file mode 100644 index 000000000000..f085c3562438 --- /dev/null +++ b/test/Index/initializer-memory.cpp @@ -0,0 +1,16 @@ +// RUN: c-index-test -test-load-source-memory-usage none %s 2>&1 | FileCheck %s + +// rdar://9275920 - We would create millions of Exprs to fill out the initializer. + +double data[1000000] = {0}; +double data_empty_init[1000000] = {}; + +struct S { + S(int); + S(); +}; + +S data2[1000000] = {0}; +S data_empty_init2[1000000] = {}; + +// CHECK: TOTAL = {{.*}} (0.{{.*}} MBytes) diff --git a/test/Index/invalid-rdar-8236270.cpp b/test/Index/invalid-rdar-8236270.cpp index 6fd088dcc813..4593b512ee24 100644 --- a/test/Index/invalid-rdar-8236270.cpp +++ b/test/Index/invalid-rdar-8236270.cpp @@ -6,6 +6,6 @@ struct abc *P; int main( // CHECK: StructDecl=abc:5:8 Extent=[5:1 - 5:11] -// CHECK: VarDecl=P:5:13 (Definition) Extent=[5:8 - 5:14] +// CHECK: VarDecl=P:5:13 (Definition) Extent=[5:1 - 5:14] // CHECK: VarDecl=main:6:5 (Definition) Extent=[6:1 - 6:9] diff --git a/test/Index/load-classes.cpp b/test/Index/load-classes.cpp index 349ebdecd750..58770191ea99 100644 --- a/test/Index/load-classes.cpp +++ b/test/Index/load-classes.cpp @@ -17,12 +17,12 @@ X::X(int value) { // CHECK: load-classes.cpp:4:9: ParmDecl=value:4:9 (Definition) Extent=[4:5 - 4:14] // CHECK: load-classes.cpp:5:3: CXXConstructor=X:5:3 Extent=[5:3 - 5:16] // FIXME: missing TypeRef in the constructor name -// CHECK: load-classes.cpp:5:14: ParmDecl=x:5:14 (Definition) Extent=[5:11 - 5:15] +// CHECK: load-classes.cpp:5:14: ParmDecl=x:5:14 (Definition) Extent=[5:5 - 5:15] // CHECK: load-classes.cpp:5:11: TypeRef=struct X:3:8 Extent=[5:11 - 5:12] // CHECK: load-classes.cpp:6:3: CXXDestructor=~X:6:3 Extent=[6:3 - 6:7] // FIXME: missing TypeRef in the destructor name // CHECK: load-classes.cpp:7:3: CXXConversion=operator struct X *:7:3 Extent=[7:3 - 7:16] // CHECK: load-classes.cpp:7:12: TypeRef=struct X:3:8 Extent=[7:12 - 7:13] -// CHECK: load-classes.cpp:10:4: CXXConstructor=X:10:4 (Definition) Extent=[10:4 - 11:2] +// CHECK: load-classes.cpp:10:4: CXXConstructor=X:10:4 (Definition) Extent=[10:1 - 11:2] // CHECK: load-classes.cpp:10:1: TypeRef=struct X:3:8 Extent=[10:1 - 10:2] // CHECK: load-classes.cpp:10:10: ParmDecl=value:10:10 (Definition) Extent=[10:6 - 10:15] diff --git a/test/Index/load-exprs.c b/test/Index/load-exprs.c index 01adf62aff49..a4723d88ef85 100644 --- a/test/Index/load-exprs.c +++ b/test/Index/load-exprs.c @@ -32,30 +32,30 @@ void test_members(int aval, int bval) { } // RUN: c-index-test -test-load-source all %s -fblocks | FileCheck %s - -// CHECK: load-exprs.c:1:13: TypedefDecl=T:1:13 (Definition) Extent=[1:13 - 1:14] +// CHECK: macro definition=__clang__ +// CHECK: load-exprs.c:1:13: TypedefDecl=T:1:13 (Definition) Extent=[1:1 - 1:14] // CHECK: load-exprs.c:2:8: StructDecl=X:2:8 (Definition) Extent=[2:1 - 2:23] -// CHECK: load-exprs.c:2:16: FieldDecl=a:2:16 (Definition) Extent=[2:16 - 2:17] -// CHECK: load-exprs.c:2:19: FieldDecl=b:2:19 (Definition) Extent=[2:19 - 2:20] -// CHECK: load-exprs.c:3:6: FunctionDecl=f:3:6 (Definition) Extent=[3:6 - 8:2] +// CHECK: load-exprs.c:2:16: FieldDecl=a:2:16 (Definition) Extent=[2:12 - 2:17] +// CHECK: load-exprs.c:2:19: FieldDecl=b:2:19 (Definition) Extent=[2:12 - 2:20] +// CHECK: load-exprs.c:3:6: FunctionDecl=f:3:6 (Definition) Extent=[3:1 - 8:2] // CHECK: load-exprs.c:3:14: ParmDecl=ptr:3:14 (Definition) Extent=[3:8 - 3:17] // CHECK: load-exprs.c:4:6: VarDecl=t_ptr:4:6 (Definition) Extent=[4:3 - 4:22] // CHECK: load-exprs.c:4:3: TypeRef=T:1:13 Extent=[4:3 - 4:4] // CHECK: load-exprs.c:4:15: TypeRef=T:1:13 Extent=[4:15 - 4:16] // CHECK: load-exprs.c:4:19: DeclRefExpr=ptr:3:14 Extent=[4:19 - 4:22] // CHECK: load-exprs.c:5:16: TypeRef=T:1:13 Extent=[5:16 - 5:17] -// CHECK: load-exprs.c:6:12: VarDecl=x:6:12 (Definition) Extent=[6:10 - 6:32] +// CHECK: load-exprs.c:6:12: VarDecl=x:6:12 (Definition) Extent=[6:3 - 6:32] // CHECK: load-exprs.c:6:10: TypeRef=struct X:2:8 Extent=[6:10 - 6:11] // CHECK: load-exprs.c:6:24: TypeRef=struct X:2:8 Extent=[6:24 - 6:25] // CHECK: load-exprs.c:7:9: VarDecl=xx:7:9 (Definition) Extent=[7:3 - 7:24] // CHECK: load-exprs.c:7:14: DeclRefExpr=ptr:3:14 Extent=[7:14 - 7:17] // CHECK: load-exprs.c:7:23: DeclRefExpr=x:6:12 Extent=[7:23 - 7:24] -// CHECK: load-exprs.c:10:5: FunctionDecl=test_blocks:10:5 (Definition) Extent=[10:5 - 21:2] +// CHECK: load-exprs.c:10:5: FunctionDecl=test_blocks:10:5 (Definition) Extent=[10:1 - 21:2] // CHECK: load-exprs.c:10:21: ParmDecl=x:10:21 (Definition) Extent=[10:17 - 10:22] -// CHECK: load-exprs.c:11:15: VarDecl=y:11:15 (Definition) Extent=[11:11 - 11:20] +// CHECK: load-exprs.c:11:15: VarDecl=y:11:15 (Definition) Extent=[11:3 - 11:20] // CHECK: load-exprs.c:11:19: DeclRefExpr=x:10:21 Extent=[11:19 - 11:20] // CHECK: load-exprs.c:12:3: CallExpr= Extent=[12:3 - 19:7] -// CHECK: load-exprs.c:13:17: VarDecl=z:13:17 (Definition) Extent=[13:13 - 13:22] +// CHECK: load-exprs.c:13:17: VarDecl=z:13:17 (Definition) Extent=[13:6 - 13:22] // CHECK: load-exprs.c:14:6: DeclRefExpr=y:11:15 Extent=[14:6 - 14:7] // CHECK: load-exprs.c:14:13: DeclRefExpr=z:13:17 Extent=[14:13 - 14:14] // CHECK: load-exprs.c:14:18: DeclRefExpr=x:10:21 Extent=[14:18 - 14:19] @@ -64,7 +64,7 @@ void test_members(int aval, int bval) { // CHECK: load-exprs.c:17:10: DeclRefExpr=y:11:15 Extent=[17:10 - 17:11] // CHECK: load-exprs.c:20:10: DeclRefExpr=y:11:15 Extent=[20:10 - 20:11] // CHECK: load-exprs.c:29:6: FunctionDecl=test_members:29:6 (Definition) -// CHECK: load-exprs.c:30:12: VarDecl=y0:30:12 (Definition) Extent=[30:10 - 30:77] +// CHECK: load-exprs.c:30:12: VarDecl=y0:30:12 (Definition) Extent=[30:3 - 30:77] // CHECK: load-exprs.c:30:10: TypeRef=struct Y:23:8 Extent=[30:10 - 30:11] // CHECK: load-exprs.c:30:20: MemberRef=array:24:12 Extent=[30:20 - 30:25] // CHECK: load-exprs.c:30:26: DeclRefExpr=StartIndex:27:8 Extent=[30:26 - 30:36] diff --git a/test/Index/load-namespaces.cpp b/test/Index/load-namespaces.cpp index 931a1dc79d2c..49de66a81d36 100644 --- a/test/Index/load-namespaces.cpp +++ b/test/Index/load-namespaces.cpp @@ -27,23 +27,23 @@ void std::g() { namespace my_rel_ops = std::rel_ops; // RUN: c-index-test -test-load-source all %s | FileCheck %s -// CHECK: load-namespaces.cpp:3:11: Namespace=std:3:11 (Definition) Extent=[3:11 - 7:2] -// CHECK: load-namespaces.cpp:4:13: Namespace=rel_ops:4:13 (Definition) Extent=[4:13 - 6:4] -// CHECK: load-namespaces.cpp:5:10: FunctionDecl=f:5:10 Extent=[5:10 - 5:13] -// CHECK: load-namespaces.cpp:9:11: Namespace=std:9:11 (Definition) Extent=[9:11 - 11:2] -// CHECK: load-namespaces.cpp:10:8: FunctionDecl=g:10:8 Extent=[10:8 - 10:11] +// CHECK: load-namespaces.cpp:3:11: Namespace=std:3:11 (Definition) Extent=[3:1 - 7:2] +// CHECK: load-namespaces.cpp:4:13: Namespace=rel_ops:4:13 (Definition) Extent=[4:3 - 6:4] +// CHECK: load-namespaces.cpp:5:10: FunctionDecl=f:5:10 Extent=[5:5 - 5:13] +// CHECK: load-namespaces.cpp:9:11: Namespace=std:9:11 (Definition) Extent=[9:1 - 11:2] +// CHECK: load-namespaces.cpp:10:8: FunctionDecl=g:10:8 Extent=[10:3 - 10:11] // CHECK: load-namespaces.cpp:13:11: NamespaceAlias=std98:13:11 Extent=[13:1 - 13:22] // CHECK: load-namespaces.cpp:13:19: NamespaceRef=std:3:11 Extent=[13:19 - 13:22] // CHECK: load-namespaces.cpp:14:11: NamespaceAlias=std0x:14:11 Extent=[14:1 - 14:24] // CHECK: load-namespaces.cpp:14:19: NamespaceRef=std98:13:11 Extent=[14:19 - 14:24] // CHECK: load-namespaces.cpp:16:17: UsingDirective=:16:17 Extent=[16:1 - 16:22] // CHECK: load-namespaces.cpp:16:17: NamespaceRef=std0x:14:11 Extent=[16:17 - 16:22] -// CHECK: load-namespaces.cpp:18:11: Namespace=std:18:11 (Definition) Extent=[18:11 - 20:2] -// CHECK: load-namespaces.cpp:19:7: FunctionDecl=g:19:7 Extent=[19:7 - 19:13] +// CHECK: load-namespaces.cpp:18:11: Namespace=std:18:11 (Definition) Extent=[18:1 - 20:2] +// CHECK: load-namespaces.cpp:19:7: FunctionDecl=g:19:7 Extent=[19:3 - 19:13] // CHECK: load-namespaces.cpp:19:12: ParmDecl=:19:12 (Definition) Extent=[19:9 - 19:13] // CHECK: load-namespaces.cpp:22:12: UsingDeclaration=g[19:7, 10:8] Extent=[22:1 - 22:13] // CHECK: load-namespaces.cpp:22:7: NamespaceRef=std:18:11 Extent=[22:7 - 22:10] -// CHECK: load-namespaces.cpp:24:11: FunctionDecl=g:24:11 (Definition) Extent=[24:11 - 25:2] +// CHECK: load-namespaces.cpp:24:11: FunctionDecl=g:24:11 (Definition) Extent=[24:1 - 25:2] // CHECK: load-namespaces.cpp:24:6: NamespaceRef=std:18:11 Extent=[24:6 - 24:9] // CHECK: load-namespaces.cpp:27:11: NamespaceAlias=my_rel_ops:27:11 Extent=[27:1 - 27:36] // CHECK: load-namespaces.cpp:27:24: NamespaceRef=std:18:11 Extent=[27:24 - 27:27] diff --git a/test/Index/load-stmts.cpp b/test/Index/load-stmts.cpp index 323b778faf23..cb9d3f2b609f 100644 --- a/test/Index/load-stmts.cpp +++ b/test/Index/load-stmts.cpp @@ -118,11 +118,11 @@ void casts(int *ip) { } // RUN: c-index-test -test-load-source all %s | FileCheck %s -// CHECK: load-stmts.cpp:1:13: TypedefDecl=T:1:13 (Definition) Extent=[1:13 - 1:14] +// CHECK: load-stmts.cpp:1:13: TypedefDecl=T:1:13 (Definition) Extent=[1:1 - 1:14] // CHECK: load-stmts.cpp:2:8: StructDecl=X:2:8 (Definition) Extent=[2:1 - 2:23] -// CHECK: load-stmts.cpp:2:16: FieldDecl=a:2:16 (Definition) Extent=[2:16 - 2:17] -// CHECK: load-stmts.cpp:2:19: FieldDecl=b:2:19 (Definition) Extent=[2:19 - 2:20] -// CHECK: load-stmts.cpp:3:6: FunctionDecl=f:3:6 (Definition) Extent=[3:6 - 11:2] +// CHECK: load-stmts.cpp:2:16: FieldDecl=a:2:16 (Definition) Extent=[2:12 - 2:17] +// CHECK: load-stmts.cpp:2:19: FieldDecl=b:2:19 (Definition) Extent=[2:12 - 2:20] +// CHECK: load-stmts.cpp:3:6: FunctionDecl=f:3:6 (Definition) Extent=[3:1 - 11:2] // CHECK: load-stmts.cpp:3:12: ParmDecl=x:3:12 (Definition) Extent=[3:8 - 3:13] // CHECK: load-stmts.cpp:4:10: VarDecl=y:4:10 (Definition) Extent=[4:8 - 4:15] // CHECK: load-stmts.cpp:4:8: TypeRef=T:1:13 Extent=[4:8 - 4:9] @@ -152,13 +152,13 @@ void casts(int *ip) { // CHECK: load-stmts.cpp:8:13: DeclRefExpr=z4:8:13 Extent=[8:13 - 8:15] // CHECK: load-stmts.cpp:9:8: UnexposedExpr= Extent=[9:8 - 9:10] // CHECK: load-stmts.cpp:14:7: ClassDecl=A:14:7 (Definition) Extent=[14:1 - 16:2] -// CHECK: load-stmts.cpp:15:8: CXXMethod=doA:15:8 Extent=[15:8 - 15:13] +// CHECK: load-stmts.cpp:15:8: CXXMethod=doA:15:8 Extent=[15:3 - 15:13] // CHECK: load-stmts.cpp:18:7: ClassDecl=B:18:7 (Definition) Extent=[18:1 - 20:2] -// CHECK: load-stmts.cpp:19:8: CXXMethod=doB:19:8 Extent=[19:8 - 19:13] +// CHECK: load-stmts.cpp:19:8: CXXMethod=doB:19:8 Extent=[19:3 - 19:13] // CHECK: load-stmts.cpp:22:7: ClassDecl=C:22:7 (Definition) Extent=[22:1 - 24:2] // CHECK: load-stmts.cpp:22:18: C++ base class specifier=class A:14:7 [access=public isVirtual=false] // CHECK: load-stmts.cpp:22:29: C++ base class specifier=class B:18:7 [access=private isVirtual=false] -// CHECK: load-stmts.cpp:23:8: CXXMethod=doC:23:8 Extent=[23:8 - 23:13] +// CHECK: load-stmts.cpp:23:8: CXXMethod=doC:23:8 Extent=[23:3 - 23:13] // CHECK: load-stmts.cpp:26:7: ClassDecl=D:26:7 (Definition) Extent=[26:1 - 26:49] // CHECK: load-stmts.cpp:26:26: C++ base class specifier=class C:22:7 [access=public isVirtual=true] // CHECK: load-stmts.cpp:26:45: C++ base class specifier=class A:14:7 [access=private isVirtual=true] @@ -174,7 +174,7 @@ void casts(int *ip) { // CHECK: load-stmts.cpp:51:3: CallExpr= Extent=[51:3 - 51:10] // CHECK: load-stmts.cpp:51:3: NamespaceRef=N:41:11 Extent=[51:3 - 51:4] // CHECK: load-stmts.cpp:51:8: DeclRefExpr=t:50:29 Extent=[51:8 - 51:9] -// CHECK: load-stmts.cpp:52:13: TypedefDecl=type:52:13 (Definition) Extent=[52:13 - 52:17] +// CHECK: load-stmts.cpp:52:13: TypedefDecl=type:52:13 (Definition) Extent=[52:3 - 52:17] // CHECK: load-stmts.cpp:53:3: CallExpr= Extent=[53:3 - 53:16] // CHECK: load-stmts.cpp:53:3: NamespaceRef=N:41:11 Extent=[53:3 - 53:4] // CHECK: load-stmts.cpp:53:8: TypeRef=type:52:13 Extent=[53:8 - 53:12] diff --git a/test/Index/local-symbols.m b/test/Index/local-symbols.m index af3b601465a8..3a479522944e 100644 --- a/test/Index/local-symbols.m +++ b/test/Index/local-symbols.m @@ -27,7 +27,7 @@ @end // CHECK: local-symbols.m:6:12: ObjCInterfaceDecl=Foo:6:12 Extent=[6:1 - 10:5] -// CHECK: local-symbols.m:7:6: ObjCIvarDecl=x:7:6 (Definition) Extent=[7:6 - 7:7] +// CHECK: local-symbols.m:7:6: ObjCIvarDecl=x:7:6 (Definition) Extent=[7:3 - 7:7] // CHECK: local-symbols.m:7:3: TypeRef=id:0:0 Extent=[7:3 - 7:5] // CHECK: local-symbols.m:9:1: ObjCInstanceMethodDecl=bar:9:1 Extent=[9:1 - 9:12] // CHECK: local-symbols.m:9:4: TypeRef=id:0:0 Extent=[9:4 - 9:6] diff --git a/test/Index/nested-binaryoperators.cpp b/test/Index/nested-binaryoperators.cpp index d263b9ddbc21..db5efe2cc8c2 100644 --- a/test/Index/nested-binaryoperators.cpp +++ b/test/Index/nested-binaryoperators.cpp @@ -161,8 +161,8 @@ int foo(uint c) { } // RUN: c-index-test -test-load-source all %s | FileCheck %s -// CHECK: 1:22: TypedefDecl=uint:1:22 (Definition) Extent=[1:22 - 1:26] -// CHECK: 2:5: FunctionDecl=foo:2:5 (Definition) Extent=[2:5 - 161:2] +// CHECK: 1:22: TypedefDecl=uint:1:22 (Definition) Extent=[1:1 - 1:26] +// CHECK: 2:5: FunctionDecl=foo:2:5 (Definition) Extent=[2:1 - 161:2] // CHECK: 2:14: ParmDecl=c:2:14 (Definition) Extent=[2:9 - 2:15] // CHECK: 2:9: TypeRef=uint:1:22 Extent=[2:9 - 2:13] // CHECK: 2:17: UnexposedStmt= Extent=[2:17 - 161:2] diff --git a/test/Index/overrides.cpp b/test/Index/overrides.cpp index 3dee607e4318..ed24cc5cf59b 100644 --- a/test/Index/overrides.cpp +++ b/test/Index/overrides.cpp @@ -16,5 +16,5 @@ struct D : C { }; // RUN: c-index-test -test-load-source local %s | FileCheck %s -// CHECK: overrides.cpp:11:16: CXXMethod=g:11:16 [Overrides @7:16] Extent=[11:16 - 11:19] -// CHECK: overrides.cpp:15:16: CXXMethod=f:15:16 [Overrides @2:16, @6:16] Extent=[15:16 - 15:22] +// CHECK: overrides.cpp:11:16: CXXMethod=g:11:16 [Overrides @7:16] Extent=[11:3 - 11:19] +// CHECK: overrides.cpp:15:16: CXXMethod=f:15:16 [Overrides @2:16, @6:16] Extent=[15:3 - 15:22] diff --git a/test/Index/pragma-diag-reparse.c b/test/Index/pragma-diag-reparse.c new file mode 100644 index 000000000000..efe59b177841 --- /dev/null +++ b/test/Index/pragma-diag-reparse.c @@ -0,0 +1,13 @@ +// RUN: env CINDEXTEST_EDITING=1 c-index-test -test-load-source-reparse 5 local %s | FileCheck %s + +int main (int argc, const char * argv[]) +{ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + int x; +#pragma clang diagnostic pop + + return 0; +} + +// CHECK: pragma-diag-reparse.c:7:7: VarDecl=x:7:7 (Definition) Extent=[7:3 - 7:8] diff --git a/test/Index/preamble-reparse-chained.c b/test/Index/preamble-reparse-chained.c index 5be3b12f01db..5cc28f705464 100644 --- a/test/Index/preamble-reparse-chained.c +++ b/test/Index/preamble-reparse-chained.c @@ -6,5 +6,5 @@ A a; B b; -// CHECK: a.h:3:13: TypedefDecl=A:3:13 (Definition) Extent=[3:13 - 3:14] -// CHECK: b.h:1:15: TypedefDecl=B:1:15 (Definition) Extent=[1:15 - 1:16] +// CHECK: a.h:3:13: TypedefDecl=A:3:13 (Definition) Extent=[3:1 - 3:14] +// CHECK: b.h:1:15: TypedefDecl=B:1:15 (Definition) Extent=[1:1 - 1:16] diff --git a/test/Index/preamble.c b/test/Index/preamble.c index fb784b389d0a..119bdb58e759 100644 --- a/test/Index/preamble.c +++ b/test/Index/preamble.c @@ -8,13 +8,13 @@ void f(int x) { // RUN: c-index-test -write-pch %t.pch -x c-header %S/Inputs/prefix.h // RUN: env CINDEXTEST_EDITING=1 c-index-test -test-load-source-reparse 5 local -I %S/Inputs -include %t %s 2> %t.stderr.txt | FileCheck %s // RUN: FileCheck -check-prefix CHECK-DIAG %s < %t.stderr.txt -// CHECK: preamble.h:1:12: FunctionDecl=bar:1:12 (Definition) Extent=[1:12 - 6:2] +// CHECK: preamble.h:1:12: FunctionDecl=bar:1:12 (Definition) Extent=[1:1 - 6:2] // CHECK: preamble.h:4:3: UnexposedExpr= Extent=[4:3 - 4:13] // CHECK: preamble.h:4:3: DeclRefExpr=ptr:2:8 Extent=[4:3 - 4:6] // CHECK: preamble.h:4:9: UnexposedExpr=ptr1:3:10 Extent=[4:9 - 4:13] // CHECK: preamble.h:4:9: DeclRefExpr=ptr1:3:10 Extent=[4:9 - 4:13] // CHECK: preamble.h:5:10: UnexposedExpr= Extent=[5:10 - 5:11] -// CHECK: preamble.c:3:5: FunctionDecl=wibble:3:5 Extent=[3:5 - 3:16] +// CHECK: preamble.c:3:5: FunctionDecl=wibble:3:5 Extent=[3:1 - 3:16] // CHECK: preamble.c:3:15: ParmDecl=:3:15 (Definition) Extent=[3:12 - 3:16] // CHECK-DIAG: preamble.h:4:7:{4:9-4:13}: warning: incompatible pointer types assigning to 'int *' from 'float *' // RUN: env CINDEXTEST_EDITING=1 c-index-test -code-completion-at=%s:6:1 -I %S/Inputs -include %t %s 2> %t.stderr.txt | FileCheck -check-prefix CHECK-CC %s diff --git a/test/Index/rdar-8288645-invalid-code.mm b/test/Index/rdar-8288645-invalid-code.mm index 3405f0a93270..74e2365edcfe 100644 --- a/test/Index/rdar-8288645-invalid-code.mm +++ b/test/Index/rdar-8288645-invalid-code.mm @@ -5,4 +5,4 @@ extern "C" { @implementation Foo - (id)initWithBar:(Baz<WozBar>)pepper { // CHECK: warning: cannot find interface declaration for 'Foo' -// CHECK: warning: '@end' is missing in implementation context +// CHECK: error: '@end' is missing in implementation context diff --git a/test/Index/recursive-cxx-member-calls.cpp b/test/Index/recursive-cxx-member-calls.cpp index 1707491af03e..6170fdcb81d7 100644 --- a/test/Index/recursive-cxx-member-calls.cpp +++ b/test/Index/recursive-cxx-member-calls.cpp @@ -201,16 +201,16 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK-tokens: Punctuation: "{" [3:15 - 3:16] Namespace=std:3:11 (Definition) // CHECK-tokens: Keyword: "template" [4:3 - 4:11] ClassTemplate=pair:4:44 (Definition) // CHECK-tokens: Punctuation: "<" [4:12 - 4:13] ClassTemplate=pair:4:44 (Definition) -// CHECK-tokens: Keyword: "class" [4:14 - 4:19] ClassTemplate=pair:4:44 (Definition) +// CHECK-tokens: Keyword: "class" [4:14 - 4:19] TemplateTypeParameter=_T1:4:20 (Definition) // CHECK-tokens: Identifier: "_T1" [4:20 - 4:23] TemplateTypeParameter=_T1:4:20 (Definition) // CHECK-tokens: Punctuation: "," [4:23 - 4:24] ClassTemplate=pair:4:44 (Definition) -// CHECK-tokens: Keyword: "class" [4:25 - 4:30] ClassTemplate=pair:4:44 (Definition) +// CHECK-tokens: Keyword: "class" [4:25 - 4:30] TemplateTypeParameter=_T2:4:31 (Definition) // CHECK-tokens: Identifier: "_T2" [4:31 - 4:34] TemplateTypeParameter=_T2:4:31 (Definition) // CHECK-tokens: Punctuation: ">" [4:35 - 4:36] ClassTemplate=pair:4:44 (Definition) // CHECK-tokens: Keyword: "struct" [4:37 - 4:43] ClassTemplate=pair:4:44 (Definition) // CHECK-tokens: Identifier: "pair" [4:44 - 4:48] ClassTemplate=pair:4:44 (Definition) // CHECK-tokens: Punctuation: "{" [4:49 - 4:50] ClassTemplate=pair:4:44 (Definition) -// CHECK-tokens: Identifier: "_T2" [4:51 - 4:54] FieldDecl=second:4:55 (Definition) +// CHECK-tokens: Identifier: "_T2" [4:51 - 4:54] TypeRef=_T2:4:31 // CHECK-tokens: Identifier: "second" [4:55 - 4:61] FieldDecl=second:4:55 (Definition) // CHECK-tokens: Punctuation: ";" [4:61 - 4:62] ClassTemplate=pair:4:44 (Definition) // CHECK-tokens: Punctuation: "}" [4:63 - 4:64] ClassTemplate=pair:4:44 (Definition) @@ -429,8 +429,8 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK-tokens: Punctuation: ":" [39:7 - 39:8] UnexposedDecl=:39:1 (Definition) // CHECK-tokens: Keyword: "typedef" [40:3 - 40:10] ClassDecl=StringRef:38:7 (Definition) // CHECK-tokens: Keyword: "const" [40:11 - 40:16] ClassDecl=StringRef:38:7 (Definition) -// CHECK-tokens: Keyword: "char" [40:17 - 40:21] ClassDecl=StringRef:38:7 (Definition) -// CHECK-tokens: Punctuation: "*" [40:22 - 40:23] ClassDecl=StringRef:38:7 (Definition) +// CHECK-tokens: Keyword: "char" [40:17 - 40:21] TypedefDecl=iterator:40:23 (Definition) +// CHECK-tokens: Punctuation: "*" [40:22 - 40:23] TypedefDecl=iterator:40:23 (Definition) // CHECK-tokens: Identifier: "iterator" [40:23 - 40:31] TypedefDecl=iterator:40:23 (Definition) // CHECK-tokens: Punctuation: ";" [40:31 - 40:32] ClassDecl=StringRef:38:7 (Definition) // CHECK-tokens: Keyword: "static" [41:3 - 41:9] ClassDecl=StringRef:38:7 (Definition) @@ -679,16 +679,16 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK-tokens: Keyword: "const" [68:30 - 68:35] CXXMethod=getNameStart:68:15 (Definition) // CHECK-tokens: Punctuation: "{" [68:36 - 68:37] UnexposedStmt= // CHECK-tokens: Keyword: "typedef" [69:5 - 69:12] UnexposedStmt= -// CHECK-tokens: Identifier: "std" [69:13 - 69:16] UnexposedStmt= -// CHECK-tokens: Punctuation: "::" [69:16 - 69:18] UnexposedStmt= -// CHECK-tokens: Identifier: "pair" [69:18 - 69:22] UnexposedStmt= -// CHECK-tokens: Punctuation: "<" [69:23 - 69:24] UnexposedStmt= -// CHECK-tokens: Identifier: "IdentifierInfo" [69:25 - 69:39] UnexposedStmt= -// CHECK-tokens: Punctuation: "," [69:39 - 69:40] UnexposedStmt= -// CHECK-tokens: Keyword: "const" [69:41 - 69:46] UnexposedStmt= -// CHECK-tokens: Keyword: "char" [69:47 - 69:51] UnexposedStmt= -// CHECK-tokens: Punctuation: "*" [69:52 - 69:53] UnexposedStmt= -// CHECK-tokens: Punctuation: ">" [69:53 - 69:54] UnexposedStmt= +// CHECK-tokens: Identifier: "std" [69:13 - 69:16] NamespaceRef=std:3:11 +// CHECK-tokens: Punctuation: "::" [69:16 - 69:18] TypedefDecl=actualtype:69:54 (Definition) +// CHECK-tokens: Identifier: "pair" [69:18 - 69:22] TemplateRef=pair:4:44 +// CHECK-tokens: Punctuation: "<" [69:23 - 69:24] TypedefDecl=actualtype:69:54 (Definition) +// CHECK-tokens: Identifier: "IdentifierInfo" [69:25 - 69:39] TypeRef=class clang::IdentifierInfo:66:7 +// CHECK-tokens: Punctuation: "," [69:39 - 69:40] TypedefDecl=actualtype:69:54 (Definition) +// CHECK-tokens: Keyword: "const" [69:41 - 69:46] TypedefDecl=actualtype:69:54 (Definition) +// CHECK-tokens: Keyword: "char" [69:47 - 69:51] TypedefDecl=actualtype:69:54 (Definition) +// CHECK-tokens: Punctuation: "*" [69:52 - 69:53] TypedefDecl=actualtype:69:54 (Definition) +// CHECK-tokens: Punctuation: ">" [69:53 - 69:54] TypedefDecl=actualtype:69:54 (Definition) // CHECK-tokens: Identifier: "actualtype" [69:54 - 69:64] TypedefDecl=actualtype:69:54 (Definition) // CHECK-tokens: Punctuation: ";" [69:64 - 69:65] UnexposedStmt= // CHECK-tokens: Keyword: "return" [70:5 - 70:11] UnexposedStmt= @@ -711,16 +711,16 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK-tokens: Keyword: "const" [72:24 - 72:29] CXXMethod=getLength:72:12 (Definition) // CHECK-tokens: Punctuation: "{" [72:30 - 72:31] UnexposedStmt= // CHECK-tokens: Keyword: "typedef" [73:5 - 73:12] UnexposedStmt= -// CHECK-tokens: Identifier: "std" [73:13 - 73:16] UnexposedStmt= -// CHECK-tokens: Punctuation: "::" [73:16 - 73:18] UnexposedStmt= -// CHECK-tokens: Identifier: "pair" [73:18 - 73:22] UnexposedStmt= -// CHECK-tokens: Punctuation: "<" [73:23 - 73:24] UnexposedStmt= -// CHECK-tokens: Identifier: "IdentifierInfo" [73:25 - 73:39] UnexposedStmt= -// CHECK-tokens: Punctuation: "," [73:39 - 73:40] UnexposedStmt= -// CHECK-tokens: Keyword: "const" [73:41 - 73:46] UnexposedStmt= -// CHECK-tokens: Keyword: "char" [73:47 - 73:51] UnexposedStmt= -// CHECK-tokens: Punctuation: "*" [73:52 - 73:53] UnexposedStmt= -// CHECK-tokens: Punctuation: ">" [73:53 - 73:54] UnexposedStmt= +// CHECK-tokens: Identifier: "std" [73:13 - 73:16] NamespaceRef=std:3:11 +// CHECK-tokens: Punctuation: "::" [73:16 - 73:18] TypedefDecl=actualtype:73:54 (Definition) +// CHECK-tokens: Identifier: "pair" [73:18 - 73:22] TemplateRef=pair:4:44 +// CHECK-tokens: Punctuation: "<" [73:23 - 73:24] TypedefDecl=actualtype:73:54 (Definition) +// CHECK-tokens: Identifier: "IdentifierInfo" [73:25 - 73:39] TypeRef=class clang::IdentifierInfo:66:7 +// CHECK-tokens: Punctuation: "," [73:39 - 73:40] TypedefDecl=actualtype:73:54 (Definition) +// CHECK-tokens: Keyword: "const" [73:41 - 73:46] TypedefDecl=actualtype:73:54 (Definition) +// CHECK-tokens: Keyword: "char" [73:47 - 73:51] TypedefDecl=actualtype:73:54 (Definition) +// CHECK-tokens: Punctuation: "*" [73:52 - 73:53] TypedefDecl=actualtype:73:54 (Definition) +// CHECK-tokens: Punctuation: ">" [73:53 - 73:54] TypedefDecl=actualtype:73:54 (Definition) // CHECK-tokens: Identifier: "actualtype" [73:54 - 73:64] TypedefDecl=actualtype:73:54 (Definition) // CHECK-tokens: Punctuation: ";" [73:64 - 73:65] UnexposedStmt= // CHECK-tokens: Keyword: "const" [74:5 - 74:10] UnexposedStmt= @@ -771,18 +771,18 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK-tokens: Literal: "1" [75:61 - 75:62] UnexposedExpr= // CHECK-tokens: Punctuation: ";" [75:62 - 75:63] UnexposedStmt= // CHECK-tokens: Punctuation: "}" [76:3 - 76:4] UnexposedStmt= -// CHECK-tokens: Identifier: "llvm" [77:3 - 77:7] CXXMethod=getName:77:19 (Definition) +// CHECK-tokens: Identifier: "llvm" [77:3 - 77:7] NamespaceRef=llvm:37:11 // CHECK-tokens: Punctuation: "::" [77:7 - 77:9] CXXMethod=getName:77:19 (Definition) -// CHECK-tokens: Identifier: "StringRef" [77:9 - 77:18] CXXMethod=getName:77:19 (Definition) +// CHECK-tokens: Identifier: "StringRef" [77:9 - 77:18] TypeRef=class llvm::StringRef:38:7 // CHECK-tokens: Identifier: "getName" [77:19 - 77:26] CXXMethod=getName:77:19 (Definition) // CHECK-tokens: Punctuation: "(" [77:26 - 77:27] CXXMethod=getName:77:19 (Definition) // CHECK-tokens: Punctuation: ")" [77:27 - 77:28] CXXMethod=getName:77:19 (Definition) // CHECK-tokens: Keyword: "const" [77:29 - 77:34] CXXMethod=getName:77:19 (Definition) // CHECK-tokens: Punctuation: "{" [77:35 - 77:36] UnexposedStmt= // CHECK-tokens: Keyword: "return" [78:5 - 78:11] UnexposedStmt= -// CHECK-tokens: Identifier: "llvm" [78:12 - 78:16] CallExpr=StringRef:49:3 +// CHECK-tokens: Identifier: "llvm" [78:12 - 78:16] NamespaceRef=llvm:37:11 // CHECK-tokens: Punctuation: "::" [78:16 - 78:18] CallExpr=StringRef:49:3 -// CHECK-tokens: Identifier: "StringRef" [78:18 - 78:27] CallExpr=StringRef:49:3 +// CHECK-tokens: Identifier: "StringRef" [78:18 - 78:27] TypeRef=class llvm::StringRef:38:7 // CHECK-tokens: Punctuation: "(" [78:27 - 78:28] CallExpr=StringRef:49:3 // CHECK-tokens: Identifier: "getNameStart" [78:28 - 78:40] MemberRefExpr=getNameStart:68:15 // CHECK-tokens: Punctuation: "(" [78:40 - 78:41] CallExpr=getNameStart:68:15 @@ -802,13 +802,13 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK-tokens: Punctuation: "{" [82:16 - 82:17] Namespace=llvm:82:11 (Definition) // CHECK-tokens: Keyword: "template" [83:1 - 83:9] ClassTemplate=StringSwitch:83:47 (Definition) // CHECK-tokens: Punctuation: "<" [83:10 - 83:11] ClassTemplate=StringSwitch:83:47 (Definition) -// CHECK-tokens: Keyword: "typename" [83:12 - 83:20] ClassTemplate=StringSwitch:83:47 (Definition) +// CHECK-tokens: Keyword: "typename" [83:12 - 83:20] TemplateTypeParameter=T:83:21 (Definition) // CHECK-tokens: Identifier: "T" [83:21 - 83:22] TemplateTypeParameter=T:83:21 (Definition) // CHECK-tokens: Punctuation: "," [83:22 - 83:23] ClassTemplate=StringSwitch:83:47 (Definition) -// CHECK-tokens: Keyword: "typename" [83:24 - 83:32] ClassTemplate=StringSwitch:83:47 (Definition) +// CHECK-tokens: Keyword: "typename" [83:24 - 83:32] TemplateTypeParameter=R:83:33 (Definition) // CHECK-tokens: Identifier: "R" [83:33 - 83:34] TemplateTypeParameter=R:83:33 (Definition) -// CHECK-tokens: Punctuation: "=" [83:35 - 83:36] ClassTemplate=StringSwitch:83:47 (Definition) -// CHECK-tokens: Identifier: "T" [83:37 - 83:38] ClassTemplate=StringSwitch:83:47 (Definition) +// CHECK-tokens: Punctuation: "=" [83:35 - 83:36] TemplateTypeParameter=R:83:33 (Definition) +// CHECK-tokens: Identifier: "T" [83:37 - 83:38] TypeRef=T:83:21 // CHECK-tokens: Punctuation: ">" [83:39 - 83:40] ClassTemplate=StringSwitch:83:47 (Definition) // CHECK-tokens: Keyword: "class" [83:41 - 83:46] ClassTemplate=StringSwitch:83:47 (Definition) // CHECK-tokens: Identifier: "StringSwitch" [83:47 - 83:59] ClassTemplate=StringSwitch:83:47 (Definition) @@ -817,13 +817,13 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK-tokens: Identifier: "Str" [84:13 - 84:16] FieldDecl=Str:84:13 (Definition) // CHECK-tokens: Punctuation: ";" [84:16 - 84:17] ClassTemplate=StringSwitch:83:47 (Definition) // CHECK-tokens: Keyword: "const" [85:3 - 85:8] ClassTemplate=StringSwitch:83:47 (Definition) -// CHECK-tokens: Identifier: "T" [85:9 - 85:10] FieldDecl=Result:85:12 (Definition) +// CHECK-tokens: Identifier: "T" [85:9 - 85:10] TypeRef=T:83:21 // CHECK-tokens: Punctuation: "*" [85:11 - 85:12] FieldDecl=Result:85:12 (Definition) // CHECK-tokens: Identifier: "Result" [85:12 - 85:18] FieldDecl=Result:85:12 (Definition) // CHECK-tokens: Punctuation: ";" [85:18 - 85:19] ClassTemplate=StringSwitch:83:47 (Definition) // CHECK-tokens: Keyword: "public" [86:1 - 86:7] UnexposedDecl=:86:1 (Definition) // CHECK-tokens: Punctuation: ":" [86:7 - 86:8] UnexposedDecl=:86:1 (Definition) -// CHECK-tokens: Keyword: "explicit" [87:3 - 87:11] ClassTemplate=StringSwitch:83:47 (Definition) +// CHECK-tokens: Keyword: "explicit" [87:3 - 87:11] CXXConstructor=StringSwitch<T, R>:87:12 (Definition) // CHECK-tokens: Identifier: "StringSwitch" [87:12 - 87:24] CXXConstructor=StringSwitch<T, R>:87:12 (Definition) // CHECK-tokens: Punctuation: "(" [87:24 - 87:25] CXXConstructor=StringSwitch<T, R>:87:12 (Definition) // CHECK-tokens: Identifier: "StringRef" [87:25 - 87:34] TypeRef=class llvm::StringRef:38:7 @@ -858,10 +858,10 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK-tokens: Punctuation: ")" [88:61 - 88:62] ParmDecl=S:88:60 (Definition) // CHECK-tokens: Punctuation: "[" [88:62 - 88:63] ParmDecl=S:88:60 (Definition) // CHECK-tokens: Identifier: "N" [88:63 - 88:64] DeclRefExpr=N:88:23 -// CHECK-tokens: Punctuation: "]" [88:64 - 88:65] FunctionTemplate=Case:88:42 (Definition) +// CHECK-tokens: Punctuation: "]" [88:64 - 88:65] ParmDecl=S:88:60 (Definition) // CHECK-tokens: Punctuation: "," [88:65 - 88:66] FunctionTemplate=Case:88:42 (Definition) // CHECK-tokens: Keyword: "const" [89:47 - 89:52] FunctionTemplate=Case:88:42 (Definition) -// CHECK-tokens: Identifier: "T" [89:53 - 89:54] ParmDecl=Value:89:57 (Definition) +// CHECK-tokens: Identifier: "T" [89:53 - 89:54] TypeRef=T:83:21 // CHECK-tokens: Punctuation: "&" [89:55 - 89:56] ParmDecl=Value:89:57 (Definition) // CHECK-tokens: Identifier: "Value" [89:57 - 89:62] ParmDecl=Value:89:57 (Definition) // CHECK-tokens: Punctuation: ")" [89:62 - 89:63] FunctionTemplate=Case:88:42 (Definition) @@ -871,11 +871,11 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK-tokens: Keyword: "this" [90:13 - 90:17] UnexposedExpr= // CHECK-tokens: Punctuation: ";" [90:17 - 90:18] UnexposedStmt= // CHECK-tokens: Punctuation: "}" [91:3 - 91:4] UnexposedStmt= -// CHECK-tokens: Identifier: "R" [92:3 - 92:4] CXXMethod=Default:92:5 (Definition) +// CHECK-tokens: Identifier: "R" [92:3 - 92:4] TypeRef=R:83:33 // CHECK-tokens: Identifier: "Default" [92:5 - 92:12] CXXMethod=Default:92:5 (Definition) // CHECK-tokens: Punctuation: "(" [92:12 - 92:13] CXXMethod=Default:92:5 (Definition) // CHECK-tokens: Keyword: "const" [92:13 - 92:18] CXXMethod=Default:92:5 (Definition) -// CHECK-tokens: Identifier: "T" [92:19 - 92:20] ParmDecl=Value:92:23 (Definition) +// CHECK-tokens: Identifier: "T" [92:19 - 92:20] TypeRef=T:83:21 // CHECK-tokens: Punctuation: "&" [92:21 - 92:22] ParmDecl=Value:92:23 (Definition) // CHECK-tokens: Identifier: "Value" [92:23 - 92:28] ParmDecl=Value:92:23 (Definition) // CHECK-tokens: Punctuation: ")" [92:28 - 92:29] CXXMethod=Default:92:5 (Definition) @@ -892,9 +892,9 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK-tokens: Keyword: "namespace" [98:7 - 98:16] UsingDirective=:98:17 // CHECK-tokens: Identifier: "clang" [98:17 - 98:22] NamespaceRef=clang:10:17 // CHECK-tokens: Punctuation: ";" [98:22 - 98:23] -// CHECK-tokens: Identifier: "AttributeList" [100:1 - 100:14] CXXMethod=getKind:100:36 (Definition) +// CHECK-tokens: Identifier: "AttributeList" [100:1 - 100:14] TypeRef=class clang::AttributeList:12:9 // CHECK-tokens: Punctuation: "::" [100:14 - 100:16] CXXMethod=getKind:100:36 (Definition) -// CHECK-tokens: Identifier: "Kind" [100:16 - 100:20] CXXMethod=getKind:100:36 (Definition) +// CHECK-tokens: Identifier: "Kind" [100:16 - 100:20] TypeRef=enum clang::AttributeList::Kind:13:10 // CHECK-tokens: Identifier: "AttributeList" [100:21 - 100:34] TypeRef=class clang::AttributeList:12:9 // CHECK-tokens: Punctuation: "::" [100:34 - 100:36] CXXMethod=getKind:100:36 (Definition) // CHECK-tokens: Identifier: "getKind" [100:36 - 100:43] CXXMethod=getKind:100:36 (Definition) @@ -905,9 +905,9 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK-tokens: Identifier: "Name" [100:67 - 100:71] ParmDecl=Name:100:67 (Definition) // CHECK-tokens: Punctuation: ")" [100:71 - 100:72] CXXMethod=getKind:100:36 (Definition) // CHECK-tokens: Punctuation: "{" [100:73 - 100:74] UnexposedStmt= -// CHECK-tokens: Identifier: "llvm" [101:3 - 101:7] VarDecl=AttrName:101:19 (Definition) +// CHECK-tokens: Identifier: "llvm" [101:3 - 101:7] NamespaceRef=llvm:82:11 // CHECK-tokens: Punctuation: "::" [101:7 - 101:9] VarDecl=AttrName:101:19 (Definition) -// CHECK-tokens: Identifier: "StringRef" [101:9 - 101:18] VarDecl=AttrName:101:19 (Definition) +// CHECK-tokens: Identifier: "StringRef" [101:9 - 101:18] TypeRef=class llvm::StringRef:38:7 // CHECK-tokens: Identifier: "AttrName" [101:19 - 101:27] VarDecl=AttrName:101:19 (Definition) // CHECK-tokens: Punctuation: "=" [101:28 - 101:29] VarDecl=AttrName:101:19 (Definition) // CHECK-tokens: Identifier: "Name" [101:30 - 101:34] DeclRefExpr=Name:100:67 @@ -950,13 +950,14 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK-tokens: Punctuation: ")" [103:54 - 103:55] CallExpr=substr:60:13 // CHECK-tokens: Punctuation: ";" [103:55 - 103:56] UnexposedStmt= // CHECK-tokens: Keyword: "return" [105:3 - 105:9] UnexposedStmt= -// CHECK-tokens: Identifier: "llvm" [105:10 - 105:14] UnexposedStmt= -// CHECK-tokens: Punctuation: "::" [105:14 - 105:16] UnexposedStmt= +// FIXME: Missing "llvm" namespace reference below +// CHECK-tokens: Identifier: "llvm" [105:10 - 105:14] NamespaceRef=llvm:82:11 +// CHECK-tokens: Punctuation: "::" [105:14 - 105:16] UnexposedExpr=StringSwitch:87:12 // CHECK-tokens: Identifier: "StringSwitch" [105:16 - 105:28] TemplateRef=StringSwitch:83:47 -// CHECK-tokens: Punctuation: "<" [105:29 - 105:30] CallExpr=StringSwitch:87:12 -// CHECK-tokens: Identifier: "AttributeList" [105:31 - 105:44] CallExpr=StringSwitch:87:12 -// CHECK-tokens: Punctuation: "::" [105:44 - 105:46] CallExpr=StringSwitch:87:12 -// CHECK-tokens: Identifier: "Kind" [105:46 - 105:50] CallExpr=StringSwitch:87:12 +// CHECK-tokens: Punctuation: "<" [105:29 - 105:30] UnexposedExpr=StringSwitch:87:12 +// CHECK-tokens: Identifier: "AttributeList" [105:31 - 105:44] TypeRef=class clang::AttributeList:12:9 +// CHECK-tokens: Punctuation: "::" [105:44 - 105:46] UnexposedExpr=StringSwitch:87:12 +// CHECK-tokens: Identifier: "Kind" [105:46 - 105:50] TypeRef=enum clang::AttributeList::Kind:13:10 // CHECK-tokens: Punctuation: ">" [105:51 - 105:52] CallExpr=StringSwitch:87:12 // CHECK-tokens: Punctuation: "(" [105:53 - 105:54] CallExpr=StringSwitch:87:12 // CHECK-tokens: Identifier: "AttrName" [105:54 - 105:62] DeclRefExpr=AttrName:101:19 @@ -1523,24 +1524,24 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK-tokens: Punctuation: "}" [186:1 - 186:2] UnexposedStmt= // RUN: c-index-test -test-load-source all %s 2>&1 | FileCheck %s -// CHECK: 1:27: TypedefDecl=__darwin_size_t:1:27 (Definition) Extent=[1:27 - 1:42] -// CHECK: 2:25: TypedefDecl=size_t:2:25 (Definition) Extent=[2:25 - 2:31] +// CHECK: 1:27: TypedefDecl=__darwin_size_t:1:27 (Definition) Extent=[1:1 - 1:42] +// CHECK: 2:25: TypedefDecl=size_t:2:25 (Definition) Extent=[2:1 - 2:31] // CHECK: 2:9: TypeRef=__darwin_size_t:1:27 Extent=[2:9 - 2:24] -// CHECK: 3:11: Namespace=std:3:11 (Definition) Extent=[3:11 - 5:2] +// CHECK: 3:11: Namespace=std:3:11 (Definition) Extent=[3:1 - 5:2] // CHECK: 4:44: ClassTemplate=pair:4:44 (Definition) Extent=[4:3 - 4:64] -// CHECK: 4:20: TemplateTypeParameter=_T1:4:20 (Definition) Extent=[4:20 - 4:23] -// CHECK: 4:31: TemplateTypeParameter=_T2:4:31 (Definition) Extent=[4:31 - 4:34] -// CHECK: 4:55: FieldDecl=second:4:55 (Definition) Extent=[4:55 - 4:61] -// CHECK: 6:8: UnexposedDecl=:6:8 (Definition) Extent=[6:8 - 6:11] -// CHECK: 7:7: FunctionDecl=memcmp:7:7 Extent=[7:7 - 7:49] -// CHECK: 7:26: ParmDecl=:7:26 (Definition) Extent=[7:20 - 7:27] -// CHECK: 7:40: ParmDecl=:7:40 (Definition) Extent=[7:34 - 7:41] +// CHECK: 4:20: TemplateTypeParameter=_T1:4:20 (Definition) Extent=[4:14 - 4:23] +// CHECK: 4:31: TemplateTypeParameter=_T2:4:31 (Definition) Extent=[4:25 - 4:34] +// CHECK: 4:55: FieldDecl=second:4:55 (Definition) Extent=[4:51 - 4:61] +// CHECK: 6:8: UnexposedDecl=:6:8 (Definition) Extent=[6:1 - 9:2] +// CHECK: 7:7: FunctionDecl=memcmp:7:7 Extent=[7:3 - 7:49] +// CHECK: 7:26: ParmDecl=:7:26 (Definition) Extent=[7:14 - 7:27] +// CHECK: 7:40: ParmDecl=:7:40 (Definition) Extent=[7:28 - 7:41] // CHECK: 7:48: ParmDecl=:7:48 (Definition) Extent=[7:42 - 7:49] // CHECK: 7:42: TypeRef=size_t:2:25 Extent=[7:42 - 7:48] -// CHECK: 8:10: FunctionDecl=strlen:8:10 Extent=[8:10 - 8:30] +// CHECK: 8:10: FunctionDecl=strlen:8:10 Extent=[8:3 - 8:30] // CHECK: 8:3: TypeRef=size_t:2:25 Extent=[8:3 - 8:9] -// CHECK: 8:29: ParmDecl=:8:29 (Definition) Extent=[8:23 - 8:30] -// CHECK: 10:17: Namespace=clang:10:17 (Definition) Extent=[10:17 - 35:2] +// CHECK: 8:29: ParmDecl=:8:29 (Definition) Extent=[8:17 - 8:30] +// CHECK: 10:17: Namespace=clang:10:17 (Definition) Extent=[10:1 - 35:2] // CHECK: 11:9: ClassDecl=IdentifierInfo:11:9 Extent=[11:3 - 11:23] // CHECK: 12:9: ClassDecl=AttributeList:12:9 (Definition) Extent=[12:3 - 34:4] // CHECK: 13:10: EnumDecl=Kind:13:10 (Definition) Extent=[13:5 - 32:6] @@ -1615,18 +1616,18 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK: 30:40: EnumConstantDecl=AT_init_priority:30:40 (Definition) Extent=[30:40 - 30:56] // CHECK: 31:7: EnumConstantDecl=IgnoredAttribute:31:7 (Definition) Extent=[31:7 - 31:23] // CHECK: 31:25: EnumConstantDecl=UnknownAttribute:31:25 (Definition) Extent=[31:25 - 31:41] -// CHECK: 33:17: CXXMethod=getKind:33:17 Extent=[33:17 - 33:53] +// CHECK: 33:17: CXXMethod=getKind:33:17 Extent=[33:5 - 33:53] // CHECK: 33:12: TypeRef=enum clang::AttributeList::Kind:13:10 Extent=[33:12 - 33:16] -// CHECK: 33:48: ParmDecl=Name:33:48 (Definition) Extent=[33:31 - 33:52] +// CHECK: 33:48: ParmDecl=Name:33:48 (Definition) Extent=[33:25 - 33:52] // CHECK: 33:31: TypeRef=class clang::IdentifierInfo:66:7 Extent=[33:31 - 33:45] -// CHECK: 36:8: FunctionDecl=magic_length:36:8 Extent=[36:8 - 36:35] +// CHECK: 36:8: FunctionDecl=magic_length:36:8 Extent=[36:1 - 36:35] // CHECK: 36:1: TypeRef=size_t:2:25 Extent=[36:1 - 36:7] -// CHECK: 36:33: ParmDecl=s:36:33 (Definition) Extent=[36:27 - 36:34] -// CHECK: 37:11: Namespace=llvm:37:11 (Definition) Extent=[37:11 - 64:2] +// CHECK: 36:33: ParmDecl=s:36:33 (Definition) Extent=[36:21 - 36:34] +// CHECK: 37:11: Namespace=llvm:37:11 (Definition) Extent=[37:1 - 64:2] // CHECK: 38:7: ClassDecl=StringRef:38:7 (Definition) Extent=[38:1 - 63:2] // CHECK: 39:1: UnexposedDecl=:39:1 (Definition) Extent=[39:1 - 39:8] -// CHECK: 40:23: TypedefDecl=iterator:40:23 (Definition) Extent=[40:23 - 40:31] -// CHECK: 41:23: VarDecl=npos:41:23 Extent=[41:16 - 41:40] +// CHECK: 40:23: TypedefDecl=iterator:40:23 (Definition) Extent=[40:3 - 40:31] +// CHECK: 41:23: VarDecl=npos:41:23 Extent=[41:3 - 41:40] // CHECK: 41:16: TypeRef=size_t:2:25 Extent=[41:16 - 41:22] // CHECK: 41:30: UnexposedExpr= Extent=[41:30 - 41:40] // CHECK: 41:31: UnexposedExpr= Extent=[41:31 - 41:40] @@ -1634,10 +1635,10 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK: 41:38: UnexposedExpr= Extent=[41:38 - 41:39] // CHECK: 41:38: UnexposedExpr= Extent=[41:38 - 41:39] // CHECK: 42:1: UnexposedDecl=:42:1 (Definition) Extent=[42:1 - 42:9] -// CHECK: 43:15: FieldDecl=Data:43:15 (Definition) Extent=[43:15 - 43:19] -// CHECK: 44:10: FieldDecl=Length:44:10 (Definition) Extent=[44:10 - 44:16] +// CHECK: 43:15: FieldDecl=Data:43:15 (Definition) Extent=[43:3 - 43:19] +// CHECK: 44:10: FieldDecl=Length:44:10 (Definition) Extent=[44:3 - 44:16] // CHECK: 44:3: TypeRef=size_t:2:25 Extent=[44:3 - 44:9] -// CHECK: 45:17: CXXMethod=min:45:17 (Definition) Extent=[45:17 - 45:66] +// CHECK: 45:17: CXXMethod=min:45:17 (Definition) Extent=[45:3 - 45:66] // CHECK: 45:10: TypeRef=size_t:2:25 Extent=[45:10 - 45:16] // CHECK: 45:28: ParmDecl=a:45:28 (Definition) Extent=[45:21 - 45:29] // CHECK: 45:21: TypeRef=size_t:2:25 Extent=[45:21 - 45:27] @@ -1661,7 +1662,7 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK: 47:32: UnexposedExpr= Extent=[47:32 - 47:33] // CHECK: 47:35: UnexposedStmt= Extent=[47:35 - 47:37] // CHECK: 48:3: CXXConstructor=StringRef:48:3 (Definition) Extent=[48:3 - 48:71] -// CHECK: 48:25: ParmDecl=Str:48:25 (Definition) Extent=[48:19 - 48:28] +// CHECK: 48:25: ParmDecl=Str:48:25 (Definition) Extent=[48:13 - 48:28] // CHECK: 48:32: MemberRef=Data:43:15 Extent=[48:32 - 48:36] // CHECK: 48:37: DeclRefExpr=Str:48:25 Extent=[48:37 - 48:40] // CHECK: 48:43: MemberRef=Length:44:10 Extent=[48:43 - 48:49] @@ -1671,7 +1672,7 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK: 48:63: DeclRefExpr=Str:48:25 Extent=[48:63 - 48:66] // CHECK: 48:69: UnexposedStmt= Extent=[48:69 - 48:71] // CHECK: 49:3: CXXConstructor=StringRef:49:3 (Definition) Extent=[49:3 - 49:77] -// CHECK: 49:25: ParmDecl=data:49:25 (Definition) Extent=[49:19 - 49:29] +// CHECK: 49:25: ParmDecl=data:49:25 (Definition) Extent=[49:13 - 49:29] // CHECK: 49:38: ParmDecl=length:49:38 (Definition) Extent=[49:31 - 49:44] // CHECK: 49:31: TypeRef=size_t:2:25 Extent=[49:31 - 49:37] // CHECK: 49:48: MemberRef=Data:43:15 Extent=[49:48 - 49:52] @@ -1679,17 +1680,17 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK: 49:60: MemberRef=Length:44:10 Extent=[49:60 - 49:66] // CHECK: 49:67: DeclRefExpr=length:49:38 Extent=[49:67 - 49:73] // CHECK: 49:75: UnexposedStmt= Extent=[49:75 - 49:77] -// CHECK: 50:12: CXXMethod=end:50:12 (Definition) Extent=[50:12 - 50:40] +// CHECK: 50:12: CXXMethod=end:50:12 (Definition) Extent=[50:3 - 50:40] // CHECK: 50:3: TypeRef=iterator:40:23 Extent=[50:3 - 50:11] // CHECK: 50:24: UnexposedStmt= Extent=[50:24 - 50:40] // CHECK: 50:26: UnexposedStmt= Extent=[50:26 - 50:37] // CHECK: 50:33: MemberRefExpr=Data:43:15 Extent=[50:33 - 50:37] -// CHECK: 51:10: CXXMethod=size:51:10 (Definition) Extent=[51:10 - 51:41] +// CHECK: 51:10: CXXMethod=size:51:10 (Definition) Extent=[51:3 - 51:41] // CHECK: 51:3: TypeRef=size_t:2:25 Extent=[51:3 - 51:9] // CHECK: 51:23: UnexposedStmt= Extent=[51:23 - 51:41] // CHECK: 51:25: UnexposedStmt= Extent=[51:25 - 51:38] // CHECK: 51:32: MemberRefExpr=Length:44:10 Extent=[51:32 - 51:38] -// CHECK: 52:8: CXXMethod=startswith:52:8 (Definition) Extent=[52:8 - 55:4] +// CHECK: 52:8: CXXMethod=startswith:52:8 (Definition) Extent=[52:3 - 55:4] // CHECK: 52:29: ParmDecl=Prefix:52:29 (Definition) Extent=[52:19 - 52:35] // CHECK: 52:19: TypeRef=class llvm::StringRef:38:7 Extent=[52:19 - 52:28] // CHECK: 52:43: UnexposedStmt= Extent=[52:43 - 55:4] @@ -1712,7 +1713,7 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK: 54:44: MemberRefExpr=Length:44:10 Extent=[54:37 - 54:50] // CHECK: 54:37: DeclRefExpr=Prefix:52:29 Extent=[54:37 - 54:43] // CHECK: 54:55: UnexposedExpr= Extent=[54:55 - 54:56] -// CHECK: 56:8: CXXMethod=endswith:56:8 (Definition) Extent=[56:8 - 59:4] +// CHECK: 56:8: CXXMethod=endswith:56:8 (Definition) Extent=[56:3 - 59:4] // CHECK: 56:27: ParmDecl=Suffix:56:27 (Definition) Extent=[56:17 - 56:33] // CHECK: 56:17: TypeRef=class llvm::StringRef:38:7 Extent=[56:17 - 56:26] // CHECK: 56:41: UnexposedStmt= Extent=[56:41 - 59:4] @@ -1739,7 +1740,7 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK: 58:57: MemberRefExpr=Length:44:10 Extent=[58:50 - 58:63] // CHECK: 58:50: DeclRefExpr=Suffix:56:27 Extent=[58:50 - 58:56] // CHECK: 58:68: UnexposedExpr= Extent=[58:68 - 58:69] -// CHECK: 60:13: CXXMethod=substr:60:13 (Definition) Extent=[60:13 - 62:4] +// CHECK: 60:13: CXXMethod=substr:60:13 (Definition) Extent=[60:3 - 62:4] // CHECK: 60:3: TypeRef=class llvm::StringRef:38:7 Extent=[60:3 - 60:12] // CHECK: 60:27: ParmDecl=Start:60:27 (Definition) Extent=[60:20 - 60:32] // CHECK: 60:20: TypeRef=size_t:2:25 Extent=[60:20 - 60:26] @@ -1764,14 +1765,14 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK: 61:43: UnexposedExpr=Length:44:10 Extent=[61:43 - 61:49] // CHECK: 61:43: MemberRefExpr=Length:44:10 Extent=[61:43 - 61:49] // CHECK: 61:52: DeclRefExpr=Start:60:27 Extent=[61:52 - 61:57] -// CHECK: 65:11: Namespace=clang:65:11 (Definition) Extent=[65:11 - 81:2] +// CHECK: 65:11: Namespace=clang:65:11 (Definition) Extent=[65:1 - 81:2] // CHECK: 66:7: ClassDecl=IdentifierInfo:66:7 (Definition) Extent=[66:1 - 80:2] // CHECK: 67:1: UnexposedDecl=:67:1 (Definition) Extent=[67:1 - 67:8] // CHECK: 67:8: CXXConstructor=IdentifierInfo:67:8 Extent=[67:8 - 67:24] -// CHECK: 68:15: CXXMethod=getNameStart:68:15 (Definition) Extent=[68:15 - 71:4] +// CHECK: 68:15: CXXMethod=getNameStart:68:15 (Definition) Extent=[68:3 - 71:4] // CHECK: 68:36: UnexposedStmt= Extent=[68:36 - 71:4] // CHECK: 69:5: UnexposedStmt= Extent=[69:5 - 69:65] -// CHECK: 69:54: TypedefDecl=actualtype:69:54 (Definition) Extent=[69:54 - 69:64] +// CHECK: 69:54: TypedefDecl=actualtype:69:54 (Definition) Extent=[69:5 - 69:64] // CHECK: 69:18: TemplateRef=pair:4:44 Extent=[69:18 - 69:22] // CHECK: 69:25: TypeRef=class clang::IdentifierInfo:66:7 Extent=[69:25 - 69:39] // CHECK: 70:5: UnexposedStmt= Extent=[70:5 - 70:47] @@ -1780,14 +1781,14 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK: 70:13: UnexposedExpr= Extent=[70:13 - 70:38] // CHECK: 70:20: TypeRef=actualtype:69:54 Extent=[70:20 - 70:30] // CHECK: 70:34: UnexposedExpr= Extent=[70:34 - 70:38] -// CHECK: 72:12: CXXMethod=getLength:72:12 (Definition) Extent=[72:12 - 76:4] +// CHECK: 72:12: CXXMethod=getLength:72:12 (Definition) Extent=[72:3 - 76:4] // CHECK: 72:30: UnexposedStmt= Extent=[72:30 - 76:4] // CHECK: 73:5: UnexposedStmt= Extent=[73:5 - 73:65] -// CHECK: 73:54: TypedefDecl=actualtype:73:54 (Definition) Extent=[73:54 - 73:64] +// CHECK: 73:54: TypedefDecl=actualtype:73:54 (Definition) Extent=[73:5 - 73:64] // CHECK: 73:18: TemplateRef=pair:4:44 Extent=[73:18 - 73:22] // CHECK: 73:25: TypeRef=class clang::IdentifierInfo:66:7 Extent=[73:25 - 73:39] // CHECK: 74:5: UnexposedStmt= Extent=[74:5 - 74:61] -// CHECK: 74:17: VarDecl=p:74:17 (Definition) Extent=[74:11 - 74:60] +// CHECK: 74:17: VarDecl=p:74:17 (Definition) Extent=[74:5 - 74:60] // CHECK: 74:21: UnexposedExpr= Extent=[74:21 - 74:60] // CHECK: 74:21: UnexposedExpr=second:4:55 Extent=[74:21 - 74:56] // CHECK: 74:50: MemberRefExpr=second:4:55 Extent=[74:21 - 74:56] @@ -1819,7 +1820,7 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK: 75:55: UnexposedExpr= Extent=[75:55 - 75:56] // CHECK: 75:61: UnexposedExpr= Extent=[75:61 - 75:62] // CHECK: 75:61: UnexposedExpr= Extent=[75:61 - 75:62] -// CHECK: 77:19: CXXMethod=getName:77:19 (Definition) Extent=[77:19 - 79:4] +// CHECK: 77:19: CXXMethod=getName:77:19 (Definition) Extent=[77:3 - 79:4] // CHECK: 77:35: UnexposedStmt= Extent=[77:35 - 79:4] // CHECK: 78:5: UnexposedStmt= Extent=[78:5 - 78:56] // CHECK: 78:12: CallExpr= Extent=[78:12 - 78:56] @@ -1830,15 +1831,15 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK: 78:44: UnexposedExpr=getLength:72:12 Extent=[78:44 - 78:55] // CHECK: 78:44: CallExpr=getLength:72:12 Extent=[78:44 - 78:55] // CHECK: 78:44: MemberRefExpr=getLength:72:12 Extent=[78:44 - 78:53] -// CHECK: 82:11: Namespace=llvm:82:11 (Definition) Extent=[82:11 - 96:2] +// CHECK: 82:11: Namespace=llvm:82:11 (Definition) Extent=[82:1 - 96:2] // CHECK: 83:47: ClassTemplate=StringSwitch:83:47 (Definition) Extent=[83:1 - 95:2] -// CHECK: 83:21: TemplateTypeParameter=T:83:21 (Definition) Extent=[83:21 - 83:22] -// CHECK: 83:33: TemplateTypeParameter=R:83:33 (Definition) Extent=[83:33 - 83:34] -// CHECK: 84:13: FieldDecl=Str:84:13 (Definition) Extent=[84:13 - 84:16] +// CHECK: 83:21: TemplateTypeParameter=T:83:21 (Definition) Extent=[83:12 - 83:22] +// CHECK: 83:33: TemplateTypeParameter=R:83:33 (Definition) Extent=[83:24 - 83:38] +// CHECK: 84:13: FieldDecl=Str:84:13 (Definition) Extent=[84:3 - 84:16] // CHECK: 84:3: TypeRef=class llvm::StringRef:38:7 Extent=[84:3 - 84:12] -// CHECK: 85:12: FieldDecl=Result:85:12 (Definition) Extent=[85:12 - 85:18] +// CHECK: 85:12: FieldDecl=Result:85:12 (Definition) Extent=[85:3 - 85:18] // CHECK: 86:1: UnexposedDecl=:86:1 (Definition) Extent=[86:1 - 86:8] -// CHECK: 87:12: CXXConstructor=StringSwitch<T, R>:87:12 (Definition) Extent=[87:12 - 87:64] +// CHECK: 87:12: CXXConstructor=StringSwitch<T, R>:87:12 (Definition) Extent=[87:3 - 87:64] // CHECK: 87:35: ParmDecl=Str:87:35 (Definition) Extent=[87:25 - 87:38] // CHECK: 87:25: TypeRef=class llvm::StringRef:38:7 Extent=[87:25 - 87:34] // CHECK: 87:42: MemberRef=Str:84:13 Extent=[87:42 - 87:45] @@ -1850,23 +1851,23 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK: 87:62: UnexposedStmt= Extent=[87:62 - 87:64] // CHECK: 88:42: FunctionTemplate=Case:88:42 (Definition) Extent=[88:3 - 91:4] // CHECK: 88:23: NonTypeTemplateParameter=N:88:23 (Definition) Extent=[88:14 - 88:24] -// CHECK: 88:60: ParmDecl=S:88:60 (Definition) Extent=[88:53 - 88:61] +// CHECK: 88:60: ParmDecl=S:88:60 (Definition) Extent=[88:47 - 88:65] // CHECK: 88:63: DeclRefExpr=N:88:23 Extent=[88:63 - 88:64] -// CHECK: 89:57: ParmDecl=Value:89:57 (Definition) Extent=[89:53 - 89:62] +// CHECK: 89:57: ParmDecl=Value:89:57 (Definition) Extent=[89:47 - 89:62] // CHECK: 89:64: UnexposedStmt= Extent=[89:64 - 91:4] // CHECK: 90:5: UnexposedStmt= Extent=[90:5 - 90:17] // CHECK: 90:12: UnexposedExpr= Extent=[90:12 - 90:17] // CHECK: 90:13: UnexposedExpr= Extent=[90:13 - 90:17] -// CHECK: 92:5: CXXMethod=Default:92:5 (Definition) Extent=[92:5 - 94:4] -// CHECK: 92:23: ParmDecl=Value:92:23 (Definition) Extent=[92:19 - 92:28] +// CHECK: 92:5: CXXMethod=Default:92:5 (Definition) Extent=[92:3 - 94:4] +// CHECK: 92:23: ParmDecl=Value:92:23 (Definition) Extent=[92:13 - 92:28] // CHECK: 92:36: UnexposedStmt= Extent=[92:36 - 94:4] // CHECK: 93:5: UnexposedStmt= Extent=[93:5 - 93:17] // CHECK: 93:12: DeclRefExpr=Value:92:23 Extent=[93:12 - 93:17] // CHECK: 98:17: UsingDirective=:98:17 Extent=[98:1 - 98:22] // CHECK: 98:17: NamespaceRef=clang:10:17 Extent=[98:17 - 98:22] -// CHECK: 100:36: CXXMethod=getKind:100:36 (Definition) Extent=[100:36 - 186:2] +// CHECK: 100:36: CXXMethod=getKind:100:36 (Definition) Extent=[100:1 - 186:2] // CHECK: 100:21: TypeRef=class clang::AttributeList:12:9 Extent=[100:21 - 100:34] -// CHECK: 100:67: ParmDecl=Name:100:67 (Definition) Extent=[100:50 - 100:71] +// CHECK: 100:67: ParmDecl=Name:100:67 (Definition) Extent=[100:44 - 100:71] // CHECK: 100:50: TypeRef=class clang::IdentifierInfo:66:7 Extent=[100:50 - 100:64] // CHECK: 100:73: UnexposedStmt= Extent=[100:73 - 186:2] // CHECK: 101:3: UnexposedStmt= Extent=[101:3 - 101:46] @@ -1917,170 +1918,170 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { // CHECK: 103:53: UnexposedExpr= Extent=[103:53 - 103:54] // CHECK: 103:53: UnexposedExpr= Extent=[103:53 - 103:54] // CHECK: 105:3: UnexposedStmt= Extent=[105:3 - 185:31] -// CHECK: 105:16: CallExpr=Default:92:5 Extent=[105:16 - 185:31] -// CHECK: 185:6: MemberRefExpr=Default:92:5 Extent=[105:16 - 185:13] -// CHECK: 105:16: UnexposedExpr=Case:88:42 Extent=[105:16 - 184:33] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 184:33] -// CHECK: 184:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 184:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 183:37] -// CHECK: 183:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 183:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 182:37] -// CHECK: 182:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 182:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 181:35] -// CHECK: 181:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 181:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 180:31] -// CHECK: 180:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 180:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 179:31] -// CHECK: 179:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 179:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 178:35] -// CHECK: 178:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 178:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 177:63] -// CHECK: 177:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 177:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 176:45] -// CHECK: 176:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 176:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 175:51] -// CHECK: 175:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 175:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 174:49] -// CHECK: 174:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 174:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 173:49] -// CHECK: 173:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 173:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 172:53] -// CHECK: 172:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 172:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 171:57] -// CHECK: 171:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 171:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 170:65] -// CHECK: 170:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 170:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 169:57] -// CHECK: 169:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 169:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 168:65] -// CHECK: 168:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 168:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 167:55] -// CHECK: 167:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 167:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 166:55] -// CHECK: 166:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 166:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 165:53] -// CHECK: 165:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 165:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 164:53] -// CHECK: 164:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 164:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 163:49] -// CHECK: 163:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 163:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 162:47] -// CHECK: 162:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 162:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 161:45] -// CHECK: 161:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 161:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 160:45] -// CHECK: 160:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 160:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 159:45] -// CHECK: 159:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 159:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 158:45] -// CHECK: 158:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 158:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 157:43] -// CHECK: 157:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 157:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 156:41] -// CHECK: 156:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 156:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 155:41] -// CHECK: 155:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 155:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 154:41] -// CHECK: 154:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 154:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 153:37] -// CHECK: 153:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 153:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 152:41] -// CHECK: 152:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 152:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 151:39] -// CHECK: 151:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 151:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 150:39] -// CHECK: 150:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 150:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 149:39] -// CHECK: 149:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 149:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 148:39] -// CHECK: 148:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 148:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 147:39] -// CHECK: 147:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 147:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 146:39] -// CHECK: 146:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 146:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 145:41] -// CHECK: 145:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 145:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 144:37] -// CHECK: 144:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 144:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 143:37] -// CHECK: 143:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 143:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 142:35] -// CHECK: 142:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 142:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 141:35] -// CHECK: 141:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 141:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 140:35] -// CHECK: 140:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 140:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 139:35] -// CHECK: 139:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 139:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 138:35] -// CHECK: 138:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 138:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 137:55] -// CHECK: 137:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 137:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 136:35] -// CHECK: 136:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 136:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 135:35] -// CHECK: 135:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 135:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 134:35] -// CHECK: 134:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 134:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 133:35] -// CHECK: 133:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 133:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 132:33] -// CHECK: 132:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 132:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 131:33] -// CHECK: 131:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 131:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 130:33] -// CHECK: 130:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 130:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 129:33] -// CHECK: 129:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 129:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 128:33] -// CHECK: 128:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 128:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 127:33] -// CHECK: 127:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 127:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 126:33] -// CHECK: 126:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 126:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 125:29] -// CHECK: 125:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 125:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 124:33] -// CHECK: 124:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 124:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 123:33] -// CHECK: 123:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 123:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 122:31] -// CHECK: 122:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 122:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 121:31] -// CHECK: 121:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 121:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 120:31] -// CHECK: 120:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 120:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 119:31] -// CHECK: 119:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 119:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 118:31] -// CHECK: 118:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 118:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 117:31] -// CHECK: 117:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 117:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 116:31] -// CHECK: 116:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 116:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 115:29] -// CHECK: 115:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 115:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 114:29] -// CHECK: 114:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 114:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 113:29] -// CHECK: 113:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 113:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 112:31] -// CHECK: 112:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 112:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 111:29] -// CHECK: 111:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 111:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 110:27] -// CHECK: 110:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 110:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 109:27] -// CHECK: 109:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 109:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 108:27] -// CHECK: 108:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 108:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 107:33] -// CHECK: 107:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 107:10] -// CHECK: 105:16: CallExpr=Case:88:42 Extent=[105:16 - 106:27] -// CHECK: 106:6: MemberRefExpr=Case:88:42 Extent=[105:16 - 106:10] -// CHECK: 105:16: UnexposedExpr=StringSwitch:87:12 Extent=[105:16 - 105:63] +// CHECK: 105:10: CallExpr=Default:92:5 Extent=[105:10 - 185:31] +// CHECK: 185:6: MemberRefExpr=Default:92:5 Extent=[105:10 - 185:13] +// CHECK: 105:10: UnexposedExpr=Case:88:42 Extent=[105:10 - 184:33] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 184:33] +// CHECK: 184:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 184:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 183:37] +// CHECK: 183:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 183:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 182:37] +// CHECK: 182:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 182:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 181:35] +// CHECK: 181:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 181:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 180:31] +// CHECK: 180:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 180:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 179:31] +// CHECK: 179:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 179:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 178:35] +// CHECK: 178:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 178:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 177:63] +// CHECK: 177:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 177:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 176:45] +// CHECK: 176:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 176:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 175:51] +// CHECK: 175:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 175:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 174:49] +// CHECK: 174:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 174:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 173:49] +// CHECK: 173:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 173:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 172:53] +// CHECK: 172:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 172:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 171:57] +// CHECK: 171:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 171:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 170:65] +// CHECK: 170:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 170:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 169:57] +// CHECK: 169:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 169:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 168:65] +// CHECK: 168:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 168:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 167:55] +// CHECK: 167:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 167:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 166:55] +// CHECK: 166:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 166:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 165:53] +// CHECK: 165:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 165:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 164:53] +// CHECK: 164:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 164:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 163:49] +// CHECK: 163:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 163:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 162:47] +// CHECK: 162:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 162:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 161:45] +// CHECK: 161:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 161:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 160:45] +// CHECK: 160:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 160:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 159:45] +// CHECK: 159:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 159:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 158:45] +// CHECK: 158:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 158:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 157:43] +// CHECK: 157:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 157:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 156:41] +// CHECK: 156:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 156:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 155:41] +// CHECK: 155:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 155:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 154:41] +// CHECK: 154:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 154:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 153:37] +// CHECK: 153:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 153:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 152:41] +// CHECK: 152:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 152:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 151:39] +// CHECK: 151:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 151:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 150:39] +// CHECK: 150:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 150:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 149:39] +// CHECK: 149:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 149:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 148:39] +// CHECK: 148:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 148:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 147:39] +// CHECK: 147:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 147:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 146:39] +// CHECK: 146:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 146:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 145:41] +// CHECK: 145:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 145:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 144:37] +// CHECK: 144:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 144:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 143:37] +// CHECK: 143:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 143:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 142:35] +// CHECK: 142:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 142:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 141:35] +// CHECK: 141:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 141:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 140:35] +// CHECK: 140:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 140:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 139:35] +// CHECK: 139:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 139:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 138:35] +// CHECK: 138:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 138:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 137:55] +// CHECK: 137:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 137:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 136:35] +// CHECK: 136:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 136:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 135:35] +// CHECK: 135:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 135:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 134:35] +// CHECK: 134:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 134:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 133:35] +// CHECK: 133:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 133:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 132:33] +// CHECK: 132:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 132:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 131:33] +// CHECK: 131:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 131:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 130:33] +// CHECK: 130:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 130:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 129:33] +// CHECK: 129:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 129:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 128:33] +// CHECK: 128:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 128:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 127:33] +// CHECK: 127:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 127:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 126:33] +// CHECK: 126:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 126:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 125:29] +// CHECK: 125:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 125:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 124:33] +// CHECK: 124:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 124:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 123:33] +// CHECK: 123:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 123:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 122:31] +// CHECK: 122:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 122:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 121:31] +// CHECK: 121:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 121:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 120:31] +// CHECK: 120:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 120:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 119:31] +// CHECK: 119:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 119:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 118:31] +// CHECK: 118:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 118:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 117:31] +// CHECK: 117:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 117:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 116:31] +// CHECK: 116:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 116:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 115:29] +// CHECK: 115:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 115:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 114:29] +// CHECK: 114:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 114:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 113:29] +// CHECK: 113:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 113:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 112:31] +// CHECK: 112:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 112:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 111:29] +// CHECK: 111:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 111:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 110:27] +// CHECK: 110:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 110:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 109:27] +// CHECK: 109:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 109:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 108:27] +// CHECK: 108:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 108:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 107:33] +// CHECK: 107:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 107:10] +// CHECK: 105:10: CallExpr=Case:88:42 Extent=[105:10 - 106:27] +// CHECK: 106:6: MemberRefExpr=Case:88:42 Extent=[105:10 - 106:10] +// CHECK: 105:10: UnexposedExpr=StringSwitch:87:12 Extent=[105:10 - 105:63] // CHECK: 105:16: TemplateRef=StringSwitch:83:47 Extent=[105:16 - 105:28] -// CHECK: 105:16: CallExpr=StringSwitch:87:12 Extent=[105:16 - 105:62] +// CHECK: 105:10: CallExpr=StringSwitch:87:12 Extent=[105:10 - 105:62] // CHECK: 105:54: CallExpr=StringRef:38:7 Extent=[105:54 - 105:62] // CHECK: 105:54: UnexposedExpr=AttrName:101:19 Extent=[105:54 - 105:62] // CHECK: 105:54: DeclRefExpr=AttrName:101:19 Extent=[105:54 - 105:62] diff --git a/test/Index/recursive-member-access.c b/test/Index/recursive-member-access.c index c76fa0e50401..87855ca36159 100644 --- a/test/Index/recursive-member-access.c +++ b/test/Index/recursive-member-access.c @@ -125,11 +125,11 @@ int test_rdar8650865(struct rdar8650865 *s) { // RUN: c-index-test -test-load-source all %s | FileCheck %s // CHECK: 1:8: StructDecl=rdar8650865:1:8 (Definition) Extent=[1:1 - 4:2] -// CHECK: 2:23: FieldDecl=first:2:23 (Definition) Extent=[2:23 - 2:28] +// CHECK: 2:23: FieldDecl=first:2:23 (Definition) Extent=[2:3 - 2:28] // CHECK: 2:10: TypeRef=struct rdar8650865:1:8 Extent=[2:10 - 2:21] -// CHECK: 3:7: FieldDecl=x:3:7 (Definition) Extent=[3:7 - 3:8] -// CHECK: 6:5: FunctionDecl=test_rdar8650865:6:5 (Definition) Extent=[6:5 - 124:2] -// CHECK: 6:42: ParmDecl=s:6:42 (Definition) Extent=[6:29 - 6:43] +// CHECK: 3:7: FieldDecl=x:3:7 (Definition) Extent=[3:3 - 3:8] +// CHECK: 6:5: FunctionDecl=test_rdar8650865:6:5 (Definition) Extent=[6:1 - 124:2] +// CHECK: 6:42: ParmDecl=s:6:42 (Definition) Extent=[6:22 - 6:43] // CHECK: 6:29: TypeRef=struct rdar8650865:1:8 Extent=[6:29 - 6:40] // CHECK: 6:45: UnexposedStmt= Extent=[6:45 - 124:2] // CHECK: 7:3: UnexposedStmt= Extent=[7:3 - 123:8] @@ -257,7 +257,7 @@ int test_rdar8650865(struct rdar8650865 *s) { // CHECK-tokens: Keyword: "struct" [1:1 - 1:7] StructDecl=rdar8650865:1:8 (Definition) // CHECK-tokens: Identifier: "rdar8650865" [1:8 - 1:19] StructDecl=rdar8650865:1:8 (Definition) // CHECK-tokens: Punctuation: "{" [1:20 - 1:21] StructDecl=rdar8650865:1:8 (Definition) -// CHECK-tokens: Keyword: "struct" [2:3 - 2:9] StructDecl=rdar8650865:1:8 (Definition) +// CHECK-tokens: Keyword: "struct" [2:3 - 2:9] FieldDecl=first:2:23 (Definition) // CHECK-tokens: Identifier: "rdar8650865" [2:10 - 2:21] TypeRef=struct rdar8650865:1:8 // CHECK-tokens: Punctuation: "*" [2:22 - 2:23] FieldDecl=first:2:23 (Definition) // CHECK-tokens: Identifier: "first" [2:23 - 2:28] FieldDecl=first:2:23 (Definition) @@ -270,7 +270,7 @@ int test_rdar8650865(struct rdar8650865 *s) { // CHECK-tokens: Keyword: "int" [6:1 - 6:4] FunctionDecl=test_rdar8650865:6:5 (Definition) // CHECK-tokens: Identifier: "test_rdar8650865" [6:5 - 6:21] FunctionDecl=test_rdar8650865:6:5 (Definition) // CHECK-tokens: Punctuation: "(" [6:21 - 6:22] FunctionDecl=test_rdar8650865:6:5 (Definition) -// CHECK-tokens: Keyword: "struct" [6:22 - 6:28] FunctionDecl=test_rdar8650865:6:5 (Definition) +// CHECK-tokens: Keyword: "struct" [6:22 - 6:28] ParmDecl=s:6:42 (Definition) // CHECK-tokens: Identifier: "rdar8650865" [6:29 - 6:40] TypeRef=struct rdar8650865:1:8 // CHECK-tokens: Punctuation: "*" [6:41 - 6:42] ParmDecl=s:6:42 (Definition) // CHECK-tokens: Identifier: "s" [6:42 - 6:43] ParmDecl=s:6:42 (Definition) diff --git a/test/Index/remap-load.c b/test/Index/remap-load.c index d54c3a107682..5a8f46b7f3d8 100644 --- a/test/Index/remap-load.c +++ b/test/Index/remap-load.c @@ -1,6 +1,6 @@ // RUN: c-index-test -test-load-source all -remap-file="%s;%S/Inputs/remap-load-to.c" %s | FileCheck -check-prefix=CHECK %s -// CHECK: remap-load.c:1:5: FunctionDecl=foo:1:5 (Definition) Extent=[1:5 - 3:2] +// CHECK: remap-load.c:1:5: FunctionDecl=foo:1:5 (Definition) Extent=[1:1 - 3:2] // CHECK: remap-load.c:1:13: ParmDecl=parm1:1:13 (Definition) Extent=[1:9 - 1:18] // CHECK: remap-load.c:1:26: ParmDecl=parm2:1:26 (Definition) Extent=[1:20 - 1:31] // CHECK: remap-load.c:2:10: UnexposedExpr= Extent=[2:10 - 2:23] diff --git a/test/Index/usrs-cxx0x.cpp b/test/Index/usrs-cxx0x.cpp index a0ea6ba69cf0..50aee0968867 100644 --- a/test/Index/usrs-cxx0x.cpp +++ b/test/Index/usrs-cxx0x.cpp @@ -5,4 +5,4 @@ void f(tuple<int, float, double>); // RUN: c-index-test -test-load-source-usrs all -std=c++0x %s | FileCheck %s // CHECK: usrs-cxx0x.cpp c:@ST>1#pT@tuple Extent=[1:1 - 2:17] -// CHECK: usrs-cxx0x.cpp c:@F@f#$@S@tuple>#p3Ifd# Extent=[4:6 - 4:34] +// CHECK: usrs-cxx0x.cpp c:@F@f#$@S@tuple>#p3Ifd# Extent=[4:1 - 4:34] diff --git a/test/Index/usrs.cpp b/test/Index/usrs.cpp index 698aded84381..a43b6893ebfb 100644 --- a/test/Index/usrs.cpp +++ b/test/Index/usrs.cpp @@ -66,55 +66,55 @@ using foo::ClsB; namespace foo_alias3 = foo; // RUN: c-index-test -test-load-source-usrs all %s | FileCheck %s -// CHECK: usrs.cpp c:@N@foo Extent=[1:11 - 4:2] +// CHECK: usrs.cpp c:@N@foo Extent=[1:1 - 4:2] // CHECK: usrs.cpp c:@N@foo@x Extent=[2:3 - 2:8] -// CHECK: usrs.cpp c:@N@foo@F@bar#I# Extent=[3:8 - 3:18] +// CHECK: usrs.cpp c:@N@foo@F@bar#I# Extent=[3:3 - 3:18] // CHECK: usrs.cpp c:usrs.cpp@36@N@foo@F@bar#I#@z Extent=[3:12 - 3:17] -// CHECK: usrs.cpp c:@N@bar Extent=[5:11 - 8:2] -// CHECK: usrs.cpp c:usrs.cpp@76@N@bar@T@QType Extent=[6:15 - 6:20] -// CHECK: usrs.cpp c:@N@bar@F@bar#I# Extent=[7:8 - 7:20] +// CHECK: usrs.cpp c:@N@bar Extent=[5:1 - 8:2] +// CHECK: usrs.cpp c:usrs.cpp@64@N@bar@T@QType Extent=[6:3 - 6:20] +// CHECK: usrs.cpp c:@N@bar@F@bar#I# Extent=[7:3 - 7:20] // CHECK: usrs.cpp c:usrs.cpp@94@N@bar@F@bar#I#@z Extent=[7:12 - 7:19] // CHECK: usrs.cpp c:@C@ClsA Extent=[10:1 - 14:2] // CHECK: usrs.cpp c: Extent=[11:1 - 11:8] -// CHECK: usrs.cpp c:@C@ClsA@FI@a Extent=[12:7 - 12:8] -// CHECK: usrs.cpp c:@C@ClsA@FI@b Extent=[12:10 - 12:11] +// CHECK: usrs.cpp c:@C@ClsA@FI@a Extent=[12:3 - 12:8] +// CHECK: usrs.cpp c:@C@ClsA@FI@b Extent=[12:3 - 12:11] // CHECK: usrs.cpp c:@C@ClsA@F@ClsA#I#I# Extent=[13:3 - 13:37] // CHECK: usrs.cpp c:usrs.cpp@147@C@ClsA@F@ClsA#I#I#@A Extent=[13:8 - 13:13] // CHECK: usrs.cpp c:usrs.cpp@154@C@ClsA@F@ClsA#I#I#@B Extent=[13:15 - 13:20] -// CHECK: usrs.cpp c:@N@foo Extent=[16:11 - 22:2] +// CHECK: usrs.cpp c:@N@foo Extent=[16:1 - 22:2] // CHECK: usrs.cpp c:@N@foo@C@ClsB Extent=[17:3 - 21:4] // CHECK: usrs.cpp c: Extent=[18:3 - 18:10] // CHECK: usrs.cpp c:@N@foo@C@ClsB@F@ClsB# Extent=[19:5 - 19:27] -// CHECK: usrs.cpp c:@N@foo@C@ClsB@F@result#1 Extent=[20:9 - 20:17] -// CHECK: usrs.cpp c:@N@foo@C@ClsB@F@result#1 Extent=[24:16 - 26:2] +// CHECK: usrs.cpp c:@N@foo@C@ClsB@F@result#1 Extent=[20:5 - 20:23] +// CHECK: usrs.cpp c:@N@foo@C@ClsB@F@result#1 Extent=[24:1 - 26:2] // CHECK: usrs.cpp c:@aN@C@ClsC Extent=[29:3 - 29:35] // CHECK: usrs.cpp c:@aN@w Extent=[30:3 - 30:8] // CHECK: usrs.cpp c:@z Extent=[33:1 - 33:6] -// CHECK: usrs.cpp c:@N@foo Extent=[35:11 - 40:2] -// CHECK: usrs.cpp c:@N@foo@N@taz Extent=[35:27 - 39:2] +// CHECK: usrs.cpp c:@N@foo Extent=[35:1 - 40:2] +// CHECK: usrs.cpp c:@N@foo@N@taz Extent=[35:17 - 39:2] // CHECK: usrs.cpp c:@N@foo@N@taz@x Extent=[36:3 - 36:8] -// CHECK: usrs.cpp c:usrs.cpp@475@N@foo@N@taz@F@add#I#I# Extent=[37:21 - 37:56] +// CHECK: usrs.cpp c:usrs.cpp@457@N@foo@N@taz@F@add#I#I# Extent=[37:3 - 37:56] // CHECK: usrs.cpp c:usrs.cpp@479@N@foo@N@taz@F@add#I#I#@a Extent=[37:25 - 37:30] // CHECK: usrs.cpp c:usrs.cpp@486@N@foo@N@taz@F@add#I#I#@b Extent=[37:32 - 37:37] -// CHECK: usrs.cpp c:@N@foo@N@taz@F@sub#I#I# Extent=[38:8 - 38:25] +// CHECK: usrs.cpp c:@N@foo@N@taz@F@sub#I#I# Extent=[38:3 - 38:25] // CHECK: usrs.cpp c:usrs.cpp@522@N@foo@N@taz@F@sub#I#I#@a Extent=[38:12 - 38:17] // CHECK: usrs.cpp c:usrs.cpp@529@N@foo@N@taz@F@sub#I#I#@b Extent=[38:19 - 38:24] -// CHECK: usrs.cpp c:@N@foo Extent=[42:11 - 52:3] -// CHECK: usrs.cpp c:@N@foo@N@taz Extent=[42:27 - 52:2] +// CHECK: usrs.cpp c:@N@foo Extent=[42:1 - 52:3] +// CHECK: usrs.cpp c:@N@foo@N@taz Extent=[42:17 - 52:2] // CHECK: usrs.cpp c:@N@foo@N@taz@C@ClsD Extent=[43:3 - 51:4] // CHECK: usrs.cpp c: Extent=[44:3 - 44:10] -// CHECK: usrs.cpp c:@N@foo@N@taz@C@ClsD@F@operator=#I# Extent=[45:11 - 45:52] +// CHECK: usrs.cpp c:@N@foo@N@taz@C@ClsD@F@operator=#I# Extent=[45:5 - 45:52] // CHECK: usrs.cpp c:usrs.cpp@638@N@foo@N@taz@C@ClsD@F@operator=#I#@x Extent=[45:21 - 45:26] -// CHECK: usrs.cpp c:@N@foo@N@taz@C@ClsD@F@operator=#d# Extent=[46:11 - 46:61] +// CHECK: usrs.cpp c:@N@foo@N@taz@C@ClsD@F@operator=#d# Extent=[46:5 - 46:61] // CHECK: usrs.cpp c:usrs.cpp@690@N@foo@N@taz@C@ClsD@F@operator=#d#@x Extent=[46:21 - 46:29] -// CHECK: usrs.cpp c:@N@foo@N@taz@C@ClsD@F@operator=#&1$@N@foo@N@taz@C@ClsD# Extent=[47:11 - 47:62] -// CHECK: usrs.cpp c:usrs.cpp@757@N@foo@N@taz@C@ClsD@F@operator=#&1$@N@foo@N@taz@C@ClsD#@x Extent=[47:27 - 47:34] -// CHECK: usrs.cpp c:@N@foo@N@taz@C@ClsD@F@qux#S Extent=[48:16 - 48:21] -// CHECK: usrs.cpp c:@N@foo@N@taz@C@ClsD@F@uz#I.#S Extent=[49:16 - 49:30] +// CHECK: usrs.cpp c:@N@foo@N@taz@C@ClsD@F@operator=#&1$@N@foo@N@taz@C@ClsD# Extent=[47:5 - 47:62] +// CHECK: usrs.cpp c:usrs.cpp@751@N@foo@N@taz@C@ClsD@F@operator=#&1$@N@foo@N@taz@C@ClsD#@x Extent=[47:21 - 47:34] +// CHECK: usrs.cpp c:@N@foo@N@taz@C@ClsD@F@qux#S Extent=[48:5 - 48:21] +// CHECK: usrs.cpp c:@N@foo@N@taz@C@ClsD@F@uz#I.#S Extent=[49:5 - 49:30] // CHECK: usrs.cpp c:usrs.cpp@833@N@foo@N@taz@C@ClsD@F@uz#I.#S@z Extent=[49:19 - 49:24] -// CHECK: usrs.cpp c:@N@foo@N@taz@C@ClsD@F@operator==#&1$@N@foo@N@taz@C@ClsD#1 Extent=[50:10 - 50:62] -// CHECK: usrs.cpp c:usrs.cpp@872@N@foo@N@taz@C@ClsD@F@operator==#&1$@N@foo@N@taz@C@ClsD#1@x Extent=[50:27 - 50:34] -// CHECK: usrs.cpp c:@F@rez Extent=[55:8 - 55:25] +// CHECK: usrs.cpp c:@N@foo@N@taz@C@ClsD@F@operator==#&1$@N@foo@N@taz@C@ClsD#1 Extent=[50:5 - 50:62] +// CHECK: usrs.cpp c:usrs.cpp@866@N@foo@N@taz@C@ClsD@F@operator==#&1$@N@foo@N@taz@C@ClsD#1@x Extent=[50:21 - 50:34] +// CHECK: usrs.cpp c:@F@rez Extent=[55:3 - 55:25] // CHECK: usrs.cpp c:usrs.cpp@941@F@rez@a Extent=[55:12 - 55:17] // CHECK: usrs.cpp c:usrs.cpp@948@F@rez@b Extent=[55:19 - 55:24] // CHECK: usrs.cpp c:@NA@foo_alias diff --git a/test/Index/usrs.m b/test/Index/usrs.m index edfb81437d87..4b79fdcbba8d 100644 --- a/test/Index/usrs.m +++ b/test/Index/usrs.m @@ -80,7 +80,7 @@ int test_multi_declaration(void) { - (void)method; @end -// CHECK: usrs.m c:usrs.m@85@F@my_helper Extent=[3:19 - 3:60] +// CHECK: usrs.m c:usrs.m@67@F@my_helper Extent=[3:1 - 3:60] // CHECK: usrs.m c:usrs.m@95@F@my_helper@x Extent=[3:29 - 3:34] // CHECK: usrs.m c:usrs.m@102@F@my_helper@y Extent=[3:36 - 3:41] // CHECK: usrs.m c:usrs.m@128@Ea Extent=[5:1 - 8:2] @@ -90,15 +90,15 @@ int test_multi_declaration(void) { // CHECK: usrs.m c:usrs.m@155@Ea@FOO Extent=[11:3 - 11:6] // CHECK: usrs.m c:usrs.m@155@Ea@BAR Extent=[12:3 - 12:6] // CHECK: usrs.m c:@SA@MyStruct Extent=[15:9 - 18:2] -// CHECK: usrs.m c:@SA@MyStruct@FI@wa Extent=[16:7 - 16:9] -// CHECK: usrs.m c:@SA@MyStruct@FI@moo Extent=[17:7 - 17:10] -// CHECK: usrs.m c:usrs.m@219@T@MyStruct Extent=[18:3 - 18:11] +// CHECK: usrs.m c:@SA@MyStruct@FI@wa Extent=[16:3 - 16:9] +// CHECK: usrs.m c:@SA@MyStruct@FI@moo Extent=[17:3 - 17:10] +// CHECK: usrs.m c:usrs.m@179@T@MyStruct Extent=[15:1 - 18:11] // CHECK: usrs.m c:@E@Pizza Extent=[20:1 - 23:2] // CHECK: usrs.m c:@E@Pizza@CHEESE Extent=[21:3 - 21:9] // CHECK: usrs.m c:@E@Pizza@MUSHROOMS Extent=[22:3 - 22:12] // CHECK: usrs.m c:objc(cs)Foo Extent=[25:1 - 32:5] -// CHECK: usrs.m c:objc(cs)Foo@x Extent=[26:6 - 26:7] -// CHECK: usrs.m c:objc(cs)Foo@y Extent=[27:6 - 27:7] +// CHECK: usrs.m c:objc(cs)Foo@x Extent=[26:3 - 26:7] +// CHECK: usrs.m c:objc(cs)Foo@y Extent=[27:3 - 27:7] // CHECK: usrs.m c:objc(cs)Foo(im)godzilla Extent=[29:1 - 29:17] // CHECK: usrs.m c:objc(cs)Foo(cm)kingkong Extent=[30:1 - 30:17] // CHECK: usrs.m c:objc(cs)Foo(py)d1 Extent=[31:1 - 31:17] @@ -107,14 +107,14 @@ int test_multi_declaration(void) { // CHECK: usrs.m c:usrs.m@352objc(cs)Foo(im)setD1:@d1 Extent=[31:15 - 31:17] // CHECK: usrs.m c:objc(cs)Foo Extent=[34:1 - 45:2] // CHECK: usrs.m c:objc(cs)Foo(im)godzilla Extent=[35:1 - 39:2] -// CHECK: usrs.m c:usrs.m@409objc(cs)Foo(im)godzilla@a Extent=[36:10 - 36:19] -// CHECK: usrs.m c:objc(cs)Foo(im)godzilla@z Extent=[37:10 - 37:15] +// CHECK: usrs.m c:usrs.m@402objc(cs)Foo(im)godzilla@a Extent=[36:3 - 36:19] +// CHECK: usrs.m c:objc(cs)Foo(im)godzilla@z Extent=[37:3 - 37:15] // CHECK: usrs.m c:objc(cs)Foo(cm)kingkong Extent=[40:1 - 43:2] // CHECK: usrs.m c:usrs.m@470objc(cs)Foo(cm)kingkong@local_var Extent=[41:3 - 41:16] // CHECK: usrs.m c:objc(cs)Foo@d1 Extent=[44:13 - 44:15] // CHECK: usrs.m c:objc(cs)Foo(py)d1 Extent=[44:1 - 44:15] // CHECK: usrs.m c:@z Extent=[47:1 - 47:6] -// CHECK: usrs.m c:usrs.m@540@F@local_func Extent=[49:12 - 49:43] +// CHECK: usrs.m c:usrs.m@529@F@local_func Extent=[49:1 - 49:43] // CHECK: usrs.m c:usrs.m@551@F@local_func@x Extent=[49:23 - 49:28] // CHECK: usrs.m c:objc(cs)CWithExt Extent=[51:1 - 53:5] // CHECK: usrs.m c:objc(cs)CWithExt(im)meth1 Extent=[52:1 - 52:14] @@ -130,8 +130,8 @@ int test_multi_declaration(void) { // CHECK: usrs.m c:objc(cs)CWithExt(im)meth3 Extent=[66:1 - 66:27] // CHECK: usrs.m c:objc(cy)CWithExt@Bar Extent=[68:1 - 70:2] // CHECK: usrs.m c:objc(cs)CWithExt(im)meth4 Extent=[69:1 - 69:27] -// CHECK: usrs.m c:@F@aux_1 Extent=[72:6 - 72:26] -// CHECK: usrs.m c:@F@test_multi_declaration Extent=[73:5 - 77:2] +// CHECK: usrs.m c:@F@aux_1 Extent=[72:1 - 72:26] +// CHECK: usrs.m c:@F@test_multi_declaration Extent=[73:1 - 77:2] // CHECK: usrs.m c:usrs.m@980@F@test_multi_declaration@foo Extent=[74:3 - 74:14] // CHECK: usrs.m c:usrs.m@980@F@test_multi_declaration@bar Extent=[74:16 - 74:23] // CHECK: usrs.m c:usrs.m@980@F@test_multi_declaration@baz Extent=[74:25 - 74:32] @@ -139,7 +139,7 @@ int test_multi_declaration(void) { // CHECK: usrs.m c:objc(pl)P1(im)method Extent=[80:1 - 80:16] // RUN: c-index-test -test-load-source all %s | FileCheck -check-prefix=CHECK-source %s -// CHECK-source: usrs.m:3:19: FunctionDecl=my_helper:3:19 (Definition) Extent=[3:19 - 3:60] +// CHECK-source: usrs.m:3:19: FunctionDecl=my_helper:3:19 (Definition) Extent=[3:1 - 3:60] // CHECK-source: usrs.m:3:33: ParmDecl=x:3:33 (Definition) Extent=[3:29 - 3:34] // CHECK-source: usrs.m:3:40: ParmDecl=y:3:40 (Definition) Extent=[3:36 - 3:41] // CHECK-source: usrs.m:3:43: UnexposedStmt= Extent=[3:43 - 3:60] @@ -154,17 +154,17 @@ int test_multi_declaration(void) { // CHECK-source: usrs.m:11:3: EnumConstantDecl=FOO:11:3 (Definition) Extent=[11:3 - 11:6] // CHECK-source: usrs.m:12:3: EnumConstantDecl=BAR:12:3 (Definition) Extent=[12:3 - 12:6] // CHECK-source: usrs.m:15:9: StructDecl=:15:9 (Definition) Extent=[15:9 - 18:2] -// CHECK-source: usrs.m:16:7: FieldDecl=wa:16:7 (Definition) Extent=[16:7 - 16:9] -// CHECK-source: usrs.m:17:7: FieldDecl=moo:17:7 (Definition) Extent=[17:7 - 17:10] -// CHECK-source: usrs.m:18:3: TypedefDecl=MyStruct:18:3 (Definition) Extent=[18:3 - 18:11] +// CHECK-source: usrs.m:16:7: FieldDecl=wa:16:7 (Definition) Extent=[16:3 - 16:9] +// CHECK-source: usrs.m:17:7: FieldDecl=moo:17:7 (Definition) Extent=[17:3 - 17:10] +// CHECK-source: usrs.m:18:3: TypedefDecl=MyStruct:18:3 (Definition) Extent=[15:1 - 18:11] // CHECK-source: usrs.m:15:9: TypeRef=MyStruct:15:9 Extent=[15:9 - 15:15] // CHECK-source: usrs.m:20:6: EnumDecl=Pizza:20:6 (Definition) Extent=[20:1 - 23:2] // CHECK-source: usrs.m:21:3: EnumConstantDecl=CHEESE:21:3 (Definition) Extent=[21:3 - 21:9] // CHECK-source: usrs.m:22:3: EnumConstantDecl=MUSHROOMS:22:3 (Definition) Extent=[22:3 - 22:12] // CHECK-source: usrs.m:25:12: ObjCInterfaceDecl=Foo:25:12 Extent=[25:1 - 32:5] -// CHECK-source: usrs.m:26:6: ObjCIvarDecl=x:26:6 (Definition) Extent=[26:6 - 26:7] +// CHECK-source: usrs.m:26:6: ObjCIvarDecl=x:26:6 (Definition) Extent=[26:3 - 26:7] // CHECK-source: usrs.m:26:3: TypeRef=id:0:0 Extent=[26:3 - 26:5] -// CHECK-source: usrs.m:27:6: ObjCIvarDecl=y:27:6 (Definition) Extent=[27:6 - 27:7] +// CHECK-source: usrs.m:27:6: ObjCIvarDecl=y:27:6 (Definition) Extent=[27:3 - 27:7] // CHECK-source: usrs.m:27:3: TypeRef=id:0:0 Extent=[27:3 - 27:5] // CHECK-source: usrs.m:29:1: ObjCInstanceMethodDecl=godzilla:29:1 Extent=[29:1 - 29:17] // CHECK-source: usrs.m:29:4: TypeRef=id:0:0 Extent=[29:4 - 29:6] @@ -179,10 +179,10 @@ int test_multi_declaration(void) { // CHECK-source: usrs.m:35:4: TypeRef=id:0:0 Extent=[35:4 - 35:6] // CHECK-source: usrs.m:35:17: UnexposedStmt= Extent=[35:17 - 39:2] // CHECK-source: usrs.m:36:3: UnexposedStmt= Extent=[36:3 - 36:20] -// CHECK-source: usrs.m:36:14: VarDecl=a:36:14 (Definition) Extent=[36:10 - 36:19] +// CHECK-source: usrs.m:36:14: VarDecl=a:36:14 (Definition) Extent=[36:3 - 36:19] // CHECK-source: usrs.m:36:18: UnexposedExpr= Extent=[36:18 - 36:19] // CHECK-source: usrs.m:37:3: UnexposedStmt= Extent=[37:3 - 37:16] -// CHECK-source: usrs.m:37:14: VarDecl=z:37:14 Extent=[37:10 - 37:15] +// CHECK-source: usrs.m:37:14: VarDecl=z:37:14 Extent=[37:3 - 37:15] // CHECK-source: usrs.m:38:3: UnexposedStmt= Extent=[38:3 - 38:11] // CHECK-source: usrs.m:38:10: UnexposedExpr= Extent=[38:10 - 38:11] // CHECK-source: usrs.m:38:10: UnexposedExpr= Extent=[38:10 - 38:11] @@ -197,7 +197,7 @@ int test_multi_declaration(void) { // CHECK-source: usrs.m:44:13: ObjCIvarDecl=d1:44:13 (Definition) Extent=[44:13 - 44:15] // CHECK-source: usrs.m:44:13: UnexposedDecl=d1:31:15 (Definition) Extent=[44:1 - 44:15] // CHECK-source: usrs.m:47:5: VarDecl=z:47:5 Extent=[47:1 - 47:6] -// CHECK-source: usrs.m:49:12: FunctionDecl=local_func:49:12 (Definition) Extent=[49:12 - 49:43] +// CHECK-source: usrs.m:49:12: FunctionDecl=local_func:49:12 (Definition) Extent=[49:1 - 49:43] // CHECK-source: usrs.m:49:27: ParmDecl=x:49:27 (Definition) Extent=[49:23 - 49:28] // CHECK-source: usrs.m:49:30: UnexposedStmt= Extent=[49:30 - 49:43] // CHECK-source: usrs.m:49:32: UnexposedStmt= Extent=[49:32 - 49:40] @@ -244,11 +244,11 @@ int test_multi_declaration(void) { // CHECK-source: usrs.m:69:16: UnexposedStmt= Extent=[69:16 - 69:24] // CHECK-source: usrs.m:69:23: UnexposedExpr= Extent=[69:23 - 69:24] // CHECK-source: usrs.m:69:23: UnexposedExpr= Extent=[69:23 - 69:24] -// CHECK-source: usrs.m:72:6: FunctionDecl=aux_1:72:6 Extent=[72:6 - 72:26] +// CHECK-source: usrs.m:72:6: FunctionDecl=aux_1:72:6 Extent=[72:1 - 72:26] // CHECK-source: usrs.m:72:15: ParmDecl=:72:15 (Definition) Extent=[72:12 - 72:16] // CHECK-source: usrs.m:72:20: ParmDecl=:72:20 (Definition) Extent=[72:17 - 72:21] // CHECK-source: usrs.m:72:25: ParmDecl=:72:25 (Definition) Extent=[72:22 - 72:26] -// CHECK-source: usrs.m:73:5: FunctionDecl=test_multi_declaration:73:5 (Definition) Extent=[73:5 - 77:2] +// CHECK-source: usrs.m:73:5: FunctionDecl=test_multi_declaration:73:5 (Definition) Extent=[73:1 - 77:2] // CHECK-source: usrs.m:73:34: UnexposedStmt= Extent=[73:34 - 77:2] // CHECK-source: usrs.m:74:3: UnexposedStmt= Extent=[74:3 - 74:33] // CHECK-source: usrs.m:74:7: VarDecl=foo:74:7 (Definition) Extent=[74:3 - 74:14] |