Remove code duplication

tamasvajk · tamasvajk · commit d1cc2cc999da · 2021-01-27T13:52:12.000+01:00
diff --git a/csharp/ql/src/semmle/code/csharp/controlflow/internal/ControlFlowGraphImpl.qll b/csharp/ql/src/semmle/code/csharp/controlflow/internal/ControlFlowGraphImpl.qll
@@ -62,7 +62,7 @@ module ControlFlowTree {
     Range() { this = getAChild*(any(CfgScope scope)) }
   }
 
-  private Element getAChild(Element p) {
+  Element getAChild(Element p) {
     result = p.getAChild() or
     result = p.(AssignOperation).getExpandedAssignment()
   }
@@ -1334,7 +1334,7 @@ module Statements {
   /** Gets a child of `cfe` that is in CFG scope `scope`. */
   pragma[noinline]
   private ControlFlowElement getAChildInScope(ControlFlowElement cfe, Callable scope) {
-    result = [cfe.getAChild(), cfe.(AssignOperation).getExpandedAssignment()] and
+    result = ControlFlowTree::getAChild(cfe) and
     scope = result.getEnclosingCallable()
   }
 

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ module ControlFlowTree {`
`62`	`62`	`Range() { this = getAChild*(any(CfgScope scope)) }`
`63`	`63`	`}`
`64`	`64`
`65`		`- private Element getAChild(Element p) {`
	`65`	`+ Element getAChild(Element p) {`
`66`	`66`	`result = p.getAChild() or`
`67`	`67`	`result = p.(AssignOperation).getExpandedAssignment()`
`68`	`68`	`}`
`@@ -1334,7 +1334,7 @@ module Statements {`
`1334`	`1334`	/** Gets a child of `cfe` that is in CFG scope `scope`. */
`1335`	`1335`	`pragma[noinline]`
`1336`	`1336`	`private ControlFlowElement getAChildInScope(ControlFlowElement cfe, Callable scope) {`
`1337`		`- result = [cfe.getAChild(), cfe.(AssignOperation).getExpandedAssignment()] and`
	`1337`	`+ result = ControlFlowTree::getAChild(cfe) and`
`1338`	`1338`	`scope = result.getEnclosingCallable()`
`1339`	`1339`	`}`
`1340`	`1340`