Merge pull request #14190 from github/alexdenisov/await-inconsistencies

Swift: fix CFG for identity expressions (await, dot_self, parent)

Author: MathiasVP

swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImpl.qll

@@ -125,7 +125,9 @@ module Stmts {
       c instanceof SimpleCompletion
     }
 
-    predicate firstInner(ControlFlowElement first) { astFirst(ast.getFirstElement(), first) }
+    predicate firstInner(ControlFlowElement first) {
+      astFirst(ast.getFirstElement().getFullyUnresolved(), first)
+    }
 
     /** Gets the body of the i'th `defer` statement. */
     private BraceStmt getDeferStmtBody(int i) {
@@ -181,32 +183,32 @@ module Stmts {
 
     predicate lastInner(ControlFlowElement last, Completion c) {
       // Normal exit and no defer statements
-      astLast(ast.getLastElement(), last, c) and
+      astLast(ast.getLastElement().getFullyUnresolved(), last, c) and
       not exists(this.getFirstDeferStmtBody()) and
       c instanceof NormalCompletion
       or
       // Normal exit from the last defer statement to be executed
-      astLast(this.getLastDeferStmtBody(), last, c) and
+      astLast(this.getLastDeferStmtBody().getFullyUnresolved(), last, c) and
       c instanceof NormalCompletion
       or
       // Abnormal exit without any defer statements
       not c instanceof NormalCompletion and
-      astLast(ast.getAnElement(), last, c) and
+      astLast(ast.getAnElement().getFullyUnresolved(), last, c) and
       not exists(this.getFirstDeferStmtBody())
     }
 
     override predicate succ(ControlFlowElement pred, ControlFlowElement succ, Completion c) {
       // left-to-right evaluation of statements
       exists(int i |
-        astLast(ast.getElement(i), pred, c) and
-        astFirst(ast.getElement(i + 1), succ) and
+        astLast(ast.getElement(i).getFullyUnresolved(), pred, c) and
+        astFirst(ast.getElement(i + 1).getFullyUnresolved(), succ) and
         c instanceof NormalCompletion
       )
       or
       // Flow from last elements to the first defer statement to be executed
       c instanceof NormalCompletion and
-      astLast(ast.getLastElement(), pred, c) and
-      astFirst(this.getFirstDeferStmtBody(), succ)
+      astLast(ast.getLastElement().getFullyUnresolved(), pred, c) and
+      astFirst(this.getFirstDeferStmtBody().getFullyUnresolved(), succ)
       or
       // Flow from a defer statement to the next defer to be executed
       c instanceof NormalCompletion and
@@ -218,7 +220,7 @@ module Stmts {
       // Abnormal exit from an element to the first defer statement to be executed.
       not c instanceof NormalCompletion and
       exists(int i |
-        astLast(ast.getElement(i), pred, c) and
+        astLast(ast.getElement(i).getFullyUnresolved(), pred, c) and
         astFirst(this.getDeferStmtBodyAfterStmt(i), succ)
       )
     }