C++/C#: Sync identical files.

cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingInternal.qll

@@ -84,7 +84,8 @@ private predicate callPartialValueNumber(
   NumberableCallInstruction call, int index, TCallPartialValueNumber head
 ) {
   exists(call) and
-  index = 1 and head = TNilArgument()
+  index = 1 and
+  head = TNilArgument()
   or
   exists(TCallPartialValueNumber prev, TValueNumber prevVN |
     callPartialValueNumber(call, index - 1, pragma[only_bind_out](prev)) and

cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Instruction.qll

@@ -1714,13 +1714,9 @@ class CallSideEffectInstruction extends SideEffectInstruction {
   CallSideEffectInstruction() { this.getOpcode() instanceof Opcode::CallSideEffect }
 
   /** Gets the operand for the value that will be read by this instruction */
-  final SideEffectOperand getSideEffectOperand() {
-    result = this.getAnOperand()
-  }
+  final SideEffectOperand getSideEffectOperand() { result = this.getAnOperand() }
 
-  final Instruction getSideEffect() {
-    result = this.getAnOperand().getDef()
-  }
+  final Instruction getSideEffect() { result = this.getAnOperand().getDef() }
 }
 
 /**
@@ -1732,15 +1728,11 @@ class CallSideEffectInstruction extends SideEffectInstruction {
  */
 class CallReadSideEffectInstruction extends SideEffectInstruction {
   CallReadSideEffectInstruction() { this.getOpcode() instanceof Opcode::CallReadSideEffect }
-  
-  /** Gets the operand for the value that will be read by this instruction */
-  final SideEffectOperand getSideEffectOperand() {
-    result = this.getAnOperand()
-  }
 
-  final Instruction getSideEffect() {
-    result = this.getAnOperand().getDef()
-  }
+  /** Gets the operand for the value that will be read by this instruction */
+  final SideEffectOperand getSideEffectOperand() { result = this.getAnOperand() }
+
+  final Instruction getSideEffect() { result = this.getAnOperand().getDef() }
 }
 
 /**

cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll

@@ -83,7 +83,9 @@ private predicate callValueNumber(
 private predicate callPartialValueNumber(
   NumberableCallInstruction call, int index, TCallPartialValueNumber head
 ) {
-  index = 1 and head = TNilArgument()
+  exists(call) and
+  index = 1 and
+  head = TNilArgument()
   or
   exists(TCallPartialValueNumber prev, TValueNumber prevVN |
     callPartialValueNumber(call, index - 1, pragma[only_bind_out](prev)) and

cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll

@@ -1714,13 +1714,9 @@ class CallSideEffectInstruction extends SideEffectInstruction {
   CallSideEffectInstruction() { this.getOpcode() instanceof Opcode::CallSideEffect }
 
   /** Gets the operand for the value that will be read by this instruction */
-  final SideEffectOperand getSideEffectOperand() {
-    result = this.getAnOperand()
-  }
+  final SideEffectOperand getSideEffectOperand() { result = this.getAnOperand() }
 
-  final Instruction getSideEffect() {
-    result = this.getAnOperand().getDef()
-  }
+  final Instruction getSideEffect() { result = this.getAnOperand().getDef() }
 }
 
 /**
@@ -1732,15 +1728,11 @@ class CallSideEffectInstruction extends SideEffectInstruction {
  */
 class CallReadSideEffectInstruction extends SideEffectInstruction {
   CallReadSideEffectInstruction() { this.getOpcode() instanceof Opcode::CallReadSideEffect }
-  
-  /** Gets the operand for the value that will be read by this instruction */
-  final SideEffectOperand getSideEffectOperand() {
-    result = this.getAnOperand()
-  }
 
-  final Instruction getSideEffect() {
-    result = this.getAnOperand().getDef()
-  }
+  /** Gets the operand for the value that will be read by this instruction */
+  final SideEffectOperand getSideEffectOperand() { result = this.getAnOperand() }
+
+  final Instruction getSideEffect() { result = this.getAnOperand().getDef() }
 }
 
 /**

cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll

@@ -83,7 +83,9 @@ private predicate callValueNumber(
 private predicate callPartialValueNumber(
   NumberableCallInstruction call, int index, TCallPartialValueNumber head
 ) {
-  index = 1 and head = TNilArgument()
+  exists(call) and
+  index = 1 and
+  head = TNilArgument()
   or
   exists(TCallPartialValueNumber prev, TValueNumber prevVN |
     callPartialValueNumber(call, index - 1, pragma[only_bind_out](prev)) and