Skip to content

Commit b8cad66

Browse files
committed
Update test results
1 parent d97cda7 commit b8cad66

11 files changed

+21
-0
lines changed

go/extractor/extractor.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,8 @@ func extractObjects(tw *trap.Writer, scope *types.Scope, scopeLabel trap.Label)
478478
// Populate type parameter parents for named types.
479479
if typeNameObj, ok := obj.(*types.TypeName); ok {
480480
if tp, ok := typeNameObj.Type().(*types.Named); ok && !typeNameObj.IsAlias() {
481+
// `typeNameObj` can only be an alias in versions of Go
482+
// before 1.24.
481483
populateTypeParamParents(tp.TypeParams(), obj)
482484
} else if tp, ok := typeNameObj.Type().(*types.Alias); ok {
483485
populateTypeParamParents(tp.TypeParams(), obj)

go/ql/test/library-tests/semmle/go/Types/Aliases.expected

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@ entities
1414
| aliases.go | aliases.go:22:6:22:6 | T | 1 | aliases.go:19:6:19:7 | S3 |
1515
| aliases.go | aliases.go:25:6:25:6 | H | 1 | file://:0:0:0:0 | signature type |
1616
| aliases.go | aliases.go:25:8:25:11 | Afs3 | 1 | aliases.go:19:6:19:7 | S3 |
17+
| aliases.go | aliases.go:29:6:29:11 | MyType | 1 | aliases.go:29:6:29:11 | MyType |
18+
| aliases.go | aliases.go:29:13:29:19 | MyTypeT | 1 | file://:0:0:0:0 | type parameter type |
19+
| aliases.go | aliases.go:29:34:29:34 | x | 1 | file://:0:0:0:0 | type parameter type |
20+
| aliases.go | aliases.go:32:6:32:16 | MyTypeAlias | 1 | aliases.go:29:6:29:11 | MyType |
21+
| aliases.go | aliases.go:32:18:32:29 | MyTypeAliasT | 1 | file://:0:0:0:0 | type parameter type |
22+
| aliases.go | aliases.go:34:6:34:19 | useMyTypeAlias | 1 | file://:0:0:0:0 | signature type |
23+
| aliases.go | aliases.go:34:21:34:21 | a | 1 | aliases.go:29:6:29:11 | MyType |
24+
| aliases.go | aliases.go:35:2:35:2 | b | 1 | aliases.go:29:6:29:11 | MyType |
1725
#select
1826
| F | func(struct { x int }) int |
1927
| G | func(struct { x int }) int |

go/ql/test/library-tests/semmle/go/Types/Field_getPackage.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
| aliases.go:6:26:6:26 | x | package codeql-go-types |
22
| aliases.go:8:26:8:26 | x | package codeql-go-types |
33
| aliases.go:19:17:19:17 | x | package codeql-go-types |
4+
| aliases.go:29:34:29:34 | x | package codeql-go-types |
45
| cyclic.go:4:3:4:3 | s | package codeql-go-types |
56
| cyclic.go:8:3:8:3 | u | package codeql-go-types |
67
| cyclic.go:9:2:9:2 | f | package codeql-go-types |

go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName2.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
| aliases.go:6:26:6:26 | x | codeql-go-types.S3 | x |
22
| aliases.go:8:26:8:26 | x | codeql-go-types.S3 | x |
33
| aliases.go:19:17:19:17 | x | codeql-go-types.S3 | x |
4+
| aliases.go:29:34:29:34 | x | codeql-go-types.MyType | x |
45
| cyclic.go:4:3:4:3 | s | codeql-go-types.s | s |
56
| cyclic.go:8:3:8:3 | u | codeql-go-types.t | u |
67
| cyclic.go:8:3:8:3 | u | codeql-go-types.u | u |

go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName3.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
| aliases.go:6:26:6:26 | x | codeql-go-types | S3 | x |
22
| aliases.go:8:26:8:26 | x | codeql-go-types | S3 | x |
33
| aliases.go:19:17:19:17 | x | codeql-go-types | S3 | x |
4+
| aliases.go:29:34:29:34 | x | codeql-go-types | MyType | x |
45
| cyclic.go:4:3:4:3 | s | codeql-go-types | s | s |
56
| cyclic.go:8:3:8:3 | u | codeql-go-types | t | u |
67
| cyclic.go:8:3:8:3 | u | codeql-go-types | u | u |

go/ql/test/library-tests/semmle/go/Types/GenericTypeInstantiationExpr.expected

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
| aliases.go:32:38:32:57 | generic type instantiation expression | aliases.go:32:38:32:43 | MyType | 0 | aliases.go:32:45:32:56 | MyTypeAliasT |
2+
| aliases.go:34:23:34:41 | generic type instantiation expression | aliases.go:34:23:34:33 | MyTypeAlias | 0 | aliases.go:34:35:34:40 | string |
3+
| aliases.go:35:7:35:25 | generic type instantiation expression | aliases.go:35:7:35:17 | MyTypeAlias | 0 | aliases.go:35:19:35:24 | string |
14
| generic.go:12:16:12:40 | generic type instantiation expression | generic.go:12:16:12:37 | CircularGenericStruct1 | 0 | generic.go:12:39:12:39 | T |
25
| generic.go:16:7:16:31 | generic type instantiation expression | generic.go:16:7:16:28 | CircularGenericStruct1 | 0 | generic.go:16:30:16:30 | T |
36
| generic.go:20:14:20:30 | generic type instantiation expression | generic.go:20:14:20:27 | GenericStruct1 | 0 | generic.go:20:29:20:29 | S |

go/ql/test/library-tests/semmle/go/Types/QualifiedNames.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
| aliases.go:19:6:19:7 | S3 | codeql-go-types.S3 |
2+
| aliases.go:29:6:29:11 | MyType | codeql-go-types.MyType |
23
| cyclic.go:3:6:3:6 | s | codeql-go-types.s |
34
| cyclic.go:7:6:7:6 | t | codeql-go-types.t |
45
| cyclic.go:12:6:12:6 | u | codeql-go-types.u |

go/ql/test/library-tests/semmle/go/Types/SignatureType_getNumParameter.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
| aliases.go:10:1:12:1 | function declaration | 1 |
22
| aliases.go:14:1:16:1 | function declaration | 1 |
33
| aliases.go:25:1:27:1 | function declaration | 1 |
4+
| aliases.go:34:1:38:1 | function declaration | 1 |
45
| depth.go:22:1:25:1 | function declaration | 0 |
56
| generic.go:70:1:72:1 | function declaration | 1 |
67
| generic.go:74:1:80:1 | function declaration | 1 |

go/ql/test/library-tests/semmle/go/Types/SignatureType_getNumResult.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
| aliases.go:10:1:12:1 | function declaration | 1 |
22
| aliases.go:14:1:16:1 | function declaration | 1 |
33
| aliases.go:25:1:27:1 | function declaration | 1 |
4+
| aliases.go:34:1:38:1 | function declaration | 1 |
45
| depth.go:22:1:25:1 | function declaration | 0 |
56
| generic.go:70:1:72:1 | function declaration | 1 |
67
| generic.go:74:1:80:1 | function declaration | 0 |

go/ql/test/library-tests/semmle/go/Types/StructFields.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
| aliases.go:19:6:19:7 | S3 | aliases.go:6:18:6:37 | struct type | x | int |
22
| aliases.go:19:6:19:7 | S3 | aliases.go:8:18:8:37 | struct type | x | int |
33
| aliases.go:19:6:19:7 | S3 | aliases.go:19:9:19:23 | struct type | x | int |
4+
| aliases.go:29:6:29:11 | MyType | aliases.go:29:26:29:44 | struct type | x | MyTypeT |
45
| cyclic.go:3:6:3:6 | s | cyclic.go:3:8:5:1 | struct type | s | * s |
56
| cyclic.go:7:6:7:6 | t | cyclic.go:7:8:10:1 | struct type | f | int |
67
| cyclic.go:7:6:7:6 | t | cyclic.go:7:8:10:1 | struct type | t | t |

0 commit comments

Comments
 (0)