Skip to content

Commit d16a154

Browse files
committed
Address review comment
1 parent 01c0d4b commit d16a154

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

ruby/ql/consistency-queries/DataFlowConsistency.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ private class MyConsistencyConfiguration extends ConsistencyConfiguration {
1010
or
1111
n instanceof SummaryNode
1212
or
13-
n instanceof SynthHashSplatArgumentsNode
13+
n instanceof SynthHashSplatArgumentNode
1414
}
1515
}

ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ private module Cached {
241241
TSummaryParameterNode(FlowSummaryImpl::Public::SummarizedCallable c, ParameterPosition pos) {
242242
FlowSummaryImpl::Private::summaryParameterNodeRange(c, pos)
243243
} or
244-
TSynthHashSplatArgumentsNode(CfgNodes::ExprNodes::CallCfgNode c) {
244+
TSynthHashSplatArgumentNode(CfgNodes::ExprNodes::CallCfgNode c) {
245245
exists(Argument arg | arg.isArgumentOf(c, any(ArgumentPosition pos | pos.isKeyword(_))))
246246
}
247247

@@ -422,7 +422,7 @@ predicate nodeIsHidden(Node n) {
422422
or
423423
n instanceof SynthHashSplatParameterNode
424424
or
425-
n instanceof SynthHashSplatArgumentsNode
425+
n instanceof SynthHashSplatArgumentNode
426426
}
427427

428428
/** An SSA definition, viewed as a node in a data flow graph. */
@@ -602,7 +602,7 @@ private module ParameterNodes {
602602
* ```
603603
*
604604
* where direct keyword matching is possible, since we construct a synthesized hash
605-
* splat argument (`SynthHashSplatArgumentsNode`) at the call site, which means that
605+
* splat argument (`SynthHashSplatArgumentNode`) at the call site, which means that
606606
* `taint(1)` will flow into `p1` both via normal keyword matching and via the synthesized
607607
* nodes (and similarly for `p2`). However, this redunancy is OK since
608608
* (a) it means that type-tracking through keyword arguments also works in most cases,
@@ -764,10 +764,10 @@ private module ArgumentNodes {
764764
* part of the method signature, such that those cannot end up in the hash-splat
765765
* parameter.
766766
*/
767-
class SynthHashSplatArgumentsNode extends ArgumentNode, TSynthHashSplatArgumentsNode {
767+
class SynthHashSplatArgumentNode extends ArgumentNode, TSynthHashSplatArgumentNode {
768768
CfgNodes::ExprNodes::CallCfgNode c;
769769

770-
SynthHashSplatArgumentsNode() { this = TSynthHashSplatArgumentsNode(c) }
770+
SynthHashSplatArgumentNode() { this = TSynthHashSplatArgumentNode(c) }
771771

772772
override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
773773
this.sourceArgumentOf(call.asCall(), pos)
@@ -779,10 +779,10 @@ private module ArgumentNodes {
779779
}
780780
}
781781

782-
private class SynthHashSplatArgumentsNodeImpl extends NodeImpl, TSynthHashSplatArgumentsNode {
782+
private class SynthHashSplatArgumentNodeImpl extends NodeImpl, TSynthHashSplatArgumentNode {
783783
CfgNodes::ExprNodes::CallCfgNode c;
784784

785-
SynthHashSplatArgumentsNodeImpl() { this = TSynthHashSplatArgumentsNode(c) }
785+
SynthHashSplatArgumentNodeImpl() { this = TSynthHashSplatArgumentNode(c) }
786786

787787
override CfgScope getCfgScope() { result = c.getExpr().getCfgScope() }
788788

@@ -1004,7 +1004,7 @@ predicate storeStep(Node node1, ContentSet c, Node node2) {
10041004
or
10051005
// Wrap all keyword arguments in a synthesized hash-splat argument node
10061006
exists(CfgNodes::ExprNodes::CallCfgNode call, ArgumentPosition keywordPos, string name |
1007-
node2 = TSynthHashSplatArgumentsNode(call) and
1007+
node2 = TSynthHashSplatArgumentNode(call) and
10081008
node1.asExpr().(Argument).isArgumentOf(call, keywordPos) and
10091009
keywordPos.isKeyword(name) and
10101010
c = getKeywordContent(name)

0 commit comments

Comments
 (0)