WIP

Author: jketema

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

@@ -666,9 +666,9 @@ class TranslatedStructorQualifierSideEffect extends TranslatedArgumentSideEffect
       structorCall.getExpr() = callOrInit and
       result = structorCall.getQualifierResult()
     )
-    or
-    callOrInit instanceof ConstructorFieldInit and
-    result = getTranslatedFunction(callOrInit.getEnclosingFunction()).getLoadThisInstruction()
+    // or
+    // callOrInit instanceof ConstructorFieldInit and
+    // result = getTranslatedFunction(callOrInit.getEnclosingFunction()).getLoadThisInstruction()
   }
 }
 

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

@@ -924,18 +924,15 @@ newtype TTranslatedElement =
     not ignoreExpr(call) and
     not ignoreSideEffects(call) and
     (
-    call instanceof ConstructorCall and
-    opcode = getASideEffectOpcode(call, -1)
-    )
-    or
-    (
-      call instanceof ConstructorFieldInit and
-      (
-        opcode instanceof Opcode::IndirectReadSideEffect
-        or
-        opcode instanceof Opcode::IndirectMayWriteSideEffect
-      )
-
+      call instanceof ConstructorCall and
+      opcode = getASideEffectOpcode(call, -1)
+      // or
+      // call instanceof ConstructorFieldInit and
+      // (
+      //   opcode instanceof Opcode::IndirectReadSideEffect
+      //   or
+      //   opcode instanceof Opcode::IndirectMayWriteSideEffect
+      // )
     )
   } or
   // The side effect that initializes newly-allocated memory.