CPP: Avoid CP with edgekind in non-returning analysis

alexet · alexet · commit 5fe44b65b7d4 · 2023-09-08T16:55:06.000+01:00
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/reachability/ReachableBlock.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/reachability/ReachableBlock.qll
@@ -11,7 +11,7 @@ predicate isInfeasibleInstructionSuccessor(Instruction instr, EdgeKind kind) {
   instr.getSuccessor(kind) instanceof UnreachedInstruction and
   kind instanceof GotoEdge
   or
-  isCallToNonReturningFunction(instr)
+  isCallToNonReturningFunction(instr) and exists(instr.getSuccessor(kind))
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/reachability/ReachableBlock.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/reachability/ReachableBlock.qll
@@ -11,7 +11,7 @@ predicate isInfeasibleInstructionSuccessor(Instruction instr, EdgeKind kind) {
   instr.getSuccessor(kind) instanceof UnreachedInstruction and
   kind instanceof GotoEdge
   or
-  isCallToNonReturningFunction(instr)
+  isCallToNonReturningFunction(instr) and exists(instr.getSuccessor(kind))
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ predicate isInfeasibleInstructionSuccessor(Instruction instr, EdgeKind kind) {`
`11`	`11`	`instr.getSuccessor(kind) instanceof UnreachedInstruction and`
`12`	`12`	`kind instanceof GotoEdge`
`13`	`13`	`or`
`14`		`- isCallToNonReturningFunction(instr)`
	`14`	`+ isCallToNonReturningFunction(instr) and exists(instr.getSuccessor(kind))`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`/**`