Swift: extract AwaitExpr

Author: redsun82

swift/extractor/translators/ExprTranslator.cpp

@@ -243,12 +243,6 @@ codeql::TypeExpr ExprTranslator::translateTypeExpr(const swift::TypeExpr& expr)
   return entry;
 }
 
-codeql::ParenExpr ExprTranslator::translateParenExpr(const swift::ParenExpr& expr) {
-  auto entry = createExprEntry(expr);
-  fillIdentityExpr(expr, entry);
-  return entry;
-}
-
 codeql::InOutExpr ExprTranslator::translateInOutExpr(const swift::InOutExpr& expr) {
   auto entry = createExprEntry(expr);
   entry.sub_expr = dispatcher.fetchLabel(expr.getSubExpr());
@@ -463,12 +457,6 @@ codeql::SequenceExpr ExprTranslator::translateSequenceExpr(const swift::Sequence
   return entry;
 }
 
-codeql::DotSelfExpr ExprTranslator::translateDotSelfExpr(const swift::DotSelfExpr& expr) {
-  auto entry = createExprEntry(expr);
-  fillIdentityExpr(expr, entry);
-  return entry;
-}
-
 codeql::ErrorExpr ExprTranslator::translateErrorExpr(const swift::ErrorExpr& expr) {
   auto entry = createExprEntry(expr);
   return entry;

swift/extractor/translators/ExprTranslator.h

@@ -53,7 +53,14 @@ class ExprTranslator : public AstTranslatorBase<ExprTranslator> {
   }
 
   codeql::TypeExpr translateTypeExpr(const swift::TypeExpr& expr);
-  codeql::ParenExpr translateParenExpr(const swift::ParenExpr& expr);
+
+  template <typename E>
+  TrapClassOf<E> translateIdentityExpr(const E& expr) {
+    auto entry = createExprEntry(expr);
+    fillIdentityExpr(expr, entry);
+    return entry;
+  }
+
   codeql::InOutExpr translateInOutExpr(const swift::InOutExpr& expr);
   codeql::OpaqueValueExpr translateOpaqueValueExpr(const swift::OpaqueValueExpr& expr);
   codeql::TapExpr translateTapExpr(const swift::TapExpr& expr);
@@ -91,7 +98,6 @@ class ExprTranslator : public AstTranslatorBase<ExprTranslator> {
   codeql::UnresolvedMemberExpr translateUnresolvedMemberExpr(
       const swift::UnresolvedMemberExpr& expr);
   codeql::SequenceExpr translateSequenceExpr(const swift::SequenceExpr& expr);
-  codeql::DotSelfExpr translateDotSelfExpr(const swift::DotSelfExpr& expr);
   codeql::ErrorExpr translateErrorExpr(const swift::ErrorExpr& expr);
   codeql::UnresolvedPatternExpr translateUnresolvedPatternExpr(
       const swift::UnresolvedPatternExpr& expr);

swift/ql/test/extractor-tests/generated/expr/AwaitExpr/MISSING_SOURCE.txt

@@ -0,0 +1,8 @@
+| identity_expressions.swift:4:9:4:14 | .self | DotSelfExpr | getSubExpr: | identity_expressions.swift:4:9:4:9 | self |
+| identity_expressions.swift:4:9:4:21 | .self | DotSelfExpr | getSubExpr: | identity_expressions.swift:4:9:4:19 | .x |
+| identity_expressions.swift:4:28:4:31 | (...) | ParenExpr | getSubExpr: | identity_expressions.swift:4:29:4:29 | 42 |
+| identity_expressions.swift:8:5:8:9 | (...) | ParenExpr | getSubExpr: | identity_expressions.swift:8:6:8:8 | call to init() |
+| identity_expressions.swift:11:28:11:43 | (...) | ParenExpr | getSubExpr: | identity_expressions.swift:11:35:11:42 | call to create() |
+| identity_expressions.swift:11:29:11:42 | await ... | AwaitExpr | getSubExpr: | identity_expressions.swift:11:35:11:42 | call to create() |
+| identity_expressions.swift:14:5:14:21 | await ... | AwaitExpr | getSubExpr: | identity_expressions.swift:14:11:14:21 | call to process() |
+| identity_expressions.swift:14:11:14:19 | (...) | ParenExpr | getSubExpr: | identity_expressions.swift:14:12:14:12 | process() |

swift/ql/test/extractor-tests/generated/expr/DotSelfExpr/DotSelfExpr.expected

@@ -2,9 +2,9 @@
 import codeql.swift.elements
 import TestUtils
 
-from DotSelfExpr x, Expr getSubExpr
+from IdentityExpr x, Expr getSubExpr
 where
   toBeTested(x) and
   not x.isUnknown() and
   getSubExpr = x.getSubExpr()
-select x, "getSubExpr:", getSubExpr
+select x, x.getPrimaryQlClasses(), "getSubExpr:", getSubExpr

swift/ql/test/extractor-tests/generated/expr/DotSelfExpr/DotSelfExpr_getType.expected

@@ -0,0 +1,8 @@
+| identity_expressions.swift:4:9:4:14 | .self | A |
+| identity_expressions.swift:4:9:4:21 | .self | @lvalue Int |
+| identity_expressions.swift:4:28:4:31 | (...) | (Int) |
+| identity_expressions.swift:8:5:8:9 | (...) | (A) |
+| identity_expressions.swift:11:28:11:43 | (...) | (A) |
+| identity_expressions.swift:11:29:11:42 | await ... | A |
+| identity_expressions.swift:14:5:14:21 | await ... | () |
+| identity_expressions.swift:14:11:14:19 | (...) | (() async -> ()) |

swift/ql/test/extractor-tests/generated/expr/DotSelfExpr/dotself.swift

@@ -2,6 +2,6 @@
 import codeql.swift.elements
 import TestUtils
 
-from DotSelfExpr x
+from IdentityExpr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getType()