hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-17 01:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19484 from owen-mc/go/minor-fix

Browse Source 
Go: Remove redundant code in `IR::ExtractTupleElementInstruction.getResultType()` and expand tests
This commit is contained in:
Owen Mansel-Chan
2025-05-14 13:49:38 +01:00
committed by GitHub
parent c2f2522262 933e01b3d4
commit 8f5a2a9e29
4 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
go/ql/lib/semmle/go/controlflow/IR.qll
View File

@@ -718,10 +718,6 @@ module IR {
predicate extractsElement(Instruction base, int idx) { base = this.getBase() and idx = i }
override Type getResultType() {
exists(CallExpr c | this.getBase() = evalExprInstruction(c) |
result = c.getTarget().getResultType(i)
)
or
exists(Expr e | this.getBase() = evalExprInstruction(e) |
result = e.getType().(TupleType).getComponentType(pragma[only_bind_into](i))
)

16
go/ql/test/library-tests/semmle/go/IR/test.expected
View File

@@ -1,6 +1,10 @@
| 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 |
| test.go:9:2:9:16 | ... := ...[0] | test.go:9:13:9:16 | <-... | 0 | file://:0:0:0:0 | bool |
| test.go:9:2:9:16 | ... := ...[1] | test.go:9:13:9:16 | <-... | 1 | file://:0:0:0:0 | bool |
| test.go:15:2:15:20 | ... := ...[0] | test.go:15:13:15:20 | index expression | 0 | file://:0:0:0:0 | string |
| test.go:15:2:15:20 | ... := ...[1] | test.go:15:13:15:20 | index expression | 1 | file://:0:0:0:0 | bool |
| test.go:21:2:21:22 | ... := ...[0] | test.go:21:13:21:22 | type assertion | 0 | file://:0:0:0:0 | string |
| test.go:21:2:21:22 | ... := ...[1] | test.go:21:13:21:22 | type assertion | 1 | file://:0:0:0:0 | bool |
| test.go:29:2:29:7 | call to f[0] | test.go:29:4:29:6 | call to g | 0 | file://:0:0:0:0 | int |
| test.go:29:2:29:7 | call to f[1] | test.go:29:4:29:6 | call to g | 1 | file://:0:0:0:0 | int |
| test.go:33:2:33:7 | call to f[0] | test.go:33:4:33:6 | call to v | 0 | file://:0:0:0:0 | int |
| test.go:33:2:33:7 | call to f[1] | test.go:33:4:33:6 | call to v | 1 | file://:0:0:0:0 | int |

11
go/ql/test/library-tests/semmle/go/IR/test.go
View File

@@ -21,3 +21,14 @@ func testTypeAssert() {
got, ok := i.(string)
fmt.Printf("%v %v", got, ok)
}
func f(x, y int) {}
func g() (int, int) { return 0, 0 }
func testNestedFunctionCalls() {
f(g())
// Edge case: when we call a function from a variable, `getTarget()` is not defined
v := g
f(v())
}

5
go/ql/test/library-tests/semmle/go/IR/test.ql
View File

@@ -1,4 +1,5 @@
import go
from IR::ExtractTupleElementInstruction extract
select extract, extract.getResultType()
from IR::ExtractTupleElementInstruction extract, IR::Instruction base, int idx, Type resultType
where extract.extractsElement(base, idx) and resultType = extract.getResultType()
select extract, base, idx, resultType