Skip to content

CFG: Workaround in test output for origin/target pairs with multiple edges #11341

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
hvitved merged 4 commits into from
Nov 21, 2022
Merged

CFG: Workaround in test output for origin/target pairs with multiple edges #11341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c9431d
CFG: Workaround in test output for source/sink pairs with multiple edges
hvitved Nov 21, 2022
e7ed056
Sync files
hvitved Nov 21, 2022
2fac505
Ruby: Update expected test output
hvitved Nov 21, 2022
0d89f57
Swift: Update expected test output
hvitved Nov 21, 2022
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
10 changes: 7 additions & 3 deletions csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImplShared.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,9 +907,13 @@ module TestOutput {

query predicate edges(RelevantNode pred, RelevantNode succ, string attr, string val) {
attr = "semmle.label" and
exists(SuccessorType t | succ = getASuccessor(pred, t) |
if successorTypeIsSimple(t) then val = "" else val = t.toString()
)
val =
strictconcat(SuccessorType t, string s |
succ = getASuccessor(pred, t) and
if successorTypeIsSimple(t) then s = "" else s = t.toString()
|
s, ", " order by s
)
or
attr = "semmle.order" and
val =
Expand Down
4 changes: 2 additions & 2 deletions csharp/ql/test/library-tests/controlflow/graph/NodeGraph.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2775,7 +2775,7 @@ Assert.cs:
#-----| true -> access to parameter b2

# 140| [assertion failure] access to parameter b2
#-----| false -> [assertion failure] access to parameter b3
#-----| false, true -> [assertion failure] access to parameter b3

# 140| access to parameter b2
#-----| false -> [assertion success] access to parameter b3
Expand Down Expand Up @@ -4924,7 +4924,7 @@ ExitMethods.cs:
#-----| -> ...;

# 22| call to method ErrorAlways
#-----| exception(Exception) -> exit M3 (abnormal)
#-----| exception(ArgumentException), exception(Exception) -> exit M3 (abnormal)

# 22| ...;
#-----| -> true
Expand Down
10 changes: 7 additions & 3 deletions ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImplShared.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,9 +907,13 @@ module TestOutput {

query predicate edges(RelevantNode pred, RelevantNode succ, string attr, string val) {
attr = "semmle.label" and
exists(SuccessorType t | succ = getASuccessor(pred, t) |
if successorTypeIsSimple(t) then val = "" else val = t.toString()
)
val =
strictconcat(SuccessorType t, string s |
succ = getASuccessor(pred, t) and
if successorTypeIsSimple(t) then s = "" else s = t.toString()
|
s, ", " order by s
)
or
attr = "semmle.order" and
val =
Expand Down
20 changes: 10 additions & 10 deletions ruby/ql/test/library-tests/controlflow/graph/Cfg.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,7 @@ case.rb:
#-----| -> [ ..., * ]

# 35| [ ..., * ]
#-----| match -> x
#-----| false, match, true -> x
Copy link
Contributor

@aibaars aibaars Nov 21, 2022

Choose a reason for hiding this comment

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

Is this actually right? I wonder where the true and false edges come from.

Copy link
Contributor Author

@hvitved hvitved Nov 21, 2022

Choose a reason for hiding this comment

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

No, this is a bug. It may be addressed already by @hmac's CFG changes, but in all cases, I think we should handle it follow-up.

Copy link
Contributor

@aibaars aibaars Nov 21, 2022

Choose a reason for hiding this comment

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

Perfect!

#-----| no-match -> in ... then ...

# 35| x
Expand All @@ -821,7 +821,7 @@ case.rb:
#-----| -> [ ..., * ]

# 36| [ ..., * ]
#-----| match -> x
#-----| false, match, true -> x
#-----| no-match -> in ... then ...

# 36| x
Expand All @@ -836,7 +836,7 @@ case.rb:

# 37| [ ..., * ]
#-----| raise -> exit case_match_array (abnormal)
#-----| match -> a
#-----| false, match, true -> a

# 37| a
#-----| match -> b
Expand Down Expand Up @@ -881,7 +881,7 @@ case.rb:

# 43| [ *,...,* ]
#-----| raise -> exit case_match_find (abnormal)
#-----| match -> x
#-----| false, match, true -> x

# 43| x
#-----| -> 1
Expand Down Expand Up @@ -931,7 +931,7 @@ case.rb:
#-----| no-match -> in ... then ...

# 49| { ..., ** }
#-----| match -> 1
#-----| false, match, true -> 1
#-----| no-match -> in ... then ...

# 49| 1
Expand All @@ -952,7 +952,7 @@ case.rb:
#-----| no-match -> in ... then ...

# 50| { ..., ** }
#-----| match -> 1
#-----| false, match, true -> 1
#-----| no-match -> in ... then ...

# 50| 1
Expand All @@ -968,7 +968,7 @@ case.rb:

# 51| { ..., ** }
#-----| raise -> exit case_match_hash (abnormal)
#-----| match -> case ...
#-----| false, match, true -> case ...

# 55| case_match_variable
#-----| -> case_match_underscore
Expand Down Expand Up @@ -1372,7 +1372,7 @@ case.rb:

# 91| { ..., ** }
#-----| raise -> exit case_match_various (abnormal)
#-----| match -> case ...
#-----| false, match, true -> case ...

# 95| case_match_guard_no_else
#-----| -> exit case.rb (normal)
Expand Down Expand Up @@ -2559,7 +2559,7 @@ cfg.rb:
#-----| -> type

# 101| value
#-----| no-match -> 42
#-----| false, no-match, true -> 42
#-----| match -> key

# 101| 42
Expand Down Expand Up @@ -6535,7 +6535,7 @@ raise.rb:
#-----| -> m11

# 121| p
#-----| no-match -> self
#-----| false, no-match, true -> self
#-----| match -> self

# 121| call to raise
Expand Down
10 changes: 7 additions & 3 deletions swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImplShared.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,9 +907,13 @@ module TestOutput {

query predicate edges(RelevantNode pred, RelevantNode succ, string attr, string val) {
attr = "semmle.label" and
exists(SuccessorType t | succ = getASuccessor(pred, t) |
if successorTypeIsSimple(t) then val = "" else val = t.toString()
)
val =
strictconcat(SuccessorType t, string s |
succ = getASuccessor(pred, t) and
if successorTypeIsSimple(t) then s = "" else s = t.toString()
|
s, ", " order by s
)
or
attr = "semmle.order" and
val =
Expand Down
8 changes: 4 additions & 4 deletions swift/ql/test/library-tests/controlflow/graph/Cfg.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,14 +250,14 @@ cfg.swift:
#-----| match -> 0

# 33| .error1
#-----| no-match -> ... is ...
#-----| match, no-match -> ... is ...

# 33| ... is ...
#-----| no-match -> call to isZero(x:)
#-----| match, no-match -> call to isZero(x:)
#-----| no-match -> case ...

# 33| .error2
#-----| no-match -> ... is ...
#-----| match, no-match -> ... is ...

# 33| ... is ... where ...
#-----| -> .error2
Expand Down Expand Up @@ -1577,7 +1577,7 @@ cfg.swift:
#-----| -> =~ ... where ...

# 144| =~ ...
#-----| no-match -> ... .&&(_:_:) ...
#-----| match, no-match -> ... .&&(_:_:) ...
#-----| no-match -> case ...

# 144| x
Expand Down