Swift: extract VariadicSequenceType

Author: redsun82

swift/extractor/visitors/TypeVisitor.cpp

@@ -121,21 +121,16 @@ void TypeVisitor::visitParenType(swift::ParenType* type) {
   dispatcher_.emit(ParenTypesTrap{label, typeLabel});
 }
 
-void TypeVisitor::visitUnarySyntaxSugarType(swift::UnarySyntaxSugarType* type) {
-  auto label = dispatcher_.assignNewLabel(type);
-  emitUnarySyntaxSugarType(type, label);
-}
-
-void TypeVisitor::visitOptionalType(swift::OptionalType* type) {
-  auto label = dispatcher_.assignNewLabel(type);
-  dispatcher_.emit(OptionalTypesTrap{label});
-  emitUnarySyntaxSugarType(type, label);
+codeql::OptionalType TypeVisitor::translateOptionalType(const swift::OptionalType& type) {
+  codeql::OptionalType entry{dispatcher_.assignNewLabel(type)};
+  fillUnarySyntaxSugarType(type, entry);
+  return entry;
 }
 
-void TypeVisitor::visitArraySliceType(swift::ArraySliceType* type) {
-  auto label = dispatcher_.assignNewLabel(type);
-  dispatcher_.emit(ArraySliceTypesTrap{label});
-  emitUnarySyntaxSugarType(type, label);
+codeql::ArraySliceType TypeVisitor::translateArraySliceType(const swift::ArraySliceType& type) {
+  codeql::ArraySliceType entry{dispatcher_.assignNewLabel(type)};
+  fillUnarySyntaxSugarType(type, entry);
+  return entry;
 }
 
 void TypeVisitor::visitDictionaryType(swift::DictionaryType* type) {
@@ -184,10 +179,11 @@ void TypeVisitor::visitBoundGenericType(swift::BoundGenericType* type) {
   emitBoundGenericType(type, label);
 }
 
-void TypeVisitor::emitUnarySyntaxSugarType(const swift::UnarySyntaxSugarType* type,
-                                           TrapLabel<UnarySyntaxSugarTypeTag> label) {
-  assert(type->getBaseType() && "expect UnarySyntaxSugarType to have BaseType");
-  dispatcher_.emit(UnarySyntaxSugarTypesTrap{label, dispatcher_.fetchLabel(type->getBaseType())});
+void TypeVisitor::fillUnarySyntaxSugarType(const swift::UnarySyntaxSugarType& type,
+                                           codeql::UnarySyntaxSugarType& entry) {
+  assert(type.getBaseType() && "expect UnarySyntaxSugarType to have BaseType");
+  entry.base_type = dispatcher_.fetchLabel(type.getBaseType());
+  fillType(type, entry);
 }
 
 void TypeVisitor::emitAnyFunctionType(const swift::AnyFunctionType* type,
@@ -260,11 +256,19 @@ codeql::ExistentialType TypeVisitor::translateExistentialType(const swift::Exist
   fillType(type, entry);
   return entry;
 }
+
 codeql::DynamicSelfType TypeVisitor::translateDynamicSelfType(const swift::DynamicSelfType& type) {
   codeql::DynamicSelfType entry{dispatcher_.assignNewLabel(type)};
   entry.static_self_type = dispatcher_.fetchLabel(type.getSelfType());
   fillType(type, entry);
   return entry;
 }
 
+codeql::VariadicSequenceType TypeVisitor::translateVariadicSequenceType(
+    const swift::VariadicSequenceType& type) {
+  codeql::VariadicSequenceType entry{dispatcher_.assignNewLabel(type)};
+  fillUnarySyntaxSugarType(type, entry);
+  return entry;
+}
+
 }  // namespace codeql

swift/extractor/visitors/TypeVisitor.h

@@ -27,8 +27,8 @@ class TypeVisitor : public TypeVisitorBase<TypeVisitor> {
   void visitDependentMemberType(swift::DependentMemberType* type);
   void visitParenType(swift::ParenType* type);
   void visitUnarySyntaxSugarType(swift::UnarySyntaxSugarType* type);
-  void visitOptionalType(swift::OptionalType* type);
-  void visitArraySliceType(swift::ArraySliceType* type);
+  codeql::OptionalType translateOptionalType(const swift::OptionalType& type);
+  codeql::ArraySliceType translateArraySliceType(const swift::ArraySliceType& type);
   void visitDictionaryType(swift::DictionaryType* type);
   void visitGenericFunctionType(swift::GenericFunctionType* type);
   void visitGenericTypeParamType(swift::GenericTypeParamType* type);
@@ -40,12 +40,14 @@ class TypeVisitor : public TypeVisitorBase<TypeVisitor> {
   codeql::NestedArchetypeType translateNestedArchetypeType(const swift::NestedArchetypeType& type);
   codeql::ExistentialType translateExistentialType(const swift::ExistentialType& type);
   codeql::DynamicSelfType translateDynamicSelfType(const swift::DynamicSelfType& type);
+  codeql::VariadicSequenceType translateVariadicSequenceType(
+      const swift::VariadicSequenceType& type);
 
  private:
   void fillType(const swift::TypeBase& type, codeql::Type& entry);
   void fillArchetypeType(const swift::ArchetypeType& type, codeql::ArchetypeType& entry);
-  void emitUnarySyntaxSugarType(const swift::UnarySyntaxSugarType* type,
-                                TrapLabel<UnarySyntaxSugarTypeTag> label);
+  void fillUnarySyntaxSugarType(const swift::UnarySyntaxSugarType& type,
+                                codeql::UnarySyntaxSugarType& entry);
   void emitAnyFunctionType(const swift::AnyFunctionType* type, TrapLabel<AnyFunctionTypeTag> label);
   void emitBoundGenericType(swift::BoundGenericType* type, TrapLabel<BoundGenericTypeTag> label);
   void emitAnyGenericType(swift::AnyGenericType* type, TrapLabel<AnyGenericTypeTag> label);

swift/ql/test/extractor-tests/generated/type/VariadicSequenceType/MISSING_SOURCE.txt

@@ -0,0 +1,3 @@
+| Int... | getDiagnosticsName: | Int... | getCanonicalType: | Array<Int> | getBaseType: | Int |
+| T... | getDiagnosticsName: | T... | getCanonicalType: | Array<T> | getBaseType: | T |
+| T... | getDiagnosticsName: | T... | getCanonicalType: | Array<\u03c4_0_0> | getBaseType: | T |

swift/ql/test/extractor-tests/generated/type/VariadicSequenceType/VariadicSequenceType.expected

@@ -0,0 +1,13 @@
+// generated by codegen/codegen.py
+import codeql.swift.elements
+import TestUtils
+
+from VariadicSequenceType x, string getDiagnosticsName, Type getCanonicalType, Type getBaseType
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getDiagnosticsName = x.getDiagnosticsName() and
+  getCanonicalType = x.getCanonicalType() and
+  getBaseType = x.getBaseType()
+select x, "getDiagnosticsName:", getDiagnosticsName, "getCanonicalType:", getCanonicalType,
+  "getBaseType:", getBaseType

swift/ql/test/extractor-tests/generated/type/VariadicSequenceType/VariadicSequenceType.ql

@@ -0,0 +1,2 @@
+func foo(ints: Int...) {}
+func bar<T>(args: T...) {}