FIXUP: Mistakenly broke functionality for static properties.

Author: michaelnebel

csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImpl.qll

@@ -482,6 +482,15 @@ module Expressions {
     }
   }
 
+  private class QualifiedExprOrStatOrDynAccessorCall_ =
+    @dynamic_member_access_expr or @dynamic_element_access_expr or @call_access_expr or
+        @qualifiable_expr;
+
+  /** A normal or a (potential) dynamic call to an accessor. */
+  private class QualifiedExprOrStatOrDynAccessorCall extends Expr,
+    QualifiedExprOrStatOrDynAccessorCall_
+  { }
+
   /**
    * An expression that writes via an accessor, for example `x.Prop = 0`,
    * where `Prop` is a property.
@@ -506,18 +515,19 @@ module Expressions {
 
     QualifiedAccessorWrite() {
       def.getExpr() = this and
-      def.getTargetAccess() instanceof QualifiedWriteAccess and
+      def.getTargetAccess().(WriteAccess) instanceof QualifiedExprOrStatOrDynAccessorCall and
       not this instanceof AssignOperationWithExpandedAssignment
     }
 
     /**
      * Gets the `i`th accessor being called in this write. More than one call
      * can happen in tuple assignments.
      */
-    WriteAccess getAccess(int i) {
+    QualifiedExprOrStatOrDynAccessorCall getAccess(int i) {
       result =
         rank[i + 1](AssignableDefinitions::TupleAssignmentDefinition tdef |
-          tdef.getExpr() = this
+          tdef.getExpr() = this and
+          tdef.getTargetAccess() instanceof QualifiedExprOrStatOrDynAccessorCall
         |
           tdef order by tdef.getEvaluationOrder()
         ).getTargetAccess()
@@ -579,7 +589,7 @@ module Expressions {
    * to after the assignment.
    */
   private class QualifiedAssignments extends PostOrderTree instanceof Assignment {
-    QualifiedWriteAccess left;
+    QualifiedAccessorWrite left;
     Expr right;
 
     QualifiedAssignments() {