Python: CG trace: Rename ValidRecordedCall to IdentifiedRecordedCall

RasmusWL · RasmusWL · commit 38af1930fe2b · 2020-07-21T10:19:47.000+02:00
diff --git a/python/tools/recorded-call-graph-metrics/ql/RecordedCalls.qll b/python/tools/recorded-call-graph-metrics/ql/RecordedCalls.qll
@@ -113,10 +113,10 @@ private Builtin traverse_qualname(Builtin parent, string qualname) {
 }
 
 /**
- * Class of recorded calls where we can uniquely identify both the `call` and the `callee`.
+ * Class of recorded calls where we can identify both the `call` and the `callee`.
  */
-class ValidRecordedCall extends XMLRecordedCall {
-  ValidRecordedCall() {
+class IdentifiedRecordedCall extends XMLRecordedCall {
+  IdentifiedRecordedCall() {
     strictcount(this.getCall()) = 1 and
     (
       strictcount(this.getXMLCallee().(XMLPythonCallee).getCallee()) = 1
@@ -145,12 +145,12 @@ class ValidRecordedCall extends XMLRecordedCall {
   }
 }
 
-class InvalidRecordedCall extends XMLRecordedCall {
-  InvalidRecordedCall() { not this instanceof ValidRecordedCall }
+class UnidentifiedRecordedCall extends XMLRecordedCall {
+  UnidentifiedRecordedCall() { not this instanceof IdentifiedRecordedCall }
 }
 
 module PointsToBasedCallGraph {
-  class ResolvableRecordedCall extends ValidRecordedCall {
+  class ResolvableRecordedCall extends IdentifiedRecordedCall {
     Value calleeValue;
 
     ResolvableRecordedCall() {
diff --git a/python/tools/recorded-call-graph-metrics/ql/UnidentifiedRecordedCalls.ql b/python/tools/recorded-call-graph-metrics/ql/UnidentifiedRecordedCalls.ql
@@ -1,6 +1,5 @@
 import RecordedCalls
 
-from RecordedCall rc
-where not rc instanceof ValidRecordedCall
+from UnidentifiedRecordedCall rc, XMLCall xml_call
 select "Could not uniquely identify this recorded call (either call or callee was not uniquely identified)",
-  rc, rc.call_filename(), rc.call_linenum(), rc.call_inst_index()
+  rc, rc.getXMLCall().get_filename_data(), rc.getXMLCall().get_linenum_data(), rc.getXMLCall().get_inst_index_data()

Original file line number	Diff line number	Diff line change
`@@ -113,10 +113,10 @@ private Builtin traverse_qualname(Builtin parent, string qualname) {`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`/**`
`116`		- * Class of recorded calls where we can uniquely identify both the `call` and the `callee`.
	`116`	+ * Class of recorded calls where we can identify both the `call` and the `callee`.
`117`	`117`	`*/`
`118`		`-class ValidRecordedCall extends XMLRecordedCall {`
`119`		`- ValidRecordedCall() {`
	`118`	`+class IdentifiedRecordedCall extends XMLRecordedCall {`
	`119`	`+ IdentifiedRecordedCall() {`
`120`	`120`	`strictcount(this.getCall()) = 1 and`
`121`	`121`	`(`
`122`	`122`	`strictcount(this.getXMLCallee().(XMLPythonCallee).getCallee()) = 1`
`@@ -145,12 +145,12 @@ class ValidRecordedCall extends XMLRecordedCall {`
`145`	`145`	`}`
`146`	`146`	`}`
`147`	`147`
`148`		`-class InvalidRecordedCall extends XMLRecordedCall {`
`149`		`- InvalidRecordedCall() { not this instanceof ValidRecordedCall }`
	`148`	`+class UnidentifiedRecordedCall extends XMLRecordedCall {`
	`149`	`+ UnidentifiedRecordedCall() { not this instanceof IdentifiedRecordedCall }`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`module PointsToBasedCallGraph {`
`153`		`- class ResolvableRecordedCall extends ValidRecordedCall {`
	`153`	`+ class ResolvableRecordedCall extends IdentifiedRecordedCall {`
`154`	`154`	`Value calleeValue;`
`155`	`155`
`156`	`156`	`ResolvableRecordedCall() {`