Skip to content

Commit 17f0041

Browse files
committed
C#: Remove remaining DefinitionExt references.
1 parent 79069ce commit 17f0041

File tree

1 file changed

+3
-38
lines changed
  • csharp/ql/lib/semmle/code/csharp/dataflow/internal

1 file changed

+3
-38
lines changed

csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll

Lines changed: 3 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -994,9 +994,9 @@ private module Cached {
994994

995995
import Cached
996996

997-
private string getSplitString(DefinitionExt def) {
997+
private string getSplitString(Definition def) {
998998
exists(ControlFlow::BasicBlock bb, int i, ControlFlow::Node cfn |
999-
def.definesAt(_, bb, i, _) and
999+
def.definesAt(_, bb, i) and
10001000
result = cfn.(ControlFlow::Nodes::ElementNode).getSplitsString()
10011001
|
10021002
cfn = bb.getNode(i)
@@ -1006,48 +1006,13 @@ private string getSplitString(DefinitionExt def) {
10061006
)
10071007
}
10081008

1009-
string getToStringPrefix(DefinitionExt def) {
1009+
string getToStringPrefix(Definition def) {
10101010
result = "[" + getSplitString(def) + "] "
10111011
or
10121012
not exists(getSplitString(def)) and
10131013
result = ""
10141014
}
10151015

1016-
/**
1017-
* An extended static single assignment (SSA) definition.
1018-
*
1019-
* This is either a normal SSA definition (`Definition`) or a
1020-
* phi-read node (`PhiReadNode`).
1021-
*
1022-
* Only intended for internal use.
1023-
*/
1024-
class DefinitionExt extends Impl::DefinitionExt {
1025-
override string toString() { result = this.(Ssa::Definition).toString() }
1026-
1027-
/** Gets the location of this definition. */
1028-
override Location getLocation() { result = this.(Ssa::Definition).getLocation() }
1029-
1030-
/** Gets the enclosing callable of this definition. */
1031-
Callable getEnclosingCallable() { result = this.(Ssa::Definition).getEnclosingCallable() }
1032-
}
1033-
1034-
/**
1035-
* A phi-read node.
1036-
*
1037-
* Only intended for internal use.
1038-
*/
1039-
class PhiReadNode extends DefinitionExt, Impl::PhiReadNode {
1040-
override string toString() {
1041-
result = getToStringPrefix(this) + "SSA phi read(" + this.getSourceVariable() + ")"
1042-
}
1043-
1044-
override Location getLocation() { result = this.getBasicBlock().getLocation() }
1045-
1046-
override Callable getEnclosingCallable() {
1047-
result = this.getSourceVariable().getEnclosingCallable()
1048-
}
1049-
}
1050-
10511016
private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInputSig {
10521017
private import csharp as Cs
10531018
private import semmle.code.csharp.controlflow.BasicBlocks

0 commit comments

Comments
 (0)