diff --git a/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll b/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll index af43319f817..dcd1e4b5c0c 100644 --- a/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll +++ b/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll @@ -23,9 +23,9 @@ module Public { * content type, or a return kind. */ class SummaryComponent extends TSummaryComponent { - /** Gets a textual representation of this component used for flow summaries. */ - string getAccessStep() { - result = getAccessStepSpecific(this) + /** Gets a textual representation of this component used for MaD models. */ + string getMadRepresentation() { + result = getMadRepresentationSpecific(this) or exists(ArgumentPosition pos | this = TParameterSummaryComponent(pos) and @@ -46,7 +46,7 @@ module Public { } /** Gets a textual representation of this summary component. */ - string toString() { result = this.getAccessStep() } + string toString() { result = this.getMadRepresentation() } } /** Provides predicates for constructing summary components. */ @@ -127,21 +127,21 @@ module Public { } /** Gets a textual representation of this stack used for MaD models. */ - string getAccessPath() { + string getMadRepresentation() { exists(SummaryComponent head, SummaryComponentStack tail | head = this.head() and tail = this.tail() and - result = tail.getAccessPath() + "." + head.getAccessStep() + result = tail.getMadRepresentation() + "." + head.getMadRepresentation() ) or exists(SummaryComponent c | this = TSingletonSummaryComponentStack(c) and - result = c.getAccessStep() + result = c.getMadRepresentation() ) } /** Gets a textual representation of this stack. */ - string toString() { result = this.getAccessPath() } + string toString() { result = this.getMadRepresentation() } } /** Provides predicates for constructing stacks of summary components. */ @@ -1350,8 +1350,8 @@ module Private { c.relevantSummary(input, output, preservesValue) and csv = c.getCallableCsv() // Callable information - + input.getAccessPath() + ";" // input - + output.getAccessPath() + ";" // output + + input.getMadRepresentation() + ";" // input + + output.getMadRepresentation() + ";" // output + renderKind(preservesValue) + ";" // kind + renderProvenance(c) // provenance ) diff --git a/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImplSpecific.qll b/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImplSpecific.qll index f6b3731fc3d..6ceb33792b4 100644 --- a/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImplSpecific.qll +++ b/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImplSpecific.qll @@ -22,10 +22,10 @@ DataFlowCallable inject(SummarizedCallable c) { result.asSummarizedCallable() = /** Gets the parameter position of the instance parameter. */ ArgumentPosition callbackSelfParameterPosition() { result = -1 } -/** Gets the textual representation of a parameter position in the format used for flow summaries. */ +/** Gets the textual representation of a parameter position in the format used for MaD models. */ string getParameterPosition(ParameterPosition pos) { result = pos.toString() } -/** Gets the textual representation of an argument position in the format used for flow summaries. */ +/** Gets the textual representation of an argument position in the format used for MaD models. */ string getArgumentPosition(ArgumentPosition pos) { result = pos.toString() } /** Gets the synthesized data-flow call for `receiver`. */ @@ -110,8 +110,8 @@ private string getContentSpecific(Content c) { c instanceof PointerContent and result = "Dereference" } -/** Gets the textual representation of the content in the format used for flow summaries. */ -string getAccessStepSpecific(SummaryComponent sc) { +/** Gets the textual representation of the content in the format used for MaD models. */ +string getMadRepresentationSpecific(SummaryComponent sc) { exists(Content c | sc = TContentSummaryComponent(c) and result = getContentSpecific(c)) or exists(ReturnKind rk | diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll index af43319f817..dcd1e4b5c0c 100644 --- a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll +++ b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll @@ -23,9 +23,9 @@ module Public { * content type, or a return kind. */ class SummaryComponent extends TSummaryComponent { - /** Gets a textual representation of this component used for flow summaries. */ - string getAccessStep() { - result = getAccessStepSpecific(this) + /** Gets a textual representation of this component used for MaD models. */ + string getMadRepresentation() { + result = getMadRepresentationSpecific(this) or exists(ArgumentPosition pos | this = TParameterSummaryComponent(pos) and @@ -46,7 +46,7 @@ module Public { } /** Gets a textual representation of this summary component. */ - string toString() { result = this.getAccessStep() } + string toString() { result = this.getMadRepresentation() } } /** Provides predicates for constructing summary components. */ @@ -127,21 +127,21 @@ module Public { } /** Gets a textual representation of this stack used for MaD models. */ - string getAccessPath() { + string getMadRepresentation() { exists(SummaryComponent head, SummaryComponentStack tail | head = this.head() and tail = this.tail() and - result = tail.getAccessPath() + "." + head.getAccessStep() + result = tail.getMadRepresentation() + "." + head.getMadRepresentation() ) or exists(SummaryComponent c | this = TSingletonSummaryComponentStack(c) and - result = c.getAccessStep() + result = c.getMadRepresentation() ) } /** Gets a textual representation of this stack. */ - string toString() { result = this.getAccessPath() } + string toString() { result = this.getMadRepresentation() } } /** Provides predicates for constructing stacks of summary components. */ @@ -1350,8 +1350,8 @@ module Private { c.relevantSummary(input, output, preservesValue) and csv = c.getCallableCsv() // Callable information - + input.getAccessPath() + ";" // input - + output.getAccessPath() + ";" // output + + input.getMadRepresentation() + ";" // input + + output.getMadRepresentation() + ";" // output + renderKind(preservesValue) + ";" // kind + renderProvenance(c) // provenance ) diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImplSpecific.qll b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImplSpecific.qll index aefc29f2fb3..8bdea7b9e49 100644 --- a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImplSpecific.qll +++ b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImplSpecific.qll @@ -193,8 +193,8 @@ private string getContentSpecific(Content c) { c instanceof MapValueContent and result = "MapValue" } -/** Gets the textual representation of the content in the format used for flow summaries. */ -string getAccessStepSpecific(SummaryComponent sc) { +/** Gets the textual representation of the content in the format used for MaD models. */ +string getMadRepresentationSpecific(SummaryComponent sc) { exists(Content c | sc = TContentSummaryComponent(c) and result = getContentSpecific(c)) } @@ -203,10 +203,10 @@ private string positionToString(int pos) { if pos = -1 then result = "this" else result = pos.toString() } -/** Gets the textual representation of a parameter position in the format used for flow summaries. */ +/** Gets the textual representation of a parameter position in the format used for MaD models. */ string getParameterPosition(ParameterPosition pos) { result = positionToString(pos) } -/** Gets the textual representation of an argument position in the format used for flow summaries. */ +/** Gets the textual representation of an argument position in the format used for MaD models. */ string getArgumentPosition(ArgumentPosition pos) { result = positionToString(pos) } /** Holds if input specification component `c` needs a reference. */ diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll index af43319f817..dcd1e4b5c0c 100644 --- a/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll +++ b/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll @@ -23,9 +23,9 @@ module Public { * content type, or a return kind. */ class SummaryComponent extends TSummaryComponent { - /** Gets a textual representation of this component used for flow summaries. */ - string getAccessStep() { - result = getAccessStepSpecific(this) + /** Gets a textual representation of this component used for MaD models. */ + string getMadRepresentation() { + result = getMadRepresentationSpecific(this) or exists(ArgumentPosition pos | this = TParameterSummaryComponent(pos) and @@ -46,7 +46,7 @@ module Public { } /** Gets a textual representation of this summary component. */ - string toString() { result = this.getAccessStep() } + string toString() { result = this.getMadRepresentation() } } /** Provides predicates for constructing summary components. */ @@ -127,21 +127,21 @@ module Public { } /** Gets a textual representation of this stack used for MaD models. */ - string getAccessPath() { + string getMadRepresentation() { exists(SummaryComponent head, SummaryComponentStack tail | head = this.head() and tail = this.tail() and - result = tail.getAccessPath() + "." + head.getAccessStep() + result = tail.getMadRepresentation() + "." + head.getMadRepresentation() ) or exists(SummaryComponent c | this = TSingletonSummaryComponentStack(c) and - result = c.getAccessStep() + result = c.getMadRepresentation() ) } /** Gets a textual representation of this stack. */ - string toString() { result = this.getAccessPath() } + string toString() { result = this.getMadRepresentation() } } /** Provides predicates for constructing stacks of summary components. */ @@ -1350,8 +1350,8 @@ module Private { c.relevantSummary(input, output, preservesValue) and csv = c.getCallableCsv() // Callable information - + input.getAccessPath() + ";" // input - + output.getAccessPath() + ";" // output + + input.getMadRepresentation() + ";" // input + + output.getMadRepresentation() + ";" // output + renderKind(preservesValue) + ";" // kind + renderProvenance(c) // provenance ) diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImplSpecific.qll b/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImplSpecific.qll index 9214e0b6636..a43441f8f14 100644 --- a/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImplSpecific.qll +++ b/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImplSpecific.qll @@ -146,15 +146,15 @@ private string getContentSpecific(Content cs) { exists(string attr | cs = TAttributeContent(attr) and result = "Attribute[" + attr + "]") } -/** Gets the textual representation of a summary component in the format used for flow summaries. */ -string getAccessStepSpecific(SummaryComponent sc) { +/** Gets the textual representation of a summary component in the format used for MaD models. */ +string getMadRepresentationSpecific(SummaryComponent sc) { exists(Content c | sc = TContentSummaryComponent(c) and result = getContentSpecific(c) ) } -/** Gets the textual representation of a parameter position in the format used for flow summaries. */ +/** Gets the textual representation of a parameter position in the format used for MaD models. */ string getParameterPosition(ParameterPosition pos) { pos.isSelf() and result = "self" or @@ -169,7 +169,7 @@ string getParameterPosition(ParameterPosition pos) { ) } -/** Gets the textual representation of an argument position in the format used for flow summaries. */ +/** Gets the textual representation of an argument position in the format used for MaD models. */ string getArgumentPosition(ArgumentPosition pos) { pos.isSelf() and result = "self" or diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll index af43319f817..dcd1e4b5c0c 100644 --- a/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll +++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll @@ -23,9 +23,9 @@ module Public { * content type, or a return kind. */ class SummaryComponent extends TSummaryComponent { - /** Gets a textual representation of this component used for flow summaries. */ - string getAccessStep() { - result = getAccessStepSpecific(this) + /** Gets a textual representation of this component used for MaD models. */ + string getMadRepresentation() { + result = getMadRepresentationSpecific(this) or exists(ArgumentPosition pos | this = TParameterSummaryComponent(pos) and @@ -46,7 +46,7 @@ module Public { } /** Gets a textual representation of this summary component. */ - string toString() { result = this.getAccessStep() } + string toString() { result = this.getMadRepresentation() } } /** Provides predicates for constructing summary components. */ @@ -127,21 +127,21 @@ module Public { } /** Gets a textual representation of this stack used for MaD models. */ - string getAccessPath() { + string getMadRepresentation() { exists(SummaryComponent head, SummaryComponentStack tail | head = this.head() and tail = this.tail() and - result = tail.getAccessPath() + "." + head.getAccessStep() + result = tail.getMadRepresentation() + "." + head.getMadRepresentation() ) or exists(SummaryComponent c | this = TSingletonSummaryComponentStack(c) and - result = c.getAccessStep() + result = c.getMadRepresentation() ) } /** Gets a textual representation of this stack. */ - string toString() { result = this.getAccessPath() } + string toString() { result = this.getMadRepresentation() } } /** Provides predicates for constructing stacks of summary components. */ @@ -1350,8 +1350,8 @@ module Private { c.relevantSummary(input, output, preservesValue) and csv = c.getCallableCsv() // Callable information - + input.getAccessPath() + ";" // input - + output.getAccessPath() + ";" // output + + input.getMadRepresentation() + ";" // input + + output.getMadRepresentation() + ";" // output + renderKind(preservesValue) + ";" // kind + renderProvenance(c) // provenance ) diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImplSpecific.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImplSpecific.qll index f1e24082e97..8934e476ef7 100644 --- a/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImplSpecific.qll +++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImplSpecific.qll @@ -165,8 +165,8 @@ private string getContentSetSpecific(ContentSet cs) { ) } -/** Gets the textual representation of a summary component in the format used for flow summaries. */ -string getAccessStepSpecific(SummaryComponent sc) { +/** Gets the textual representation of a summary component in the format used for MaD models. */ +string getMadRepresentationSpecific(SummaryComponent sc) { exists(ContentSet cs | sc = TContentSummaryComponent(cs) and result = getContentSetSpecific(cs)) or exists(ContentSet cs | @@ -186,7 +186,7 @@ string getAccessStepSpecific(SummaryComponent sc) { ) } -/** Gets the textual representation of a parameter position in the format used for flow summaries. */ +/** Gets the textual representation of a parameter position in the format used for MaD models. */ string getParameterPosition(ParameterPosition pos) { exists(int i | pos.isPositional(i) and @@ -219,7 +219,7 @@ string getParameterPosition(ParameterPosition pos) { result = "hash-splat" } -/** Gets the textual representation of an argument position in the format used for flow summaries. */ +/** Gets the textual representation of an argument position in the format used for MaD models. */ string getArgumentPosition(ArgumentPosition pos) { pos.isSelf() and result = "self" or diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll b/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll index af43319f817..dcd1e4b5c0c 100644 --- a/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll +++ b/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll @@ -23,9 +23,9 @@ module Public { * content type, or a return kind. */ class SummaryComponent extends TSummaryComponent { - /** Gets a textual representation of this component used for flow summaries. */ - string getAccessStep() { - result = getAccessStepSpecific(this) + /** Gets a textual representation of this component used for MaD models. */ + string getMadRepresentation() { + result = getMadRepresentationSpecific(this) or exists(ArgumentPosition pos | this = TParameterSummaryComponent(pos) and @@ -46,7 +46,7 @@ module Public { } /** Gets a textual representation of this summary component. */ - string toString() { result = this.getAccessStep() } + string toString() { result = this.getMadRepresentation() } } /** Provides predicates for constructing summary components. */ @@ -127,21 +127,21 @@ module Public { } /** Gets a textual representation of this stack used for MaD models. */ - string getAccessPath() { + string getMadRepresentation() { exists(SummaryComponent head, SummaryComponentStack tail | head = this.head() and tail = this.tail() and - result = tail.getAccessPath() + "." + head.getAccessStep() + result = tail.getMadRepresentation() + "." + head.getMadRepresentation() ) or exists(SummaryComponent c | this = TSingletonSummaryComponentStack(c) and - result = c.getAccessStep() + result = c.getMadRepresentation() ) } /** Gets a textual representation of this stack. */ - string toString() { result = this.getAccessPath() } + string toString() { result = this.getMadRepresentation() } } /** Provides predicates for constructing stacks of summary components. */ @@ -1350,8 +1350,8 @@ module Private { c.relevantSummary(input, output, preservesValue) and csv = c.getCallableCsv() // Callable information - + input.getAccessPath() + ";" // input - + output.getAccessPath() + ";" // output + + input.getMadRepresentation() + ";" // input + + output.getMadRepresentation() + ";" // output + renderKind(preservesValue) + ";" // kind + renderProvenance(c) // provenance ) diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImplSpecific.qll b/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImplSpecific.qll index 8934d0dce06..06b2651f5ec 100644 --- a/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImplSpecific.qll +++ b/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImplSpecific.qll @@ -103,7 +103,7 @@ SummaryComponent interpretComponentSpecific(AccessPathToken c) { ) } -/** Gets the textual representation of the content in the format used for flow summaries. */ +/** Gets the textual representation of the content in the format used for MaD models. */ private string getContentSpecific(ContentSet cs) { exists(Content::FieldContent c | cs.isSingleton(c) and @@ -111,8 +111,8 @@ private string getContentSpecific(ContentSet cs) { ) } -/** Gets the textual representation of a summary component in the format used for flow summaries. */ -string getAccessStepSpecific(SummaryComponent sc) { +/** Gets the textual representation of a summary component in the format used for MaD models. */ +string getMadRepresentationSpecific(SummaryComponent sc) { exists(ContentSet c | sc = TContentSummaryComponent(c) and result = getContentSpecific(c)) or exists(ReturnKind rk | @@ -122,10 +122,10 @@ string getAccessStepSpecific(SummaryComponent sc) { ) } -/** Gets the textual representation of a parameter position in the format used for flow summaries. */ +/** Gets the textual representation of a parameter position in the format used for MaD models. */ string getParameterPosition(ParameterPosition pos) { result = pos.toString() } -/** Gets the textual representation of an argument position in the format used for flow summaries. */ +/** Gets the textual representation of an argument position in the format used for MaD models. */ string getArgumentPosition(ArgumentPosition pos) { result = pos.toString() } /** Holds if input specification component `c` needs a reference. */