C#: sync changes and accept test output

rdmarsh2 · rdmarsh2 · commit ee3b40bd89b2 · 2019-09-30T12:00:55.000-07:00
diff --git a/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/Instruction.qll b/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/Instruction.qll
@@ -48,8 +48,8 @@ module InstructionSanity {
         or
         (
           opcode instanceof ReadSideEffectOpcode or
-          opcode instanceof MayWriteSideEffectOpcode or
-          opcode instanceof Opcode::InlineAsm
+          opcode instanceof Opcode::InlineAsm or
+          opcode instanceof Opcode::CallSideEffect
         ) and
         tag instanceof SideEffectOperandTag
       )
diff --git a/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/IRConstruction.qll b/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/IRConstruction.qll
@@ -252,6 +252,9 @@ private module Cached {
           .getInstructionArrayAccess(getInstructionTag(instruction))
   }
 
+  cached
+  int getInstructionIndex(Instruction instruction) { none() }
+
   cached
   Callable getInstructionFunction(Instruction instruction) {
     result = getInstructionTranslatedElement(instruction)

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,8 @@ module InstructionSanity {`
`48`	`48`	`or`
`49`	`49`	`(`
`50`	`50`	`opcode instanceof ReadSideEffectOpcode or`
`51`		`- opcode instanceof MayWriteSideEffectOpcode or`
`52`		`- opcode instanceof Opcode::InlineAsm`
	`51`	`+ opcode instanceof Opcode::InlineAsm or`
	`52`	`+ opcode instanceof Opcode::CallSideEffect`
`53`	`53`	`) and`
`54`	`54`	`tag instanceof SideEffectOperandTag`
`55`	`55`	`)`
Original file line number	Diff line number	Diff line change
`@@ -252,6 +252,9 @@ private module Cached {`
`252`	`252`	`.getInstructionArrayAccess(getInstructionTag(instruction))`
`253`	`253`	`}`
`254`	`254`
	`255`	`+ cached`
	`256`	`+ int getInstructionIndex(Instruction instruction) { none() }`
	`257`	`+`
`255`	`258`	`cached`
`256`	`259`	`Callable getInstructionFunction(Instruction instruction) {`
`257`	`260`	`result = getInstructionTranslatedElement(instruction)`