From 778826b5280290197d8474bf449645ff82f1abcf Mon Sep 17 00:00:00 2001 From: Owen Mansel-Chan Date: Thu, 9 Feb 2023 11:54:15 +0000 Subject: [PATCH] Accept test changes Note that go/ql/test/library-tests/semmle/go/Types/QualifiedNames.expected and go/ql/test/library-tests/semmle/go/Types/Types.expected gain two lines. In both cases this is because GenericArray and GenericSignature are each instantiated twice, so they appear with two different locations. --- .../snippets/pointertype.expected | 2 +- .../test/example-tests/snippets/type.expected | 2 +- .../go1.14/interfaces.expected | 34 +-- .../library-tests/semmle/go/IR/test.expected | 12 +- .../semmle/go/Types/MethodTypes.expected | 106 +++++----- .../semmle/go/Types/QualifiedNames.expected | 200 +++++++++--------- .../semmle/go/Types/StructFields.expected | 130 ++++++------ .../semmle/go/Types/Types.expected | 200 +++++++++--------- .../semmle/go/Types/notype.expected | 6 +- 9 files changed, 348 insertions(+), 344 deletions(-) diff --git a/go/ql/test/example-tests/snippets/pointertype.expected b/go/ql/test/example-tests/snippets/pointertype.expected index b6dc6edcbdb..1ba95933c7b 100644 --- a/go/ql/test/example-tests/snippets/pointertype.expected +++ b/go/ql/test/example-tests/snippets/pointertype.expected @@ -1 +1 @@ -| pointer type | +| file://:0:0:0:0 | pointer type | diff --git a/go/ql/test/example-tests/snippets/type.expected b/go/ql/test/example-tests/snippets/type.expected index 6c24f73f3a8..6b2253d2bf4 100644 --- a/go/ql/test/example-tests/snippets/type.expected +++ b/go/ql/test/example-tests/snippets/type.expected @@ -1 +1 @@ -| Request | +| file://:0:0:0:0 | Request | diff --git a/go/ql/test/extractor-tests/go1.14/interfaces.expected b/go/ql/test/extractor-tests/go1.14/interfaces.expected index 152a7672545..7c2cdb00443 100644 --- a/go/ql/test/extractor-tests/go1.14/interfaces.expected +++ b/go/ql/test/extractor-tests/go1.14/interfaces.expected @@ -1,17 +1,17 @@ -| A | A | tst.go:4:2:4:2 | m | -| AA | AA | tst.go:4:2:4:2 | m | -| AB | AB | tst.go:4:2:4:2 | m | -| AB | AB | tst.go:9:2:9:2 | n | -| ABC | ABC | tst.go:4:2:4:2 | m | -| ABC | ABC | tst.go:9:2:9:2 | n | -| ABC | ABC | tst.go:14:2:14:2 | o | -| AC | AC | tst.go:4:2:4:2 | m | -| AC | AC | tst.go:13:2:13:2 | n | -| AC | AC | tst.go:14:2:14:2 | o | -| B | B | tst.go:8:2:8:2 | m | -| B | B | tst.go:9:2:9:2 | n | -| BC | BC | tst.go:8:2:8:2 | m | -| BC | BC | tst.go:9:2:9:2 | n | -| BC | BC | tst.go:14:2:14:2 | o | -| C | C | tst.go:13:2:13:2 | n | -| C | C | tst.go:14:2:14:2 | o | +| tst.go:3:6:3:6 | A | A | tst.go:4:2:4:2 | m | +| tst.go:7:6:7:6 | B | B | tst.go:8:2:8:2 | m | +| tst.go:7:6:7:6 | B | B | tst.go:9:2:9:2 | n | +| tst.go:12:6:12:6 | C | C | tst.go:13:2:13:2 | n | +| tst.go:12:6:12:6 | C | C | tst.go:14:2:14:2 | o | +| tst.go:17:6:17:7 | AA | AA | tst.go:4:2:4:2 | m | +| tst.go:22:6:22:7 | AB | AB | tst.go:4:2:4:2 | m | +| tst.go:22:6:22:7 | AB | AB | tst.go:9:2:9:2 | n | +| tst.go:27:6:27:7 | BC | BC | tst.go:8:2:8:2 | m | +| tst.go:27:6:27:7 | BC | BC | tst.go:9:2:9:2 | n | +| tst.go:27:6:27:7 | BC | BC | tst.go:14:2:14:2 | o | +| tst.go:32:6:32:7 | AC | AC | tst.go:4:2:4:2 | m | +| tst.go:32:6:32:7 | AC | AC | tst.go:13:2:13:2 | n | +| tst.go:32:6:32:7 | AC | AC | tst.go:14:2:14:2 | o | +| tst.go:37:6:37:8 | ABC | ABC | tst.go:4:2:4:2 | m | +| tst.go:37:6:37:8 | ABC | ABC | tst.go:9:2:9:2 | n | +| tst.go:37:6:37:8 | ABC | ABC | tst.go:14:2:14:2 | o | diff --git a/go/ql/test/library-tests/semmle/go/IR/test.expected b/go/ql/test/library-tests/semmle/go/IR/test.expected index eef7b1f4e9a..df2f83e3393 100644 --- a/go/ql/test/library-tests/semmle/go/IR/test.expected +++ b/go/ql/test/library-tests/semmle/go/IR/test.expected @@ -1,6 +1,6 @@ -| test.go:9:2:9:16 | ... := ...[0] | bool | -| test.go:9:2:9:16 | ... := ...[1] | bool | -| test.go:15:2:15:20 | ... := ...[0] | string | -| test.go:15:2:15:20 | ... := ...[1] | bool | -| test.go:21:2:21:22 | ... := ...[0] | string | -| test.go:21:2:21:22 | ... := ...[1] | bool | +| test.go:9:2:9:16 | ... := ...[0] | file://:0:0:0:0 | bool | +| test.go:9:2:9:16 | ... := ...[1] | file://:0:0:0:0 | bool | +| test.go:15:2:15:20 | ... := ...[0] | file://:0:0:0:0 | string | +| test.go:15:2:15:20 | ... := ...[1] | file://:0:0:0:0 | bool | +| test.go:21:2:21:22 | ... := ...[0] | file://:0:0:0:0 | string | +| test.go:21:2:21:22 | ... := ...[1] | file://:0:0:0:0 | bool | diff --git a/go/ql/test/library-tests/semmle/go/Types/MethodTypes.expected b/go/ql/test/library-tests/semmle/go/Types/MethodTypes.expected index 2364eb291f8..da2e9c1eb30 100644 --- a/go/ql/test/library-tests/semmle/go/Types/MethodTypes.expected +++ b/go/ql/test/library-tests/semmle/go/Types/MethodTypes.expected @@ -1,53 +1,53 @@ -| A | m | func() | -| A2 | m | func() | -| AC | m | func() | -| AC | n | func() | -| AC | o | func() | -| AEmbedded | m | func() | -| AExtended | m | func() | -| AExtended | n | func() | -| B | m | func() | -| B | n | func() | -| C | n | func() | -| C | o | func() | -| GenericInterface | GetT | func() T | -| MyInterface | clone | func() MyInterface | -| MyInterface | dummy1 | func() [10]U | -| MyInterface | dummy2 | func() * U | -| MyInterface | dummy3 | func() []U | -| MyInterface | dummy4 | func() [U]U | -| MyInterface | dummy5 | func() chan<- U | -| MyInterface | dummy6 | func() MyMapType | -| MyInterface | dummy7 | func() MyFuncType2 | -| MyInterface | dummy11 | func() GenericArray | -| MyInterface | dummy12 | func() GenericPointer | -| MyInterface | dummy13 | func() GenericSlice | -| MyInterface | dummy14 | func() GenericMap1 | -| MyInterface | dummy15 | func() GenericMap2 | -| MyInterface | dummy17 | func() GenericChannel | -| MyInterface | dummy18 | func() GenericNamed | -| MyInterface | dummy19 | func() MyFuncType1 | -| MyInterface | dummy20 | func() MyFuncType2 | -| T | half | func() Foo | -| T3 | half | func() Foo | -| T4 | half | func() Foo | -| embedder | f | func() int | -| embedder2 | f | func() int | -| embedder3 | f | func() int | -| embedder4 | f | func() int | -| i6 | String | func() string | -| i7 | String | func() string | -| i8 | String | func() string | -| i8 | StringA | func() string | -| i9 | String | func() string | -| i9 | StringB | func() string | -| i14 | String | func() string | -| i14 | StringA | func() string | -| i15 | String | func() string | -| i15 | StringB | func() string | -| i17 | StringA | func() string | -| i18 | StringA | func() string | -| i19 | StringB | func() string | -| i20 | StringB | func() string | -| ptrembedder | f | func() int | -| ptrembedder | g | func() int | +| generic.go:32:6:32:21 | GenericInterface | GetT | func() T | +| generic.go:47:6:47:16 | MyInterface | clone | func() MyInterface | +| generic.go:47:6:47:16 | MyInterface | dummy1 | func() [10]U | +| generic.go:47:6:47:16 | MyInterface | dummy2 | func() * U | +| generic.go:47:6:47:16 | MyInterface | dummy3 | func() []U | +| generic.go:47:6:47:16 | MyInterface | dummy4 | func() [U]U | +| generic.go:47:6:47:16 | MyInterface | dummy5 | func() chan<- U | +| generic.go:47:6:47:16 | MyInterface | dummy6 | func() MyMapType | +| generic.go:47:6:47:16 | MyInterface | dummy7 | func() MyFuncType2 | +| generic.go:47:6:47:16 | MyInterface | dummy11 | func() GenericArray | +| generic.go:47:6:47:16 | MyInterface | dummy12 | func() GenericPointer | +| generic.go:47:6:47:16 | MyInterface | dummy13 | func() GenericSlice | +| generic.go:47:6:47:16 | MyInterface | dummy14 | func() GenericMap1 | +| generic.go:47:6:47:16 | MyInterface | dummy15 | func() GenericMap2 | +| generic.go:47:6:47:16 | MyInterface | dummy17 | func() GenericChannel | +| generic.go:47:6:47:16 | MyInterface | dummy18 | func() GenericNamed | +| generic.go:47:6:47:16 | MyInterface | dummy19 | func() MyFuncType1 | +| generic.go:47:6:47:16 | MyInterface | dummy20 | func() MyFuncType2 | +| interface.go:28:6:28:7 | i6 | String | func() string | +| interface.go:34:6:34:7 | i7 | String | func() string | +| interface.go:41:6:41:7 | i8 | String | func() string | +| interface.go:41:6:41:7 | i8 | StringA | func() string | +| interface.go:47:6:47:7 | i9 | String | func() string | +| interface.go:47:6:47:7 | i9 | StringB | func() string | +| interface.go:75:6:75:8 | i14 | String | func() string | +| interface.go:75:6:75:8 | i14 | StringA | func() string | +| interface.go:81:6:81:8 | i15 | String | func() string | +| interface.go:81:6:81:8 | i15 | StringB | func() string | +| interface.go:91:6:91:8 | i17 | StringA | func() string | +| interface.go:95:6:95:8 | i18 | StringA | func() string | +| interface.go:101:6:101:8 | i19 | StringB | func() string | +| interface.go:105:6:105:8 | i20 | StringB | func() string | +| pkg1/embedding.go:19:6:19:13 | embedder | f | func() int | +| pkg1/embedding.go:22:6:22:16 | ptrembedder | f | func() int | +| pkg1/embedding.go:22:6:22:16 | ptrembedder | g | func() int | +| pkg1/embedding.go:25:6:25:14 | embedder2 | f | func() int | +| pkg1/embedding.go:28:6:28:14 | embedder3 | f | func() int | +| pkg1/embedding.go:35:6:35:14 | embedder4 | f | func() int | +| pkg1/interfaces.go:3:6:3:6 | A | m | func() | +| pkg1/interfaces.go:7:6:7:6 | B | m | func() | +| pkg1/interfaces.go:7:6:7:6 | B | n | func() | +| pkg1/interfaces.go:12:6:12:6 | C | n | func() | +| pkg1/interfaces.go:12:6:12:6 | C | o | func() | +| pkg1/interfaces.go:17:6:17:14 | AEmbedded | m | func() | +| pkg1/interfaces.go:21:6:21:7 | AC | m | func() | +| pkg1/interfaces.go:21:6:21:7 | AC | n | func() | +| pkg1/interfaces.go:21:6:21:7 | AC | o | func() | +| pkg1/interfaces.go:26:6:26:14 | AExtended | m | func() | +| pkg1/interfaces.go:26:6:26:14 | AExtended | n | func() | +| pkg1/interfaces.go:31:6:31:7 | A2 | m | func() | +| pkg1/tst.go:3:6:3:6 | T | half | func() Foo | +| pkg1/tst.go:14:6:14:7 | T3 | half | func() Foo | +| pkg1/tst.go:19:6:19:7 | T4 | half | func() Foo | diff --git a/go/ql/test/library-tests/semmle/go/Types/QualifiedNames.expected b/go/ql/test/library-tests/semmle/go/Types/QualifiedNames.expected index e8b335f5de7..86ba2c51676 100644 --- a/go/ql/test/library-tests/semmle/go/Types/QualifiedNames.expected +++ b/go/ql/test/library-tests/semmle/go/Types/QualifiedNames.expected @@ -1,99 +1,101 @@ -| A | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.A | -| A2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.A2 | -| AC | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.AC | -| AEmbedded | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.AEmbedded | -| AExtended | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.AExtended | -| B | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.B | -| Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.Bar | -| Baz | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.Baz | -| C | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.C | -| CircularGenericStruct1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.CircularGenericStruct1 | -| CircularGenericStruct2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.CircularGenericStruct2 | -| EmbedsBaz | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.EmbedsBaz | -| Foo | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.Foo | -| G | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.G | -| GenericArray | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericArray | -| GenericChannel | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericChannel | -| GenericInterface | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericInterface | -| GenericMap1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericMap1 | -| GenericMap2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericMap2 | -| GenericNamed | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericNamed | -| GenericPointer | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericPointer | -| GenericSignature | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericSignature | -| GenericSlice | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericSlice | -| GenericStruct1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericStruct1 | -| GenericStruct2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericStruct2 | -| GenericStruct2b | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericStruct2b | -| HasBlankTypeParam | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.HasBlankTypeParam | -| HasBlankTypeParams | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.HasBlankTypeParams | -| MyFuncType1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.MyFuncType1 | -| MyFuncType2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.MyFuncType2 | -| MyInterface | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.MyInterface | -| MyMapType | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.MyMapType | -| Qux | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.Qux | -| T | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T | -| T | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.T | -| T2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T2 | -| T3 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T3 | -| T4 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T4 | -| UsesCircularGenericStruct1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.UsesCircularGenericStruct1 | -| a | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.a | -| b | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.b | -| base | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.base | -| c | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.c | -| d | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.d | -| embedder | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.embedder | -| embedder2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.embedder2 | -| embedder3 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.embedder3 | -| embedder4 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.embedder4 | -| i0 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i0 | -| i1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i1 | -| i2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i2 | -| i3 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i3 | -| i4 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i4 | -| i5 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i5 | -| i6 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i6 | -| i7 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i7 | -| i8 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i8 | -| i9 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i9 | -| i10 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i10 | -| i11 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i11 | -| i12 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i12 | -| i13 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i13 | -| i14 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i14 | -| i15 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i15 | -| i16 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i16 | -| i17 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i17 | -| i18 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i18 | -| i19 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i19 | -| i20 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i20 | -| ptrembedder | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.ptrembedder | -| s | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.s | -| t | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.t | -| testComparable | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable | -| testComparable0 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable0 | -| testComparable1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable1 | -| testComparable2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable2 | -| testComparable3 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable3 | -| testComparable4 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable4 | -| testComparable5 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable5 | -| testComparable6 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable6 | -| testComparable7 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable7 | -| testComparable8 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable8 | -| testComparable9 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable9 | -| testComparable10 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable10 | -| testComparable11 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable11 | -| testComparable12 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable12 | -| testComparable13 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable13 | -| testComparable14 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable14 | -| testComparable15 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable15 | -| testComparable16 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable16 | -| testComparable17 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable17 | -| testComparable18 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable18 | -| testComparable19 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable19 | -| testComparable20 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable20 | -| testComparable21 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable21 | -| testComparable22 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable22 | -| testComparable23 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable23 | -| u | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.u | -| v | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.v | +| cyclic.go:3:6:3:6 | s | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.s | +| cyclic.go:7:6:7:6 | t | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.t | +| cyclic.go:12:6:12:6 | u | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.u | +| cyclic.go:16:6:16:6 | v | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.v | +| depth.go:5:6:5:6 | a | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.a | +| depth.go:10:6:10:6 | b | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.b | +| depth.go:14:6:14:6 | c | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.c | +| depth.go:18:6:18:6 | d | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.d | +| embedded.go:3:6:3:8 | Baz | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.Baz | +| embedded.go:7:6:7:8 | Qux | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.Qux | +| embedded.go:12:6:12:14 | EmbedsBaz | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.EmbedsBaz | +| generic.go:3:6:3:19 | GenericStruct1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericStruct1 | +| generic.go:11:6:11:27 | CircularGenericStruct1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.CircularGenericStruct1 | +| generic.go:15:6:15:31 | UsesCircularGenericStruct1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.UsesCircularGenericStruct1 | +| generic.go:19:6:19:19 | GenericStruct2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericStruct2 | +| generic.go:24:6:24:20 | GenericStruct2b | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericStruct2b | +| generic.go:28:6:28:27 | CircularGenericStruct2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.CircularGenericStruct2 | +| generic.go:32:6:32:21 | GenericInterface | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericInterface | +| generic.go:36:6:36:17 | GenericArray | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericArray | +| generic.go:37:6:37:19 | GenericPointer | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericPointer | +| generic.go:38:6:38:17 | GenericSlice | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericSlice | +| generic.go:39:6:39:16 | GenericMap1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericMap1 | +| generic.go:40:6:40:16 | GenericMap2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericMap2 | +| generic.go:41:6:41:19 | GenericChannel | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericChannel | +| generic.go:42:6:42:14 | MyMapType | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.MyMapType | +| generic.go:43:6:43:17 | GenericNamed | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericNamed | +| generic.go:44:6:44:16 | MyFuncType1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.MyFuncType1 | +| generic.go:45:6:45:16 | MyFuncType2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.MyFuncType2 | +| generic.go:47:6:47:16 | MyInterface | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.MyInterface | +| generic.go:67:6:67:22 | HasBlankTypeParam | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.HasBlankTypeParam | +| generic.go:68:6:68:23 | HasBlankTypeParams | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.HasBlankTypeParams | +| generic.go:82:6:82:14 | GenericArray | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericArray | +| generic.go:84:6:84:21 | GenericSignature | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericSignature | +| generic.go:85:6:85:26 | GenericSignature | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericSignature | +| interface.go:3:6:3:7 | i0 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i0 | +| interface.go:5:6:5:7 | i1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i1 | +| interface.go:9:6:9:7 | i2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i2 | +| interface.go:13:6:13:7 | i3 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i3 | +| interface.go:18:6:18:7 | i4 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i4 | +| interface.go:23:6:23:7 | i5 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i5 | +| interface.go:28:6:28:7 | i6 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i6 | +| interface.go:34:6:34:7 | i7 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i7 | +| interface.go:41:6:41:7 | i8 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i8 | +| interface.go:47:6:47:7 | i9 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i9 | +| interface.go:52:6:52:8 | i10 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i10 | +| interface.go:57:6:57:8 | i11 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i11 | +| interface.go:63:6:63:8 | i12 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i12 | +| interface.go:69:6:69:8 | i13 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i13 | +| interface.go:75:6:75:8 | i14 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i14 | +| interface.go:81:6:81:8 | i15 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i15 | +| interface.go:87:6:87:8 | i16 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i16 | +| interface.go:91:6:91:8 | i17 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i17 | +| interface.go:95:6:95:8 | i18 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i18 | +| interface.go:101:6:101:8 | i19 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i19 | +| interface.go:105:6:105:8 | i20 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.i20 | +| interface.go:110:6:110:19 | testComparable | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable | +| interface.go:111:6:111:20 | testComparable0 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable0 | +| interface.go:112:6:112:20 | testComparable1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable1 | +| interface.go:113:6:113:20 | testComparable2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable2 | +| interface.go:114:6:114:20 | testComparable3 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable3 | +| interface.go:115:6:115:20 | testComparable4 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable4 | +| interface.go:116:6:116:20 | testComparable5 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable5 | +| interface.go:117:6:117:20 | testComparable6 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable6 | +| interface.go:118:6:118:20 | testComparable7 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable7 | +| interface.go:119:6:119:20 | testComparable8 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable8 | +| interface.go:120:6:120:20 | testComparable9 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable9 | +| interface.go:121:6:121:21 | testComparable10 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable10 | +| interface.go:122:6:122:21 | testComparable11 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable11 | +| interface.go:123:6:123:21 | testComparable12 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable12 | +| interface.go:124:6:124:21 | testComparable13 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable13 | +| interface.go:125:6:125:21 | testComparable14 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable14 | +| interface.go:126:6:126:21 | testComparable15 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable15 | +| interface.go:127:6:127:21 | testComparable16 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable16 | +| interface.go:128:6:128:21 | testComparable17 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable17 | +| interface.go:129:6:129:21 | testComparable18 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable18 | +| interface.go:130:6:130:21 | testComparable19 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable19 | +| interface.go:131:6:131:21 | testComparable20 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable20 | +| interface.go:132:6:132:21 | testComparable21 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable21 | +| interface.go:133:6:133:21 | testComparable22 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable22 | +| interface.go:134:6:134:21 | testComparable23 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable23 | +| pkg1/embedding.go:8:6:8:9 | base | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.base | +| pkg1/embedding.go:19:6:19:13 | embedder | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.embedder | +| pkg1/embedding.go:22:6:22:16 | ptrembedder | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.ptrembedder | +| pkg1/embedding.go:25:6:25:14 | embedder2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.embedder2 | +| pkg1/embedding.go:28:6:28:14 | embedder3 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.embedder3 | +| pkg1/embedding.go:35:6:35:14 | embedder4 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.embedder4 | +| pkg1/interfaces.go:3:6:3:6 | A | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.A | +| pkg1/interfaces.go:7:6:7:6 | B | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.B | +| pkg1/interfaces.go:12:6:12:6 | C | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.C | +| pkg1/interfaces.go:17:6:17:14 | AEmbedded | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.AEmbedded | +| pkg1/interfaces.go:21:6:21:7 | AC | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.AC | +| pkg1/interfaces.go:26:6:26:14 | AExtended | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.AExtended | +| pkg1/interfaces.go:31:6:31:7 | A2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.A2 | +| pkg1/tst.go:3:6:3:6 | T | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T | +| pkg1/tst.go:9:6:9:7 | T2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T2 | +| pkg1/tst.go:14:6:14:7 | T3 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T3 | +| pkg1/tst.go:19:6:19:7 | T4 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T4 | +| pkg1/tst.go:24:6:24:8 | Foo | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.Foo | +| pkg1/tst.go:29:6:29:8 | Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.Bar | +| pkg2/tst.go:3:6:3:6 | T | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.T | +| pkg2/tst.go:7:6:7:6 | G | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.G | diff --git a/go/ql/test/library-tests/semmle/go/Types/StructFields.expected b/go/ql/test/library-tests/semmle/go/Types/StructFields.expected index 5ae7f7e73b7..1db8f36d251 100644 --- a/go/ql/test/library-tests/semmle/go/Types/StructFields.expected +++ b/go/ql/test/library-tests/semmle/go/Types/StructFields.expected @@ -1,65 +1,65 @@ -| Bar | pkg1/tst.go:29:10:31:1 | struct type | flag | bool | -| Baz | embedded.go:3:10:5:1 | struct type | A | string | -| CircularGenericStruct1 | generic.go:11:38:13:1 | struct type | pointerField | * CircularGenericStruct1 | -| CircularGenericStruct2 | generic.go:28:39:30:1 | struct type | pointerField | * CircularGenericStruct2 | -| EmbedsBaz | embedded.go:12:16:15:1 | struct type | Baz | string | -| EmbedsBaz | embedded.go:12:16:15:1 | struct type | Qux | Qux | -| Foo | pkg1/tst.go:24:10:27:1 | struct type | flag | bool | -| Foo | pkg1/tst.go:24:10:27:1 | struct type | val | int | -| G | pkg2/tst.go:3:8:5:1 | struct type | g | int | -| G | pkg2/tst.go:7:8:9:1 | struct type | g | int | -| GenericStruct1 | generic.go:3:28:9:1 | struct type | arrayField | [10]T | -| GenericStruct1 | generic.go:3:28:9:1 | struct type | mapField | [string]T | -| GenericStruct1 | generic.go:3:28:9:1 | struct type | pointerField | * T | -| GenericStruct1 | generic.go:3:28:9:1 | struct type | sliceField | []T | -| GenericStruct1 | generic.go:3:28:9:1 | struct type | valueField | T | -| GenericStruct2 | generic.go:19:42:22:1 | struct type | mapField | [S]T | -| GenericStruct2 | generic.go:19:42:22:1 | struct type | structField | GenericStruct1 | -| GenericStruct2b | generic.go:24:39:26:1 | struct type | structField | GenericStruct2 | -| Qux | embedded.go:7:10:9:1 | struct type | A | string | -| Qux | embedded.go:7:10:9:1 | struct type | Baz | * Baz | -| T | pkg1/tst.go:3:8:7:1 | struct type | Bar | Bar | -| T | pkg1/tst.go:3:8:7:1 | struct type | Foo | Foo | -| T | pkg1/tst.go:3:8:7:1 | struct type | f | int | -| T | pkg1/tst.go:3:8:7:1 | struct type | val | int | -| T | pkg2/tst.go:3:8:5:1 | struct type | g | int | -| T | pkg2/tst.go:7:8:9:1 | struct type | g | int | -| T2 | pkg1/tst.go:9:9:12:1 | struct type | Bar | Bar | -| T2 | pkg1/tst.go:9:9:12:1 | struct type | Foo | Foo | -| T2 | pkg1/tst.go:9:9:12:1 | struct type | flag | bool | -| T3 | pkg1/tst.go:14:9:17:1 | struct type | Bar | * Bar | -| T3 | pkg1/tst.go:14:9:17:1 | struct type | Foo | * Foo | -| T3 | pkg1/tst.go:14:9:17:1 | struct type | val | int | -| T4 | pkg1/tst.go:19:9:22:1 | struct type | Bar | Bar | -| T4 | pkg1/tst.go:19:9:22:1 | struct type | Foo | * Foo | -| T4 | pkg1/tst.go:19:9:22:1 | struct type | flag | bool | -| T4 | pkg1/tst.go:19:9:22:1 | struct type | val | int | -| UsesCircularGenericStruct1 | generic.go:15:42:17:1 | struct type | root | CircularGenericStruct1 | -| a | depth.go:5:8:8:1 | struct type | b | b | -| a | depth.go:5:8:8:1 | struct type | c | c | -| a | depth.go:5:8:8:1 | struct type | d | d | -| a | depth.go:5:8:8:1 | struct type | f | int | -| b | depth.go:10:8:12:1 | struct type | f | int | -| c | depth.go:14:8:16:1 | struct type | d | d | -| c | depth.go:14:8:16:1 | struct type | f | string | -| d | depth.go:18:8:20:1 | struct type | f | string | -| embedder | pkg1/embedding.go:19:15:19:28 | struct type | base | base | -| embedder2 | pkg1/embedding.go:25:16:25:33 | struct type | base | base | -| embedder2 | pkg1/embedding.go:25:16:25:33 | struct type | embedder | embedder | -| embedder2 | pkg1/embedding.go:28:16:28:33 | struct type | base | base | -| embedder2 | pkg1/embedding.go:28:16:28:33 | struct type | embedder | embedder | -| embedder3 | pkg1/embedding.go:25:16:25:33 | struct type | base | base | -| embedder3 | pkg1/embedding.go:25:16:25:33 | struct type | embedder | embedder | -| embedder3 | pkg1/embedding.go:28:16:28:33 | struct type | base | base | -| embedder3 | pkg1/embedding.go:28:16:28:33 | struct type | embedder | embedder | -| embedder4 | pkg1/embedding.go:35:16:38:1 | struct type | base | base | -| embedder4 | pkg1/embedding.go:35:16:38:1 | struct type | f | int | -| ptrembedder | pkg1/embedding.go:22:18:22:32 | struct type | base | * base | -| s | cyclic.go:3:8:5:1 | struct type | s | * s | -| t | cyclic.go:7:8:10:1 | struct type | f | int | -| t | cyclic.go:7:8:10:1 | struct type | t | t | -| t | cyclic.go:7:8:10:1 | struct type | u | * u | -| u | cyclic.go:12:8:14:1 | struct type | f | int | -| u | cyclic.go:12:8:14:1 | struct type | t | t | -| u | cyclic.go:12:8:14:1 | struct type | u | * u | -| v | cyclic.go:16:8:18:1 | struct type | s | s | +| cyclic.go:3:6:3:6 | s | cyclic.go:3:8:5:1 | struct type | s | * s | +| cyclic.go:7:6:7:6 | t | cyclic.go:7:8:10:1 | struct type | f | int | +| cyclic.go:7:6:7:6 | t | cyclic.go:7:8:10:1 | struct type | t | t | +| cyclic.go:7:6:7:6 | t | cyclic.go:7:8:10:1 | struct type | u | * u | +| cyclic.go:12:6:12:6 | u | cyclic.go:12:8:14:1 | struct type | f | int | +| cyclic.go:12:6:12:6 | u | cyclic.go:12:8:14:1 | struct type | t | t | +| cyclic.go:12:6:12:6 | u | cyclic.go:12:8:14:1 | struct type | u | * u | +| cyclic.go:16:6:16:6 | v | cyclic.go:16:8:18:1 | struct type | s | s | +| depth.go:5:6:5:6 | a | depth.go:5:8:8:1 | struct type | b | b | +| depth.go:5:6:5:6 | a | depth.go:5:8:8:1 | struct type | c | c | +| depth.go:5:6:5:6 | a | depth.go:5:8:8:1 | struct type | d | d | +| depth.go:5:6:5:6 | a | depth.go:5:8:8:1 | struct type | f | int | +| depth.go:10:6:10:6 | b | depth.go:10:8:12:1 | struct type | f | int | +| depth.go:14:6:14:6 | c | depth.go:14:8:16:1 | struct type | d | d | +| depth.go:14:6:14:6 | c | depth.go:14:8:16:1 | struct type | f | string | +| depth.go:18:6:18:6 | d | depth.go:18:8:20:1 | struct type | f | string | +| embedded.go:3:6:3:8 | Baz | embedded.go:3:10:5:1 | struct type | A | string | +| embedded.go:7:6:7:8 | Qux | embedded.go:7:10:9:1 | struct type | A | string | +| embedded.go:7:6:7:8 | Qux | embedded.go:7:10:9:1 | struct type | Baz | * Baz | +| embedded.go:12:6:12:14 | EmbedsBaz | embedded.go:12:16:15:1 | struct type | Baz | string | +| embedded.go:12:6:12:14 | EmbedsBaz | embedded.go:12:16:15:1 | struct type | Qux | Qux | +| generic.go:3:6:3:19 | GenericStruct1 | generic.go:3:28:9:1 | struct type | arrayField | [10]T | +| generic.go:3:6:3:19 | GenericStruct1 | generic.go:3:28:9:1 | struct type | mapField | [string]T | +| generic.go:3:6:3:19 | GenericStruct1 | generic.go:3:28:9:1 | struct type | pointerField | * T | +| generic.go:3:6:3:19 | GenericStruct1 | generic.go:3:28:9:1 | struct type | sliceField | []T | +| generic.go:3:6:3:19 | GenericStruct1 | generic.go:3:28:9:1 | struct type | valueField | T | +| generic.go:11:6:11:27 | CircularGenericStruct1 | generic.go:11:38:13:1 | struct type | pointerField | * CircularGenericStruct1 | +| generic.go:15:6:15:31 | UsesCircularGenericStruct1 | generic.go:15:42:17:1 | struct type | root | CircularGenericStruct1 | +| generic.go:19:6:19:19 | GenericStruct2 | generic.go:19:42:22:1 | struct type | mapField | [S]T | +| generic.go:19:6:19:19 | GenericStruct2 | generic.go:19:42:22:1 | struct type | structField | GenericStruct1 | +| generic.go:24:6:24:20 | GenericStruct2b | generic.go:24:39:26:1 | struct type | structField | GenericStruct2 | +| generic.go:28:6:28:27 | CircularGenericStruct2 | generic.go:28:39:30:1 | struct type | pointerField | * CircularGenericStruct2 | +| pkg1/embedding.go:19:6:19:13 | embedder | pkg1/embedding.go:19:15:19:28 | struct type | base | base | +| pkg1/embedding.go:22:6:22:16 | ptrembedder | pkg1/embedding.go:22:18:22:32 | struct type | base | * base | +| pkg1/embedding.go:25:6:25:14 | embedder2 | pkg1/embedding.go:25:16:25:33 | struct type | base | base | +| pkg1/embedding.go:25:6:25:14 | embedder2 | pkg1/embedding.go:25:16:25:33 | struct type | embedder | embedder | +| pkg1/embedding.go:25:6:25:14 | embedder2 | pkg1/embedding.go:28:16:28:33 | struct type | base | base | +| pkg1/embedding.go:25:6:25:14 | embedder2 | pkg1/embedding.go:28:16:28:33 | struct type | embedder | embedder | +| pkg1/embedding.go:28:6:28:14 | embedder3 | pkg1/embedding.go:25:16:25:33 | struct type | base | base | +| pkg1/embedding.go:28:6:28:14 | embedder3 | pkg1/embedding.go:25:16:25:33 | struct type | embedder | embedder | +| pkg1/embedding.go:28:6:28:14 | embedder3 | pkg1/embedding.go:28:16:28:33 | struct type | base | base | +| pkg1/embedding.go:28:6:28:14 | embedder3 | pkg1/embedding.go:28:16:28:33 | struct type | embedder | embedder | +| pkg1/embedding.go:35:6:35:14 | embedder4 | pkg1/embedding.go:35:16:38:1 | struct type | base | base | +| pkg1/embedding.go:35:6:35:14 | embedder4 | pkg1/embedding.go:35:16:38:1 | struct type | f | int | +| pkg1/tst.go:3:6:3:6 | T | pkg1/tst.go:3:8:7:1 | struct type | Bar | Bar | +| pkg1/tst.go:3:6:3:6 | T | pkg1/tst.go:3:8:7:1 | struct type | Foo | Foo | +| pkg1/tst.go:3:6:3:6 | T | pkg1/tst.go:3:8:7:1 | struct type | f | int | +| pkg1/tst.go:3:6:3:6 | T | pkg1/tst.go:3:8:7:1 | struct type | val | int | +| pkg1/tst.go:9:6:9:7 | T2 | pkg1/tst.go:9:9:12:1 | struct type | Bar | Bar | +| pkg1/tst.go:9:6:9:7 | T2 | pkg1/tst.go:9:9:12:1 | struct type | Foo | Foo | +| pkg1/tst.go:9:6:9:7 | T2 | pkg1/tst.go:9:9:12:1 | struct type | flag | bool | +| pkg1/tst.go:14:6:14:7 | T3 | pkg1/tst.go:14:9:17:1 | struct type | Bar | * Bar | +| pkg1/tst.go:14:6:14:7 | T3 | pkg1/tst.go:14:9:17:1 | struct type | Foo | * Foo | +| pkg1/tst.go:14:6:14:7 | T3 | pkg1/tst.go:14:9:17:1 | struct type | val | int | +| pkg1/tst.go:19:6:19:7 | T4 | pkg1/tst.go:19:9:22:1 | struct type | Bar | Bar | +| pkg1/tst.go:19:6:19:7 | T4 | pkg1/tst.go:19:9:22:1 | struct type | Foo | * Foo | +| pkg1/tst.go:19:6:19:7 | T4 | pkg1/tst.go:19:9:22:1 | struct type | flag | bool | +| pkg1/tst.go:19:6:19:7 | T4 | pkg1/tst.go:19:9:22:1 | struct type | val | int | +| pkg1/tst.go:24:6:24:8 | Foo | pkg1/tst.go:24:10:27:1 | struct type | flag | bool | +| pkg1/tst.go:24:6:24:8 | Foo | pkg1/tst.go:24:10:27:1 | struct type | val | int | +| pkg1/tst.go:29:6:29:8 | Bar | pkg1/tst.go:29:10:31:1 | struct type | flag | bool | +| pkg2/tst.go:3:6:3:6 | T | pkg2/tst.go:3:8:5:1 | struct type | g | int | +| pkg2/tst.go:3:6:3:6 | T | pkg2/tst.go:7:8:9:1 | struct type | g | int | +| pkg2/tst.go:7:6:7:6 | G | pkg2/tst.go:3:8:5:1 | struct type | g | int | +| pkg2/tst.go:7:6:7:6 | G | pkg2/tst.go:7:8:9:1 | struct type | g | int | diff --git a/go/ql/test/library-tests/semmle/go/Types/Types.expected b/go/ql/test/library-tests/semmle/go/Types/Types.expected index e0dfa3791dd..de0a09424ea 100644 --- a/go/ql/test/library-tests/semmle/go/Types/Types.expected +++ b/go/ql/test/library-tests/semmle/go/Types/Types.expected @@ -1,99 +1,101 @@ -| A | A | -| A2 | A2 | -| AC | AC | -| AEmbedded | AEmbedded | -| AExtended | AExtended | -| B | B | -| Bar | Bar | -| Baz | Baz | -| C | C | -| CircularGenericStruct1 | CircularGenericStruct1 | -| CircularGenericStruct2 | CircularGenericStruct2 | -| EmbedsBaz | EmbedsBaz | -| Foo | Foo | -| G | G | -| GenericArray | GenericArray | -| GenericChannel | GenericChannel | -| GenericInterface | GenericInterface | -| GenericMap1 | GenericMap1 | -| GenericMap2 | GenericMap2 | -| GenericNamed | GenericNamed | -| GenericPointer | GenericPointer | -| GenericSignature | GenericSignature | -| GenericSlice | GenericSlice | -| GenericStruct1 | GenericStruct1 | -| GenericStruct2 | GenericStruct2 | -| GenericStruct2b | GenericStruct2b | -| HasBlankTypeParam | HasBlankTypeParam | -| HasBlankTypeParams | HasBlankTypeParams | -| MyFuncType1 | MyFuncType1 | -| MyFuncType2 | MyFuncType2 | -| MyInterface | MyInterface | -| MyMapType | MyMapType | -| Qux | Qux | -| T | T | -| T | T | -| T2 | T2 | -| T3 | T3 | -| T4 | T4 | -| UsesCircularGenericStruct1 | UsesCircularGenericStruct1 | -| a | a | -| b | b | -| base | base | -| c | c | -| d | d | -| embedder | embedder | -| embedder2 | embedder2 | -| embedder3 | embedder3 | -| embedder4 | embedder4 | -| i0 | i0 | -| i1 | i1 | -| i2 | i2 | -| i3 | i3 | -| i4 | i4 | -| i5 | i5 | -| i6 | i6 | -| i7 | i7 | -| i8 | i8 | -| i9 | i9 | -| i10 | i10 | -| i11 | i11 | -| i12 | i12 | -| i13 | i13 | -| i14 | i14 | -| i15 | i15 | -| i16 | i16 | -| i17 | i17 | -| i18 | i18 | -| i19 | i19 | -| i20 | i20 | -| ptrembedder | ptrembedder | -| s | s | -| t | t | -| testComparable | testComparable | -| testComparable0 | testComparable0 | -| testComparable1 | testComparable1 | -| testComparable2 | testComparable2 | -| testComparable3 | testComparable3 | -| testComparable4 | testComparable4 | -| testComparable5 | testComparable5 | -| testComparable6 | testComparable6 | -| testComparable7 | testComparable7 | -| testComparable8 | testComparable8 | -| testComparable9 | testComparable9 | -| testComparable10 | testComparable10 | -| testComparable11 | testComparable11 | -| testComparable12 | testComparable12 | -| testComparable13 | testComparable13 | -| testComparable14 | testComparable14 | -| testComparable15 | testComparable15 | -| testComparable16 | testComparable16 | -| testComparable17 | testComparable17 | -| testComparable18 | testComparable18 | -| testComparable19 | testComparable19 | -| testComparable20 | testComparable20 | -| testComparable21 | testComparable21 | -| testComparable22 | testComparable22 | -| testComparable23 | testComparable23 | -| u | u | -| v | v | +| cyclic.go:3:6:3:6 | s | s | +| cyclic.go:7:6:7:6 | t | t | +| cyclic.go:12:6:12:6 | u | u | +| cyclic.go:16:6:16:6 | v | v | +| depth.go:5:6:5:6 | a | a | +| depth.go:10:6:10:6 | b | b | +| depth.go:14:6:14:6 | c | c | +| depth.go:18:6:18:6 | d | d | +| embedded.go:3:6:3:8 | Baz | Baz | +| embedded.go:7:6:7:8 | Qux | Qux | +| embedded.go:12:6:12:14 | EmbedsBaz | EmbedsBaz | +| generic.go:3:6:3:19 | GenericStruct1 | GenericStruct1 | +| generic.go:11:6:11:27 | CircularGenericStruct1 | CircularGenericStruct1 | +| generic.go:15:6:15:31 | UsesCircularGenericStruct1 | UsesCircularGenericStruct1 | +| generic.go:19:6:19:19 | GenericStruct2 | GenericStruct2 | +| generic.go:24:6:24:20 | GenericStruct2b | GenericStruct2b | +| generic.go:28:6:28:27 | CircularGenericStruct2 | CircularGenericStruct2 | +| generic.go:32:6:32:21 | GenericInterface | GenericInterface | +| generic.go:36:6:36:17 | GenericArray | GenericArray | +| generic.go:37:6:37:19 | GenericPointer | GenericPointer | +| generic.go:38:6:38:17 | GenericSlice | GenericSlice | +| generic.go:39:6:39:16 | GenericMap1 | GenericMap1 | +| generic.go:40:6:40:16 | GenericMap2 | GenericMap2 | +| generic.go:41:6:41:19 | GenericChannel | GenericChannel | +| generic.go:42:6:42:14 | MyMapType | MyMapType | +| generic.go:43:6:43:17 | GenericNamed | GenericNamed | +| generic.go:44:6:44:16 | MyFuncType1 | MyFuncType1 | +| generic.go:45:6:45:16 | MyFuncType2 | MyFuncType2 | +| generic.go:47:6:47:16 | MyInterface | MyInterface | +| generic.go:67:6:67:22 | HasBlankTypeParam | HasBlankTypeParam | +| generic.go:68:6:68:23 | HasBlankTypeParams | HasBlankTypeParams | +| generic.go:82:6:82:14 | GenericArray | GenericArray | +| generic.go:84:6:84:21 | GenericSignature | GenericSignature | +| generic.go:85:6:85:26 | GenericSignature | GenericSignature | +| interface.go:3:6:3:7 | i0 | i0 | +| interface.go:5:6:5:7 | i1 | i1 | +| interface.go:9:6:9:7 | i2 | i2 | +| interface.go:13:6:13:7 | i3 | i3 | +| interface.go:18:6:18:7 | i4 | i4 | +| interface.go:23:6:23:7 | i5 | i5 | +| interface.go:28:6:28:7 | i6 | i6 | +| interface.go:34:6:34:7 | i7 | i7 | +| interface.go:41:6:41:7 | i8 | i8 | +| interface.go:47:6:47:7 | i9 | i9 | +| interface.go:52:6:52:8 | i10 | i10 | +| interface.go:57:6:57:8 | i11 | i11 | +| interface.go:63:6:63:8 | i12 | i12 | +| interface.go:69:6:69:8 | i13 | i13 | +| interface.go:75:6:75:8 | i14 | i14 | +| interface.go:81:6:81:8 | i15 | i15 | +| interface.go:87:6:87:8 | i16 | i16 | +| interface.go:91:6:91:8 | i17 | i17 | +| interface.go:95:6:95:8 | i18 | i18 | +| interface.go:101:6:101:8 | i19 | i19 | +| interface.go:105:6:105:8 | i20 | i20 | +| interface.go:110:6:110:19 | testComparable | testComparable | +| interface.go:111:6:111:20 | testComparable0 | testComparable0 | +| interface.go:112:6:112:20 | testComparable1 | testComparable1 | +| interface.go:113:6:113:20 | testComparable2 | testComparable2 | +| interface.go:114:6:114:20 | testComparable3 | testComparable3 | +| interface.go:115:6:115:20 | testComparable4 | testComparable4 | +| interface.go:116:6:116:20 | testComparable5 | testComparable5 | +| interface.go:117:6:117:20 | testComparable6 | testComparable6 | +| interface.go:118:6:118:20 | testComparable7 | testComparable7 | +| interface.go:119:6:119:20 | testComparable8 | testComparable8 | +| interface.go:120:6:120:20 | testComparable9 | testComparable9 | +| interface.go:121:6:121:21 | testComparable10 | testComparable10 | +| interface.go:122:6:122:21 | testComparable11 | testComparable11 | +| interface.go:123:6:123:21 | testComparable12 | testComparable12 | +| interface.go:124:6:124:21 | testComparable13 | testComparable13 | +| interface.go:125:6:125:21 | testComparable14 | testComparable14 | +| interface.go:126:6:126:21 | testComparable15 | testComparable15 | +| interface.go:127:6:127:21 | testComparable16 | testComparable16 | +| interface.go:128:6:128:21 | testComparable17 | testComparable17 | +| interface.go:129:6:129:21 | testComparable18 | testComparable18 | +| interface.go:130:6:130:21 | testComparable19 | testComparable19 | +| interface.go:131:6:131:21 | testComparable20 | testComparable20 | +| interface.go:132:6:132:21 | testComparable21 | testComparable21 | +| interface.go:133:6:133:21 | testComparable22 | testComparable22 | +| interface.go:134:6:134:21 | testComparable23 | testComparable23 | +| pkg1/embedding.go:8:6:8:9 | base | base | +| pkg1/embedding.go:19:6:19:13 | embedder | embedder | +| pkg1/embedding.go:22:6:22:16 | ptrembedder | ptrembedder | +| pkg1/embedding.go:25:6:25:14 | embedder2 | embedder2 | +| pkg1/embedding.go:28:6:28:14 | embedder3 | embedder3 | +| pkg1/embedding.go:35:6:35:14 | embedder4 | embedder4 | +| pkg1/interfaces.go:3:6:3:6 | A | A | +| pkg1/interfaces.go:7:6:7:6 | B | B | +| pkg1/interfaces.go:12:6:12:6 | C | C | +| pkg1/interfaces.go:17:6:17:14 | AEmbedded | AEmbedded | +| pkg1/interfaces.go:21:6:21:7 | AC | AC | +| pkg1/interfaces.go:26:6:26:14 | AExtended | AExtended | +| pkg1/interfaces.go:31:6:31:7 | A2 | A2 | +| pkg1/tst.go:3:6:3:6 | T | T | +| pkg1/tst.go:9:6:9:7 | T2 | T2 | +| pkg1/tst.go:14:6:14:7 | T3 | T3 | +| pkg1/tst.go:19:6:19:7 | T4 | T4 | +| pkg1/tst.go:24:6:24:8 | Foo | Foo | +| pkg1/tst.go:29:6:29:8 | Bar | Bar | +| pkg2/tst.go:3:6:3:6 | T | T | +| pkg2/tst.go:7:6:7:6 | G | G | diff --git a/go/ql/test/library-tests/semmle/go/Types/notype.expected b/go/ql/test/library-tests/semmle/go/Types/notype.expected index 669165864d4..a786b3d1b02 100644 --- a/go/ql/test/library-tests/semmle/go/Types/notype.expected +++ b/go/ql/test/library-tests/semmle/go/Types/notype.expected @@ -1,3 +1,3 @@ -| unknownFunction.go:9:7:9:21 | unknownFunction | invalid type | -| unknownFunction.go:9:7:9:23 | call to unknownFunction | invalid type | -| unknownFunction.go:10:7:10:15 | ...+... | invalid type | +| unknownFunction.go:9:7:9:21 | unknownFunction | file://:0:0:0:0 | invalid type | +| unknownFunction.go:9:7:9:23 | call to unknownFunction | file://:0:0:0:0 | invalid type | +| unknownFunction.go:10:7:10:15 | ...+... | file://:0:0:0:0 | invalid type |