Swift: extract types for patterns

Author: rdmarsh2

swift/extractor/translators/PatternTranslator.cpp

@@ -3,62 +3,64 @@
 namespace codeql {
 
 codeql::NamedPattern PatternTranslator::translateNamedPattern(const swift::NamedPattern& pattern) {
-  auto entry = dispatcher.createEntry(pattern);
+
+  auto entry = createPatternEntry(pattern);
+  entry.name = pattern.getNameStr().str();
   entry.var_decl = dispatcher.fetchLabel(pattern.getDecl());
   return entry;
 }
 
 codeql::TypedPattern PatternTranslator::translateTypedPattern(const swift::TypedPattern& pattern) {
-  auto entry = dispatcher.createEntry(pattern);
+  auto entry = createPatternEntry(pattern);
   entry.sub_pattern = dispatcher.fetchLabel(pattern.getSubPattern());
   entry.type_repr = dispatcher.fetchOptionalLabel(pattern.getTypeRepr(), pattern.getType());
   return entry;
 }
 
 codeql::TuplePattern PatternTranslator::translateTuplePattern(const swift::TuplePattern& pattern) {
-  auto entry = dispatcher.createEntry(pattern);
+  auto entry = createPatternEntry(pattern);
   for (const auto& p : pattern.getElements()) {
     entry.elements.push_back(dispatcher.fetchLabel(p.getPattern()));
   }
   return entry;
 }
 codeql::AnyPattern PatternTranslator::translateAnyPattern(const swift::AnyPattern& pattern) {
-  auto entry = dispatcher.createEntry(pattern);
+  auto entry = createPatternEntry(pattern);
   return entry;
 }
 
 codeql::BindingPattern PatternTranslator::translateBindingPattern(
     const swift::BindingPattern& pattern) {
-  auto entry = dispatcher.createEntry(pattern);
+  auto entry = createPatternEntry(pattern);
   entry.sub_pattern = dispatcher.fetchLabel(pattern.getSubPattern());
   return entry;
 }
 
 codeql::EnumElementPattern PatternTranslator::translateEnumElementPattern(
     const swift::EnumElementPattern& pattern) {
-  auto entry = dispatcher.createEntry(pattern);
+  auto entry = createPatternEntry(pattern);
   entry.element = dispatcher.fetchLabel(pattern.getElementDecl());
   entry.sub_pattern = dispatcher.fetchOptionalLabel(pattern.getSubPattern());
   return entry;
 }
 
 codeql::OptionalSomePattern PatternTranslator::translateOptionalSomePattern(
     const swift::OptionalSomePattern& pattern) {
-  auto entry = dispatcher.createEntry(pattern);
+  auto entry = createPatternEntry(pattern);
   entry.sub_pattern = dispatcher.fetchLabel(pattern.getSubPattern());
   return entry;
 }
 
 codeql::IsPattern PatternTranslator::translateIsPattern(const swift::IsPattern& pattern) {
-  auto entry = dispatcher.createEntry(pattern);
+  auto entry = createPatternEntry(pattern);
   entry.cast_type_repr =
       dispatcher.fetchOptionalLabel(pattern.getCastTypeRepr(), pattern.getCastType());
   entry.sub_pattern = dispatcher.fetchOptionalLabel(pattern.getSubPattern());
   return entry;
 }
 
 codeql::ExprPattern PatternTranslator::translateExprPattern(const swift::ExprPattern& pattern) {
-  auto entry = dispatcher.createEntry(pattern);
+  auto entry = createPatternEntry(pattern);
   if (auto match = pattern.getMatchExpr()) {
     entry.sub_expr = dispatcher.fetchLabel(match);
   } else {
@@ -68,13 +70,13 @@ codeql::ExprPattern PatternTranslator::translateExprPattern(const swift::ExprPat
 }
 
 codeql::ParenPattern PatternTranslator::translateParenPattern(const swift::ParenPattern& pattern) {
-  auto entry = dispatcher.createEntry(pattern);
+  auto entry = createPatternEntry(pattern);
   entry.sub_pattern = dispatcher.fetchLabel(pattern.getSubPattern());
   return entry;
 }
 
 codeql::BoolPattern PatternTranslator::translateBoolPattern(const swift::BoolPattern& pattern) {
-  auto entry = dispatcher.createEntry(pattern);
+  auto entry = createPatternEntry(pattern);
   entry.value = pattern.getValue();
   return entry;
 }

swift/extractor/translators/PatternTranslator.h

@@ -23,5 +23,13 @@ class PatternTranslator : public AstTranslatorBase<PatternTranslator> {
   codeql::ExprPattern translateExprPattern(const swift::ExprPattern& pattern);
   codeql::ParenPattern translateParenPattern(const swift::ParenPattern& pattern);
   codeql::BoolPattern translateBoolPattern(const swift::BoolPattern& pattern);
+
+ private:
+  template <typename T>
+  TrapClassOf<T> createPatternEntry(const T& pattern) {
+    auto entry = dispatcher.createEntry(pattern);
+    entry.type = dispatcher.fetchOptionalLabel(pattern.getType());
+    return entry;
+  }
 };
 }  // namespace codeql

swift/ql/.generated.list

@@ -0,0 +1,4 @@
+<dbstats>
+     <typesizes />
+     <stats />
+</dbstats>

swift/ql/lib/codeql/swift/generated/Raw.qll

@@ -103,7 +103,7 @@ class Expr(AstNode):
 @group("pattern")
 @ql.hideable
 class Pattern(AstNode):
-    pass
+    type: optional[Type]
 
 @group("stmt")
 class Stmt(AstNode):