Address PR comments

AndreiDiaconu1 · AndreiDiaconu1 · commit fa74ed341935 · 2019-09-19T10:31:25.000+01:00
diff --git a/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/TranslatedElement.qll b/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/TranslatedElement.qll
@@ -196,7 +196,7 @@ predicate ignoreLoad(Expr expr) {
   or
   // No load is needed for the lvalue in an assignment such as:
   // Eg. `Object obj = oldObj`;
-  expr.getParent().(Assignment).getLValue() = expr and
+  expr = any(Assignment a).getLValue() and
   expr.getType() instanceof RefType
   or
   // Since the loads for a crement operation is handled by the translation
@@ -211,11 +211,10 @@ predicate ignoreLoad(Expr expr) {
   // its target variable is a value type variable,
   // ignore the load since the address of a variable that is a value type is
   // given by a single `VariableAddress` instruction.
-  expr.getParent().(FieldAccess).getQualifier() = expr and
-  expr.(VariableAccess).getType().isValueType() and
-  not (
-    expr.(VariableAccess).getTarget().(Parameter).isOutOrRef() or
-    expr.(VariableAccess).getTarget().(Parameter).isIn()
+  expr = any(FieldAccess fa).getQualifier() and
+  expr = any(VariableAccess va |
+    va.getType().isValueType() and
+    not va.getTarget() = any(Parameter p | p.isOutOrRef() or p.isIn())
   )
   or
   // If expr is passed as an `out,`ref` or `in` argument,
diff --git a/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/TranslatedExpr.qll b/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/TranslatedExpr.qll
@@ -715,19 +715,13 @@ abstract class TranslatedPointerOps extends TranslatedNonConstantExpr {
 }
 
 class TranslatedPointerIndirectionExpr extends TranslatedPointerOps {
-  TranslatedPointerIndirectionExpr() {
-    // *p is the same as p until the result is loaded.
-    expr instanceof PointerIndirectionExpr
-  }
+  override PointerIndirectionExpr expr;
 
   override TranslatedExpr getOperand() { result = getTranslatedExpr(expr.getOperand()) }
 }
 
 class TranslatedAddressExpr extends TranslatedPointerOps {
-  TranslatedAddressExpr() {
-    // &x is the same as x.
-    expr instanceof AddressOfExpr
-  }
+  override AddressOfExpr expr;
 
   override TranslatedExpr getOperand() { result = getTranslatedExpr(expr.getOperand()) }
 }
@@ -834,7 +828,7 @@ abstract class TranslatedVariableAccess extends TranslatedNonConstantExpr {
    * Some variable accesses need an extra load, eg. ref parameters,
    * out parameters
    */
-  final predicate needsExtraLoad() {
+  final private predicate needsExtraLoad() {
     (
       expr.getTarget().(Parameter).isOutOrRef() or
       expr.getTarget().(Parameter).isIn()
@@ -2068,9 +2062,9 @@ abstract class TranslatedCreation extends TranslatedCoreExpr, TTranslatedCreatio
   final override Instruction getFirstInstruction() { result = this.getInstruction(NewObjTag()) }
 
   override Instruction getResult() {
-    if not this.needsLoad()
-    then result = this.getInstruction(NewObjTag())
-    else result = this.getInstruction(LoadTag())
+    if this.needsLoad()
+    then result = this.getInstruction(LoadTag())
+    else result = this.getInstruction(NewObjTag())
   }
 
   override Instruction getReceiver() { result = getInstruction(NewObjTag()) }
@@ -2111,9 +2105,9 @@ abstract class TranslatedCreation extends TranslatedCoreExpr, TTranslatedCreatio
   }
 
   private Instruction getLoadOrChildSuccessor() {
-    if not this.needsLoad()
-    then result = this.getParent().getChildSuccessor(this)
-    else result = this.getInstruction(LoadTag())
+    if this.needsLoad()
+    then result = this.getInstruction(LoadTag())
+    else result = this.getParent().getChildSuccessor(this)
   }
 
   abstract TranslatedElement getConstructorCall();
