Swift: Delete one TODO (it has been converted to an internal issue) and fix another.

MathiasVP · MathiasVP · commit 63525a9d9efb · 2023-10-26T21:48:41.000+01:00
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll
@@ -918,7 +918,6 @@ private module CaptureInput implements VariableCapture::InputSig {
         variable = np.getVarDecl() and
         source = np.getMatchingExpr()
       )
-      // TODO: support multiple variables in LHS of =, in both of above cases.
     }
 
     CapturedVariable getVariable() { result = variable }
@@ -929,7 +928,7 @@ private module CaptureInput implements VariableCapture::InputSig {
   class VariableRead extends Expr instanceof S::DeclRefExpr {
     CapturedVariable v;
 
-    VariableRead() { this.getDecl() = v /* TODO: this should be an R-value only. */ }
+    VariableRead() { this.getDecl() = v and not isLValue(this) }
 
     CapturedVariable getVariable() { result = v }
   }

Original file line number	Diff line number	Diff line change
`@@ -918,7 +918,6 @@ private module CaptureInput implements VariableCapture::InputSig {`
`918`	`918`	`variable = np.getVarDecl() and`
`919`	`919`	`source = np.getMatchingExpr()`
`920`	`920`	`)`
`921`		`- // TODO: support multiple variables in LHS of =, in both of above cases.`
`922`	`921`	`}`
`923`	`922`
`924`	`923`	`CapturedVariable getVariable() { result = variable }`
`@@ -929,7 +928,7 @@ private module CaptureInput implements VariableCapture::InputSig {`
`929`	`928`	`class VariableRead extends Expr instanceof S::DeclRefExpr {`
`930`	`929`	`CapturedVariable v;`
`931`	`930`
`932`		`- VariableRead() { this.getDecl() = v /* TODO: this should be an R-value only. */ }`
	`931`	`+ VariableRead() { this.getDecl() = v and not isLValue(this) }`
`933`	`932`
`934`	`933`	`CapturedVariable getVariable() { result = v }`
`935`	`934`	`}`