Swift: extract SingleValueStmtExpr

github · Oct 12, 2023 · 5353ad7 · 5353ad7
1 parent 2b5ba41
commit 5353ad7
Show file tree

Hide file tree

Showing 17 changed files with 132 additions and 8 deletions.
diff --git a/swift/extractor/infra/SwiftTagTraits.h b/swift/extractor/infra/SwiftTagTraits.h
@@ -205,7 +205,7 @@ MAP(swift::Expr, ExprTag)
   MAP(swift::CopyExpr, void)  // TODO (introduced in 5.9)
   MAP(swift::ConsumeExpr, void)  // TODO (introduced in 5.9)
   MAP(swift::MaterializePackExpr, void)  // TODO (introduced in 5.9)
-  MAP(swift::SingleValueStmtExpr, void)  // TODO (introduced in 5.9)
+  MAP(swift::SingleValueStmtExpr, SingleValueStmtExprTag)
 #endif
 
 MAP(swift::Decl, DeclTag)

diff --git a/swift/extractor/translators/ExprTranslator.cpp b/swift/extractor/translators/ExprTranslator.cpp
@@ -636,4 +636,11 @@ codeql::RegexLiteralExpr ExprTranslator::translateRegexLiteralExpr(
   return entry;
 }
 
+codeql::SingleValueStmtExpr ExprTranslator::translateSingleValueStmtExpr(
+    const swift::SingleValueStmtExpr& expr) {
+  auto entry = createExprEntry(expr);
+  entry.stmt = dispatcher.fetchLabel(expr.getStmt());
+  return entry;
+}
+
 }  // namespace codeql
diff --git a/swift/extractor/translators/ExprTranslator.h b/swift/extractor/translators/ExprTranslator.h
@@ -119,6 +119,7 @@ class ExprTranslator : public AstTranslatorBase<ExprTranslator> {
   codeql::AppliedPropertyWrapperExpr translateAppliedPropertyWrapperExpr(
       const swift::AppliedPropertyWrapperExpr& expr);
   codeql::RegexLiteralExpr translateRegexLiteralExpr(const swift::RegexLiteralExpr& expr);
+  codeql::SingleValueStmtExpr translateSingleValueStmtExpr(const swift::SingleValueStmtExpr& expr);
 
  private:
   void fillClosureExpr(const swift::AbstractClosureExpr& expr, codeql::ClosureExpr& entry);

diff --git a/swift/ql/.generated.list b/swift/ql/.generated.list
diff --git a/swift/ql/.gitattributes b/swift/ql/.gitattributes
diff --git a/swift/ql/lib/codeql/swift/elements.qll b/swift/ql/lib/codeql/swift/elements.qll
diff --git a/swift/ql/lib/codeql/swift/elements/expr/SingleValueStmtExpr.qll b/swift/ql/lib/codeql/swift/elements/expr/SingleValueStmtExpr.qll
diff --git a/swift/ql/lib/codeql/swift/elements/expr/SingleValueStmtExprConstructor.qll b/swift/ql/lib/codeql/swift/elements/expr/SingleValueStmtExprConstructor.qll
diff --git a/swift/ql/lib/codeql/swift/generated/ParentChild.qll b/swift/ql/lib/codeql/swift/generated/ParentChild.qll
diff --git a/swift/ql/lib/codeql/swift/generated/Raw.qll b/swift/ql/lib/codeql/swift/generated/Raw.qll
diff --git a/swift/ql/lib/codeql/swift/generated/Synth.qll b/swift/ql/lib/codeql/swift/generated/Synth.qll
diff --git a/swift/ql/lib/codeql/swift/generated/SynthConstructors.qll b/swift/ql/lib/codeql/swift/generated/SynthConstructors.qll
diff --git a/swift/ql/lib/codeql/swift/generated/expr/SingleValueStmtExpr.qll b/swift/ql/lib/codeql/swift/generated/expr/SingleValueStmtExpr.qll
diff --git a/swift/ql/lib/swift.dbscheme b/swift/ql/lib/swift.dbscheme
diff --git a/swift/ql/test/extractor-tests/generated/expr/SingleValueStmtExpr/MISSING_SOURCE.txt b/swift/ql/test/extractor-tests/generated/expr/SingleValueStmtExpr/MISSING_SOURCE.txt
diff --git a/swift/ql/test/library-tests/dataflow/flowsources/CONSISTENCY/CfgConsistency.expected b/swift/ql/test/library-tests/dataflow/flowsources/CONSISTENCY/CfgConsistency.expected
@@ -0,0 +1,5 @@
+deadEnd
+| alamofire.swift:469:9:469:9 | stream |
+| alamofire.swift:484:9:484:9 | stream |
+| alamofire.swift:499:9:499:9 | stream |
+| alamofire.swift:514:9:514:9 | stream |
diff --git a/swift/schema.py b/swift/schema.py
@@ -1225,3 +1225,7 @@ class ParameterizedProtocolType(Type):
 
 class AbiSafeConversionExpr(ImplicitConversionExpr):
     pass
+
+
+class SingleValueStmtExpr(Expr):
+    stmt: Stmt | child