C++: Simplify logic to an implication

Dave Bartolomeo · Dave Bartolomeo · commit 4331b9b54e61 · 2020-06-12T09:31:19.000-04:00
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll
@@ -51,9 +51,7 @@ private module Cached {
 
   cached
   predicate hasInstruction(TStageInstruction instr) {
-    instr instanceof TRawInstruction and instr instanceof OldInstruction
-    or
-    not instr instanceof TRawInstruction
+    instr instanceof TRawInstruction implies instr instanceof OldInstruction
   }
 
   private IRBlock getNewBlock(OldBlock oldBlock) {
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
@@ -51,9 +51,7 @@ private module Cached {
 
   cached
   predicate hasInstruction(TStageInstruction instr) {
-    instr instanceof TRawInstruction and instr instanceof OldInstruction
-    or
-    not instr instanceof TRawInstruction
+    instr instanceof TRawInstruction implies instr instanceof OldInstruction
   }
 
   private IRBlock getNewBlock(OldBlock oldBlock) {
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
@@ -51,9 +51,7 @@ private module Cached {
 
   cached
   predicate hasInstruction(TStageInstruction instr) {
-    instr instanceof TRawInstruction and instr instanceof OldInstruction
-    or
-    not instr instanceof TRawInstruction
+    instr instanceof TRawInstruction implies instr instanceof OldInstruction
   }
 
   private IRBlock getNewBlock(OldBlock oldBlock) {

Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,7 @@ private module Cached {`
`51`	`51`
`52`	`52`	`cached`
`53`	`53`	`predicate hasInstruction(TStageInstruction instr) {`
`54`		`- instr instanceof TRawInstruction and instr instanceof OldInstruction`
`55`		`- or`
`56`		`- not instr instanceof TRawInstruction`
	`54`	`+ instr instanceof TRawInstruction implies instr instanceof OldInstruction`
`57`	`55`	`}`
`58`	`56`
`59`	`57`	`private IRBlock getNewBlock(OldBlock oldBlock) {`