Skip to content

Ruby: Rework (hash) splat argument/parameter matching #17222

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
merged 6 commits into from
Aug 22, 2024
Merged

Ruby: Rework (hash) splat argument/parameter matching #17222

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6d4f3bd
Ruby: Rework splat argument/parameter matching
hvitved Aug 14, 2024
20dc242
Ruby: Rework hash splat argument/parameter matching
hvitved Aug 14, 2024
c4b0f81
Ruby: Prevent positional matching when preceded by a splat
hvitved Aug 20, 2024
d15e1b5
Ruby: Prevent synthetic splat matching for actual splats at same posi…
hvitved Aug 20, 2024
b0003c0
Ruby: Remove two redundant checks
hvitved Aug 21, 2024
cb1b1da
Ruby: Add another array flow test
hvitved Aug 21, 2024
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
24 changes: 24 additions & 0 deletions ruby/ql/test/library-tests/dataflow/array-flow/array-flow.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2356,6 +2356,16 @@ edges
| array_flow.rb:1686:14:1686:14 | w | array_flow.rb:1690:10:1690:10 | w | provenance | |
| array_flow.rb:1686:18:1686:18 | a [element 2] | array_flow.rb:1686:11:1686:11 | z | provenance | |
| array_flow.rb:1686:18:1686:18 | a [element 3] | array_flow.rb:1686:14:1686:14 | w | provenance | |
| array_flow.rb:1693:10:1693:14 | *args [element 1] | array_flow.rb:1694:17:1694:20 | args [element 1] | provenance | |
| array_flow.rb:1694:16:1694:20 | * ... [element 1] | array_flow.rb:1694:5:1694:21 | call to [] [element 1] | provenance | |
| array_flow.rb:1694:17:1694:20 | args [element 1] | array_flow.rb:1694:16:1694:20 | * ... [element 1] | provenance | |
| array_flow.rb:1697:13:1697:13 | y | array_flow.rb:1699:10:1699:10 | y | provenance | |
| array_flow.rb:1704:5:1704:5 | a [element 1] | array_flow.rb:1705:11:1705:11 | a [element 1] | provenance | |
| array_flow.rb:1704:9:1704:31 | call to m141 [element 1] | array_flow.rb:1704:5:1704:5 | a [element 1] | provenance | |
| array_flow.rb:1704:17:1704:27 | call to source | array_flow.rb:1693:10:1693:14 | *args [element 1] | provenance | |
| array_flow.rb:1704:17:1704:27 | call to source | array_flow.rb:1704:9:1704:31 | call to m141 [element 1] | provenance | |
| array_flow.rb:1705:10:1705:11 | * ... [element 1] | array_flow.rb:1697:13:1697:13 | y | provenance | |
| array_flow.rb:1705:11:1705:11 | a [element 1] | array_flow.rb:1705:10:1705:11 | * ... [element 1] | provenance | |
nodes
| array_flow.rb:2:5:2:5 | a [element 0] | semmle.label | a [element 0] |
| array_flow.rb:2:9:2:20 | * ... [element 0] | semmle.label | * ... [element 0] |
Expand Down Expand Up @@ -4849,11 +4859,23 @@ nodes
| array_flow.rb:1686:18:1686:18 | a [element 3] | semmle.label | a [element 3] |
| array_flow.rb:1689:10:1689:10 | z | semmle.label | z |
| array_flow.rb:1690:10:1690:10 | w | semmle.label | w |
| array_flow.rb:1693:10:1693:14 | *args [element 1] | semmle.label | *args [element 1] |
| array_flow.rb:1694:5:1694:21 | call to [] [element 1] | semmle.label | call to [] [element 1] |
| array_flow.rb:1694:16:1694:20 | * ... [element 1] | semmle.label | * ... [element 1] |
| array_flow.rb:1694:17:1694:20 | args [element 1] | semmle.label | args [element 1] |
| array_flow.rb:1697:13:1697:13 | y | semmle.label | y |
| array_flow.rb:1699:10:1699:10 | y | semmle.label | y |
| array_flow.rb:1704:5:1704:5 | a [element 1] | semmle.label | a [element 1] |
| array_flow.rb:1704:9:1704:31 | call to m141 [element 1] | semmle.label | call to m141 [element 1] |
| array_flow.rb:1704:17:1704:27 | call to source | semmle.label | call to source |
| array_flow.rb:1705:10:1705:11 | * ... [element 1] | semmle.label | * ... [element 1] |
| array_flow.rb:1705:11:1705:11 | a [element 1] | semmle.label | a [element 1] |
subpaths
| array_flow.rb:251:9:251:9 | a [element 2] | array_flow.rb:251:30:251:30 | x | array_flow.rb:253:9:253:25 | call to [] [element 0] | array_flow.rb:251:9:254:7 | call to collect_concat [element] |
| array_flow.rb:507:9:507:9 | a [element 3] | array_flow.rb:507:26:507:26 | x | array_flow.rb:509:9:509:9 | x | array_flow.rb:507:9:510:7 | call to filter_map [element] |
| array_flow.rb:571:9:571:9 | a [element 2] | array_flow.rb:571:24:571:24 | x | array_flow.rb:573:9:573:25 | call to [] [element 0] | array_flow.rb:571:9:574:7 | call to flat_map [element] |
| array_flow.rb:1678:9:1678:9 | a [element 2] | array_flow.rb:1678:19:1678:19 | x | array_flow.rb:1679:9:1679:9 | x | array_flow.rb:1678:9:1680:7 | call to map [element] |
| array_flow.rb:1704:17:1704:27 | call to source | array_flow.rb:1693:10:1693:14 | *args [element 1] | array_flow.rb:1694:5:1694:21 | call to [] [element 1] | array_flow.rb:1704:9:1704:31 | call to m141 [element 1] |
testFailures
arrayLiteral
| array_flow.rb:9:9:9:25 | call to [] |
Expand Down Expand Up @@ -5046,6 +5068,7 @@ arrayLiteral
| array_flow.rb:1668:14:1668:41 | ...[...] |
| array_flow.rb:1677:9:1677:29 | call to [] |
| array_flow.rb:1685:9:1685:44 | call to [] |
| array_flow.rb:1694:5:1694:21 | call to [] |
#select
| array_flow.rb:3:10:3:13 | ...[...] | array_flow.rb:2:10:2:20 | call to source | array_flow.rb:3:10:3:13 | ...[...] | $@ | array_flow.rb:2:10:2:20 | call to source | call to source |
| array_flow.rb:5:10:5:13 | ...[...] | array_flow.rb:2:10:2:20 | call to source | array_flow.rb:5:10:5:13 | ...[...] | $@ | array_flow.rb:2:10:2:20 | call to source | call to source |
Expand Down Expand Up @@ -5749,3 +5772,4 @@ arrayLiteral
| array_flow.rb:1681:10:1681:13 | ...[...] | array_flow.rb:1677:16:1677:28 | call to source | array_flow.rb:1681:10:1681:13 | ...[...] | $@ | array_flow.rb:1677:16:1677:28 | call to source | call to source |
| array_flow.rb:1689:10:1689:10 | z | array_flow.rb:1685:16:1685:28 | call to source | array_flow.rb:1689:10:1689:10 | z | $@ | array_flow.rb:1685:16:1685:28 | call to source | call to source |
| array_flow.rb:1690:10:1690:10 | w | array_flow.rb:1685:31:1685:43 | call to source | array_flow.rb:1690:10:1690:10 | w | $@ | array_flow.rb:1685:31:1685:43 | call to source | call to source |
| array_flow.rb:1699:10:1699:10 | y | array_flow.rb:1704:17:1704:27 | call to source | array_flow.rb:1699:10:1699:10 | y | $@ | array_flow.rb:1704:17:1704:27 | call to source | call to source |
15 changes: 15 additions & 0 deletions ruby/ql/test/library-tests/dataflow/array-flow/array_flow.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1689,3 +1689,18 @@ def m140
sink z # $ hasValueFlow=140.1
sink w # $ hasValueFlow=140.2
end

def m141(*args)
::Array.[](*args)
end

def m142(x, y, z)
sink(x)
sink(y) # $ hasValueFlow=143
sink(z)
end

def m143
a = m141(0, source(143), 1)
m142(*a)
end
1 change: 1 addition & 0 deletions ruby/ql/test/library-tests/dataflow/array-flow/type-tracking-array-flow.expected
View file
Open in desktop
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

__

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yu

Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,5 @@ testFailures
| array_flow.rb:1626:19:1626:70 | # $ hasValueFlow=136.2 $ SPURIOUS hasValueFlow=136.1 | Missing result:hasValueFlow=136.1 |
| array_flow.rb:1626:19:1626:70 | # $ hasValueFlow=136.2 $ SPURIOUS hasValueFlow=136.1 | Missing result:hasValueFlow=136.2 |
| array_flow.rb:1627:19:1627:40 | # $ hasValueFlow=136.1 | Missing result:hasValueFlow=136.1 |
| array_flow.rb:1699:13:1699:32 | # $ hasValueFlow=143 | Missing result:hasValueFlow=143 |
failures
Loading