C#: Clean up.

Author: aschackmull

csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowGraph.qll

@@ -294,13 +294,7 @@ module ControlFlow {
 
     class Split = Splitting::Split;
 
-    class FinallySplit = Splitting::FinallySplitting::FinallySplit;
-
     class ExceptionHandlerSplit = Splitting::ExceptionHandlerSplitting::ExceptionHandlerSplit;
-
-    class BooleanSplit = Splitting::BooleanSplitting::BooleanSplit;
-
-    class LoopSplit = Splitting::LoopSplitting::LoopSplit;
   }
 
   class BasicBlock = BBs::BasicBlock;

csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll

@@ -292,87 +292,6 @@ private module LogicInput implements GuardsImpl::LogicInputSig {
 
 module Guards = GuardsImpl::Logic<LogicInput>;
 
-/*
- * Temporary debug predicates:
- */
-
-predicate debug_newcontrols(Guards::Guard g, BasicBlock bb, GuardValue v) { g.valueControls(bb, v) }
-
-predicate debug_oldconvert(Guards::Guard g, BasicBlock bb, GuardValue v) {
-  exists(AbstractValue av |
-    g.(Guard).controlsBasicBlock(bb, av) and
-    debug_convVals(av, v)
-  )
-  or
-  debug_oldconvertCase(_, _, g, bb, v)
-}
-
-predicate debug_oldconvertCase(Guard g1, MatchValue av, Guards::Guard g2, BasicBlock bb, GuardValue v) {
-  g1.controlsBasicBlock(bb, av) and
-  av.getCase() = g2 and
-  if av.isMatch() then v.asBooleanValue() = true else v.asBooleanValue() = false
-}
-
-predicate debug_caseconverted(Guard g1, Guards::Guard g, BasicBlock bb, GuardValue v) {
-  debug_oldconvertCase(g1, _, g, bb, v) and
-  2 <= strictcount(Guard g0 | debug_oldconvertCase(g0, _, g, bb, v))
-}
-
-predicate debug_useless(Guards::Guard g, BasicBlock bb, GuardValue v) {
-  debug_oldconvert(g, bb, v) and
-  Guards::InternalUtil::exprHasValue(g, v)
-}
-
-predicate debug_compare(int eq, int oldconv, int oldnonconv, int added, int new) {
-  eq =
-    count(Guards::Guard g, BasicBlock bb, GuardValue v |
-      debug_newcontrols(g, bb, v) and debug_oldconvert(g, bb, v)
-    ) and
-  oldconv =
-    count(Guards::Guard g, BasicBlock bb, GuardValue v |
-      debug_oldconvert(g, bb, v) and
-      not debug_newcontrols(g, bb, v) and
-      not debug_useless(g, bb, v)
-    ) and
-  oldnonconv =
-    count(Guard g, BasicBlock bb, AbstractValue av |
-      g.controlsBasicBlock(bb, av) and
-      not debug_convVals(av, _) and
-      not debug_oldconvertCase(g, av, _, bb, _)
-      // Remaining that are not converted:
-      // av instanceof EmptyCollectionValue
-    ) and
-  added =
-    count(Guards::Guard g, BasicBlock bb, GuardValue v |
-      debug_newcontrols(g, bb, v) and
-      not debug_oldconvert(g, bb, v) and
-      not debug_newGv(v)
-    ) and
-  new =
-    count(Guards::Guard g, BasicBlock bb, GuardValue v |
-      debug_newcontrols(g, bb, v) and
-      not debug_oldconvert(g, bb, v) and
-      debug_newGv(v)
-    )
-}
-
-predicate debug_newGv(GuardValue v) {
-  v.isThrowsException() or
-  v.getDualValue().isThrowsException() or
-  exists(v.getDualValue().asIntValue()) or
-  v.isIntRange(_, _)
-}
-
-predicate debug_convVals(AbstractValue av, GuardValue gv) {
-  av.(AbstractValues::BooleanValue).getValue() = gv.asBooleanValue()
-  or
-  av.(AbstractValues::IntegerValue).getValue() = gv.asIntValue()
-  or
-  av.(AbstractValues::NullValue).isNull() and gv.isNullValue()
-  or
-  av.(AbstractValues::NullValue).isNonNull() and gv.isNonNullValue()
-}
-
 /** An expression whose value may control the execution of another element. */
 class Guard extends Expr {
   Guard() { isGuard(this, _) }