C#/Ruby: Add fields as per review comments.

aschackmull · aschackmull · commit 2d616d494e8b · 2023-06-13T11:26:30.000+02:00
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll
@@ -1125,16 +1125,14 @@ private module ParameterNodes {
 
   /** A parameter for a library callable with a flow summary. */
   class SummaryParameterNode extends ParameterNodeImpl, FlowSummaryNode {
-    SummaryParameterNode() {
-      FlowSummaryImpl::Private::summaryParameterNode(this.getSummaryNode(), _)
-    }
+    private ParameterPosition pos_;
 
-    private ParameterPosition getPosition() {
-      FlowSummaryImpl::Private::summaryParameterNode(this.getSummaryNode(), result)
+    SummaryParameterNode() {
+      FlowSummaryImpl::Private::summaryParameterNode(this.getSummaryNode(), pos_)
     }
 
     override predicate isParameterOf(DataFlowCallable c, ParameterPosition pos) {
-      this.getSummarizedCallable() = c.asSummarizedCallable() and pos = this.getPosition()
+      this.getSummarizedCallable() = c.asSummarizedCallable() and pos = pos_
     }
   }
 }
@@ -1305,12 +1303,15 @@ private module ArgumentNodes {
   }
 
   private class SummaryArgumentNode extends FlowSummaryNode, ArgumentNodeImpl {
+    private DataFlowCall call_;
+    private ArgumentPosition pos_;
+
     SummaryArgumentNode() {
-      FlowSummaryImpl::Private::summaryArgumentNode(_, this.getSummaryNode(), _)
+      FlowSummaryImpl::Private::summaryArgumentNode(call_, this.getSummaryNode(), pos_)
     }
 
     override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
-      FlowSummaryImpl::Private::summaryArgumentNode(call, this.getSummaryNode(), pos)
+      call = call_ and pos = pos_
     }
   }
 }
@@ -1593,11 +1594,14 @@ private module OutNodes {
   }
 
   private class SummaryOutNode extends FlowSummaryNode, OutNode {
-    SummaryOutNode() { FlowSummaryImpl::Private::summaryOutNode(_, this.getSummaryNode(), _) }
+    private DataFlowCall call;
+    private ReturnKind kind_;
 
-    override DataFlowCall getCall(ReturnKind kind) {
-      FlowSummaryImpl::Private::summaryOutNode(result, this.getSummaryNode(), kind)
+    SummaryOutNode() {
+      FlowSummaryImpl::Private::summaryOutNode(call, this.getSummaryNode(), kind_)
     }
+
+    override DataFlowCall getCall(ReturnKind kind) { result = call and kind = kind_ }
   }
 }
 
@@ -2120,15 +2124,14 @@ private module PostUpdateNodes {
   }
 
   private class SummaryPostUpdateNode extends FlowSummaryNode, PostUpdateNode {
+    private FlowSummaryImpl::Private::SummaryNode preUpdateNode;
+
     SummaryPostUpdateNode() {
-      FlowSummaryImpl::Private::summaryPostUpdateNode(this.getSummaryNode(), _) and
+      FlowSummaryImpl::Private::summaryPostUpdateNode(this.getSummaryNode(), preUpdateNode) and
       not summaryPostUpdateNodeIsOutOrRef(this, _)
     }
 
-    override Node getPreUpdateNode() {
-      FlowSummaryImpl::Private::summaryPostUpdateNode(this.getSummaryNode(),
-        result.(FlowSummaryNode).getSummaryNode())
-    }
+    override Node getPreUpdateNode() { result.(FlowSummaryNode).getSummaryNode() = preUpdateNode }
   }
 }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll
@@ -570,7 +570,7 @@ module Private {
       summaryParameterNodeRange(c, pos)
     }
 
-  class SummaryNode extends TSummaryNode {
+  abstract class SummaryNode extends TSummaryNode {
     abstract string toString();
 
     abstract SummarizedCallable getSummarizedCallable();
diff --git a/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll b/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll
@@ -570,7 +570,7 @@ module Private {
       summaryParameterNodeRange(c, pos)
     }
 
-  class SummaryNode extends TSummaryNode {
+  abstract class SummaryNode extends TSummaryNode {
     abstract string toString();
 
     abstract SummarizedCallable getSummarizedCallable();
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll
@@ -570,7 +570,7 @@ module Private {
       summaryParameterNodeRange(c, pos)
     }
 
-  class SummaryNode extends TSummaryNode {
+  abstract class SummaryNode extends TSummaryNode {
     abstract string toString();
 
     abstract SummarizedCallable getSummarizedCallable();
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll
@@ -570,7 +570,7 @@ module Private {
       summaryParameterNodeRange(c, pos)
     }
 
-  class SummaryNode extends TSummaryNode {
+  abstract class SummaryNode extends TSummaryNode {
     abstract string toString();
 
     abstract SummarizedCallable getSummarizedCallable();
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
@@ -751,18 +751,16 @@ private module ParameterNodes {
 
   /** A parameter for a library callable with a flow summary. */
   class SummaryParameterNode extends ParameterNodeImpl, FlowSummaryNode {
-    SummaryParameterNode() {
-      FlowSummaryImpl::Private::summaryParameterNode(this.getSummaryNode(), _)
-    }
+    private ParameterPosition pos_;
 
-    private ParameterPosition getPosition() {
-      FlowSummaryImpl::Private::summaryParameterNode(this.getSummaryNode(), result)
+    SummaryParameterNode() {
+      FlowSummaryImpl::Private::summaryParameterNode(this.getSummaryNode(), pos_)
     }
 
     override Parameter getParameter() { none() }
 
     override predicate isParameterOf(DataFlowCallable c, ParameterPosition pos) {
-      this.getSummarizedCallable() = c.asLibraryCallable() and pos = this.getPosition()
+      this.getSummarizedCallable() = c.asLibraryCallable() and pos = pos_
     }
   }
 }
@@ -847,16 +845,19 @@ private module ArgumentNodes {
   }
 
   private class SummaryArgumentNode extends FlowSummaryNode, ArgumentNode {
+    private DataFlowCall call_;
+    private ArgumentPosition pos_;
+
     SummaryArgumentNode() {
-      FlowSummaryImpl::Private::summaryArgumentNode(_, this.getSummaryNode(), _)
+      FlowSummaryImpl::Private::summaryArgumentNode(call_, this.getSummaryNode(), pos_)
     }
 
     override predicate sourceArgumentOf(CfgNodes::ExprNodes::CallCfgNode call, ArgumentPosition pos) {
       none()
     }
 
     override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
-      FlowSummaryImpl::Private::summaryArgumentNode(call, this.getSummaryNode(), pos)
+      call = call_ and pos = pos_
     }
   }
 
@@ -1063,11 +1064,14 @@ private module OutNodes {
   }
 
   private class SummaryOutNode extends FlowSummaryNode, OutNode {
-    SummaryOutNode() { FlowSummaryImpl::Private::summaryOutNode(_, this.getSummaryNode(), _) }
+    private DataFlowCall call;
+    private ReturnKind kind_;
 
-    override DataFlowCall getCall(ReturnKind kind) {
-      FlowSummaryImpl::Private::summaryOutNode(result, this.getSummaryNode(), kind)
+    SummaryOutNode() {
+      FlowSummaryImpl::Private::summaryOutNode(call, this.getSummaryNode(), kind_)
     }
+
+    override DataFlowCall getCall(ReturnKind kind) { result = call and kind = kind_ }
   }
 }
 
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll
@@ -570,7 +570,7 @@ module Private {
       summaryParameterNodeRange(c, pos)
     }
 
-  class SummaryNode extends TSummaryNode {
+  abstract class SummaryNode extends TSummaryNode {
     abstract string toString();
 
     abstract SummarizedCallable getSummarizedCallable();
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll b/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll
@@ -570,7 +570,7 @@ module Private {
       summaryParameterNodeRange(c, pos)
     }
 
-  class SummaryNode extends TSummaryNode {
+  abstract class SummaryNode extends TSummaryNode {
     abstract string toString();
 
     abstract SummarizedCallable getSummarizedCallable();

Original file line number	Diff line number	Diff line change
`@@ -1125,16 +1125,14 @@ private module ParameterNodes {`
`1125`	`1125`
`1126`	`1126`	`/** A parameter for a library callable with a flow summary. */`
`1127`	`1127`	`class SummaryParameterNode extends ParameterNodeImpl, FlowSummaryNode {`
`1128`		`- SummaryParameterNode() {`
`1129`		`- FlowSummaryImpl::Private::summaryParameterNode(this.getSummaryNode(), _)`
`1130`		`- }`
	`1128`	`+ private ParameterPosition pos_;`
`1131`	`1129`
`1132`		`- private ParameterPosition getPosition() {`
`1133`		`- FlowSummaryImpl::Private::summaryParameterNode(this.getSummaryNode(), result)`
	`1130`	`+ SummaryParameterNode() {`
	`1131`	`+ FlowSummaryImpl::Private::summaryParameterNode(this.getSummaryNode(), pos_)`
`1134`	`1132`	`}`
`1135`	`1133`
`1136`	`1134`	`override predicate isParameterOf(DataFlowCallable c, ParameterPosition pos) {`
`1137`		`- this.getSummarizedCallable() = c.asSummarizedCallable() and pos = this.getPosition()`
	`1135`	`+ this.getSummarizedCallable() = c.asSummarizedCallable() and pos = pos_`
`1138`	`1136`	`}`
`1139`	`1137`	`}`
`1140`	`1138`	`}`
`@@ -1305,12 +1303,15 @@ private module ArgumentNodes {`
`1305`	`1303`	`}`
`1306`	`1304`
`1307`	`1305`	`private class SummaryArgumentNode extends FlowSummaryNode, ArgumentNodeImpl {`
	`1306`	`+ private DataFlowCall call_;`
	`1307`	`+ private ArgumentPosition pos_;`
	`1308`	`+`
`1308`	`1309`	`SummaryArgumentNode() {`
`1309`		`- FlowSummaryImpl::Private::summaryArgumentNode(_, this.getSummaryNode(), _)`
	`1310`	`+ FlowSummaryImpl::Private::summaryArgumentNode(call_, this.getSummaryNode(), pos_)`
`1310`	`1311`	`}`
`1311`	`1312`
`1312`	`1313`	`override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {`
`1313`		`- FlowSummaryImpl::Private::summaryArgumentNode(call, this.getSummaryNode(), pos)`
	`1314`	`+ call = call_ and pos = pos_`
`1314`	`1315`	`}`
`1315`	`1316`	`}`
`1316`	`1317`	`}`
`@@ -1593,11 +1594,14 @@ private module OutNodes {`
`1593`	`1594`	`}`
`1594`	`1595`
`1595`	`1596`	`private class SummaryOutNode extends FlowSummaryNode, OutNode {`
`1596`		`- SummaryOutNode() { FlowSummaryImpl::Private::summaryOutNode(_, this.getSummaryNode(), _) }`
	`1597`	`+ private DataFlowCall call;`
	`1598`	`+ private ReturnKind kind_;`
`1597`	`1599`
`1598`		`- override DataFlowCall getCall(ReturnKind kind) {`
`1599`		`- FlowSummaryImpl::Private::summaryOutNode(result, this.getSummaryNode(), kind)`
	`1600`	`+ SummaryOutNode() {`
	`1601`	`+ FlowSummaryImpl::Private::summaryOutNode(call, this.getSummaryNode(), kind_)`
`1600`	`1602`	`}`
	`1603`	`+`
	`1604`	`+ override DataFlowCall getCall(ReturnKind kind) { result = call and kind = kind_ }`
`1601`	`1605`	`}`
`1602`	`1606`	`}`
`1603`	`1607`
`@@ -2120,15 +2124,14 @@ private module PostUpdateNodes {`
`2120`	`2124`	`}`
`2121`	`2125`
`2122`	`2126`	`private class SummaryPostUpdateNode extends FlowSummaryNode, PostUpdateNode {`
	`2127`	`+ private FlowSummaryImpl::Private::SummaryNode preUpdateNode;`
	`2128`	`+`
`2123`	`2129`	`SummaryPostUpdateNode() {`
`2124`		`- FlowSummaryImpl::Private::summaryPostUpdateNode(this.getSummaryNode(), _) and`
	`2130`	`+ FlowSummaryImpl::Private::summaryPostUpdateNode(this.getSummaryNode(), preUpdateNode) and`
`2125`	`2131`	`not summaryPostUpdateNodeIsOutOrRef(this, _)`
`2126`	`2132`	`}`
`2127`	`2133`
`2128`		`- override Node getPreUpdateNode() {`
`2129`		`- FlowSummaryImpl::Private::summaryPostUpdateNode(this.getSummaryNode(),`
`2130`		`- result.(FlowSummaryNode).getSummaryNode())`
`2131`		`- }`
	`2134`	`+ override Node getPreUpdateNode() { result.(FlowSummaryNode).getSummaryNode() = preUpdateNode }`
`2132`	`2135`	`}`
`2133`	`2136`	`}`
`2134`	`2137`
Original file line number	Diff line number	Diff line change
`@@ -570,7 +570,7 @@ module Private {`
`570`	`570`	`summaryParameterNodeRange(c, pos)`
`571`	`571`	`}`
`572`	`572`
`573`		`- class SummaryNode extends TSummaryNode {`
	`573`	`+ abstract class SummaryNode extends TSummaryNode {`
`574`	`574`	`abstract string toString();`
`575`	`575`
`576`	`576`	`abstract SummarizedCallable getSummarizedCallable();`
Original file line number	Diff line number	Diff line change
`@@ -751,18 +751,16 @@ private module ParameterNodes {`
`751`	`751`
`752`	`752`	`/** A parameter for a library callable with a flow summary. */`
`753`	`753`	`class SummaryParameterNode extends ParameterNodeImpl, FlowSummaryNode {`
`754`		`- SummaryParameterNode() {`
`755`		`- FlowSummaryImpl::Private::summaryParameterNode(this.getSummaryNode(), _)`
`756`		`- }`
	`754`	`+ private ParameterPosition pos_;`
`757`	`755`
`758`		`- private ParameterPosition getPosition() {`
`759`		`- FlowSummaryImpl::Private::summaryParameterNode(this.getSummaryNode(), result)`
	`756`	`+ SummaryParameterNode() {`
	`757`	`+ FlowSummaryImpl::Private::summaryParameterNode(this.getSummaryNode(), pos_)`
`760`	`758`	`}`
`761`	`759`
`762`	`760`	`override Parameter getParameter() { none() }`
`763`	`761`
`764`	`762`	`override predicate isParameterOf(DataFlowCallable c, ParameterPosition pos) {`
`765`		`- this.getSummarizedCallable() = c.asLibraryCallable() and pos = this.getPosition()`
	`763`	`+ this.getSummarizedCallable() = c.asLibraryCallable() and pos = pos_`
`766`	`764`	`}`
`767`	`765`	`}`
`768`	`766`	`}`
`@@ -847,16 +845,19 @@ private module ArgumentNodes {`
`847`	`845`	`}`
`848`	`846`
`849`	`847`	`private class SummaryArgumentNode extends FlowSummaryNode, ArgumentNode {`
	`848`	`+ private DataFlowCall call_;`
	`849`	`+ private ArgumentPosition pos_;`
	`850`	`+`
`850`	`851`	`SummaryArgumentNode() {`
`851`		`- FlowSummaryImpl::Private::summaryArgumentNode(_, this.getSummaryNode(), _)`
	`852`	`+ FlowSummaryImpl::Private::summaryArgumentNode(call_, this.getSummaryNode(), pos_)`
`852`	`853`	`}`
`853`	`854`
`854`	`855`	`override predicate sourceArgumentOf(CfgNodes::ExprNodes::CallCfgNode call, ArgumentPosition pos) {`
`855`	`856`	`none()`
`856`	`857`	`}`
`857`	`858`
`858`	`859`	`override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {`
`859`		`- FlowSummaryImpl::Private::summaryArgumentNode(call, this.getSummaryNode(), pos)`
	`860`	`+ call = call_ and pos = pos_`
`860`	`861`	`}`
`861`	`862`	`}`
`862`	`863`
`@@ -1063,11 +1064,14 @@ private module OutNodes {`
`1063`	`1064`	`}`
`1064`	`1065`
`1065`	`1066`	`private class SummaryOutNode extends FlowSummaryNode, OutNode {`
`1066`		`- SummaryOutNode() { FlowSummaryImpl::Private::summaryOutNode(_, this.getSummaryNode(), _) }`
	`1067`	`+ private DataFlowCall call;`
	`1068`	`+ private ReturnKind kind_;`
`1067`	`1069`
`1068`		`- override DataFlowCall getCall(ReturnKind kind) {`
`1069`		`- FlowSummaryImpl::Private::summaryOutNode(result, this.getSummaryNode(), kind)`
	`1070`	`+ SummaryOutNode() {`
	`1071`	`+ FlowSummaryImpl::Private::summaryOutNode(call, this.getSummaryNode(), kind_)`
`1070`	`1072`	`}`
	`1073`	`+`
	`1074`	`+ override DataFlowCall getCall(ReturnKind kind) { result = call and kind = kind_ }`
`1071`	`1075`	`}`
`1072`	`1076`	`}`
`1073`	`1077`