github
diff --git a/‎csharp/ql/src/semmle/code/csharp/ir/implementation/Opcode.qll‎
Lines changed: 2 additions & 2 deletions b/‎csharp/ql/src/semmle/code/csharp/ir/implementation/Opcode.qll‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/InstructionTag.qll‎
Lines changed: 14 additions & 1 deletion b/‎csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/InstructionTag.qll‎
Lines changed: 14 additions & 1 deletion
diff --git a/‎csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/TranslatedElement.qll‎
Lines changed: 10 additions & 3 deletions b/‎csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/TranslatedElement.qll‎
Lines changed: 10 additions & 3 deletions
@@ -43,7 +43,7 @@ private newtype TOpcode =
   TVariableAddress() or
   TFieldAddress() or
   TFunctionAddress() or
-  TIndexedElementAddress() or
+  TElementsAddress() or
   TConstant() or
   TStringConstant() or
   TConditionalBranch() or
@@ -191,7 +191,7 @@ module Opcode {
   class DynamicCastToVoid extends UnaryOpcode, TDynamicCastToVoid { override final string toString() { result = "DynamicCastToVoid" } }
   class VariableAddress extends Opcode, TVariableAddress { override final string toString() { result = "VariableAddress" } }
   class FieldAddress extends UnaryOpcode, TFieldAddress { override final string toString() { result = "FieldAddress" } }
-  class IndexedElementAddress extends BinaryOpcode, TIndexedElementAddress { override final string toString() { result = "IndexedElementAddress" } }
+  class ElementsAddress extends BinaryOpcode, TElementsAddress { override final string toString() { result = "ElementsAddress" } }
   class FunctionAddress extends Opcode, TFunctionAddress { override final string toString() { result = "FunctionAddress" } }
   class Constant extends Opcode, TConstant { override final string toString() { result = "Constant" } }
   class StringConstant extends Opcode, TStringConstant { override final string toString() { result = "StringConstant" } }
 
@@ -59,7 +59,6 @@ newtype TInstructionTag =
   LoadTag() or  // Implicit load due to lvalue-to-rvalue conversion
   CatchTag() or
   ThrowTag() or
-  NewObjTag() or
   UnwindTag() or
   InitializerUninitializedTag() or
   InitializerFieldAddressTag(Field field) {
@@ -82,6 +81,15 @@ newtype TInstructionTag =
   } or
   InitializerElementDefaultValueStoreTag(int elementIndex) {
     elementIsInitialized(elementIndex)
+  } or
+  // Added for C#  
+  NewObjTag() or
+  // TODO: 255 provisory 9max dim of array)
+  PointerAddTag(int index) {
+  	index in [0 .. 255]
+  } or
+  ElementsAddressTag(int index) {
+  	index in [0 .. 255]
   }
 
 class InstructionTag extends TInstructionTag {
@@ -142,7 +150,12 @@ string getInstructionTagId(TInstructionTag tag) {
   tag = CatchTag() and result = "Catch" or
   tag = ThrowTag() and result = "Throw" or
   tag = UnwindTag() and result = "Unwind" or
+  
+  // Added for C#
   tag = NewObjTag() and result = "NewObj" or
+  tag = ElementsAddressTag(_) and result = "ElementsAddress" or
+  tag = PointerAddTag(_) and result = "PointerAdd" or
+  
   // TODO: Reread
 //  exists(Field field, Class cls, int index, string tagName |
 //    field = cls.getCanonicalMember(index) and
 
@@ -17,6 +17,11 @@ private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
  */
 IntType getIntType() { any() }
 
+ArrayType getArrayOfDim(int dim, Type type) { 
+	result.getRank() = dim and
+	result.getElementType() = type
+}
+
 /**
  * Gets the "real" parent of `expr`. This predicate treats conversions as if
  * they were explicit nodes in the expression tree, rather than as implicit
@@ -68,14 +73,15 @@ private predicate ignoreExprAndDescendants(Expr expr) {
  * Holds if `expr` (not including its descendants) should be ignored for the
  * purposes of IR generation.
  */
-// TODO: See what exprs should be ignored for C# IR generation
 private predicate ignoreExprOnly(Expr expr) {
   //  exists(NewOrNewArrayExpr newExpr |
   //    // Ignore the allocator call, because we always synthesize it. Don't ignore
   //    // its arguments, though, because we use them as part of the synthesis.
   //    newExpr.getAllocatorCall() = expr
   //  ) or
-  not translateFunction(expr.getEnclosingCallable())
+  not translateFunction(expr.getEnclosingCallable()) or
+  // Ignore size of arrays when translating
+  (expr.getParent() instanceof ArrayCreation and expr.hasValue())
 }
 
 /**
@@ -185,7 +191,8 @@ newtype TTranslatedElement =
   TTranslatedLoad(Expr expr) {
   	// TODO: Revisit and make sure Loads are only used when needed
     expr instanceof AssignableRead and
-    not (expr.getParent() instanceof ArrayAccess)
+    not (expr.getParent() instanceof ArrayAccess) and
+    not (expr.getType() instanceof RefType)
   } or
   // An expression most naturally translated as control flow.
   TTranslatedNativeCondition(Expr expr) {