Skip to content

Go: Remove redundant code in IR::ExtractTupleElementInstruction.getResultType() and expand tests #19484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
owen-mc merged 3 commits into from
May 14, 2025
Merged

Go: Remove redundant code in IR::ExtractTupleElementInstruction.getResultType() and expand tests #19484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b064911
Expand test for Extract Tuple Instruction
owen-mc May 13, 2025
7da1ade
Add tests for extracting tuples in `f(g(...))`
owen-mc May 13, 2025
933e01b
Remove redundant code
owen-mc May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions go/ql/lib/semmle/go/controlflow/IR.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
)
Expand Down
16 changes: 10 additions & 6 deletions go/ql/test/library-tests/semmle/go/IR/test.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 11 additions & 0 deletions go/ql/test/library-tests/semmle/go/IR/test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 3 additions & 2 deletions go/ql/test/library-tests/semmle/go/IR/test.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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