Merge branch 'main' into redsun82/swift-error-element

Author: redsun82

swift/extractor/infra/SwiftTagTraits.h

@@ -25,13 +25,16 @@ using PackExprTag = void;
 using PackTypeTag = void;
 using ReifyPackExprTag = void;
 using PackExpansionTypeTag = void;
+using SequenceArchetypeTypeTag = void;
 // Placeholder types appear in ambiguous types but are anyway transformed to UnresolvedType
 using PlaceholderTypeTag = void;
 // SIL types that cannot really appear in the frontend run
 using SILBlockStorageTypeTag = void;
 using SILBoxTypeTag = void;
 using SILFunctionTypeTag = void;
 using SILTokenTypeTag = void;
+// This is created during type checking and is only used for constraint checking
+using TypeVariableTypeTag = void;
 
 #define MAP_TYPE_TO_TAG(TYPE, TAG)    \
   template <>                         \

swift/extractor/translators/TypeTranslator.cpp

@@ -258,4 +258,20 @@ codeql::OpaqueTypeArchetypeType TypeTranslator::translateOpaqueTypeArchetypeType
   entry.declaration = dispatcher.fetchLabel(type.getDecl());
   return entry;
 }
+
+codeql::ErrorType TypeTranslator::translateErrorType(const swift::ErrorType& type) {
+  return createTypeEntry(type);
+}
+
+codeql::UnresolvedType TypeTranslator::translateUnresolvedType(const swift::UnresolvedType& type) {
+  return createTypeEntry(type);
+}
+
+codeql::ParameterizedProtocolType TypeTranslator::translateParameterizedProtocolType(
+    const swift::ParameterizedProtocolType& type) {
+  auto entry = createTypeEntry(type);
+  entry.base = dispatcher.fetchLabel(type.getBaseType());
+  entry.args = dispatcher.fetchRepeatedLabels(type.getArgs());
+  return entry;
+}
 }  // namespace codeql

swift/extractor/translators/TypeTranslator.h

@@ -71,6 +71,10 @@ class TypeTranslator : public TypeTranslatorBase<TypeTranslator> {
   codeql::ModuleType translateModuleType(const swift::ModuleType& type);
   codeql::OpaqueTypeArchetypeType translateOpaqueTypeArchetypeType(
       const swift::OpaqueTypeArchetypeType& type);
+  codeql::ErrorType translateErrorType(const swift::ErrorType& type);
+  codeql::UnresolvedType translateUnresolvedType(const swift::UnresolvedType& type);
+  codeql::ParameterizedProtocolType translateParameterizedProtocolType(
+      const swift::ParameterizedProtocolType& type);
 
  private:
   void fillType(const swift::TypeBase& type, codeql::Type& entry);

swift/ql/lib/codeql/swift/elements.qll

@@ -263,7 +263,6 @@ import codeql.swift.elements.type.PrimaryArchetypeType
 import codeql.swift.elements.type.ProtocolCompositionType
 import codeql.swift.elements.type.ProtocolType
 import codeql.swift.elements.type.ReferenceStorageType
-import codeql.swift.elements.type.SequenceArchetypeType
 import codeql.swift.elements.type.StructType
 import codeql.swift.elements.type.SubstitutableType
 import codeql.swift.elements.type.SugarType
@@ -272,7 +271,6 @@ import codeql.swift.elements.type.TupleType
 import codeql.swift.elements.type.Type
 import codeql.swift.elements.type.TypeAliasType
 import codeql.swift.elements.type.TypeRepr
-import codeql.swift.elements.type.TypeVariableType
 import codeql.swift.elements.type.UnarySyntaxSugarType
 import codeql.swift.elements.type.UnboundGenericType
 import codeql.swift.elements.type.UnmanagedStorageType

swift/ql/lib/codeql/swift/elements/type/SequenceArchetypeType.qll

@@ -4001,21 +4001,6 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfTypeVariableType(
-    TypeVariableType e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bType, int n |
-      b = 0 and
-      bType = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfType(e, i, _)) | i) and
-      n = bType and
-      (
-        none()
-        or
-        result = getImmediateChildOfType(e, index - b, partialPredicateCall)
-      )
-    )
-  }
-
   private Element getImmediateChildOfUnresolvedType(
     UnresolvedType e, int index, string partialPredicateCall
   ) {
@@ -4570,22 +4555,6 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfSequenceArchetypeType(
-    SequenceArchetypeType e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bArchetypeType, int n |
-      b = 0 and
-      bArchetypeType =
-        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfArchetypeType(e, i, _)) | i) and
-      n = bArchetypeType and
-      (
-        none()
-        or
-        result = getImmediateChildOfArchetypeType(e, index - b, partialPredicateCall)
-      )
-    )
-  }
-
   private Element getImmediateChildOfUnarySyntaxSugarType(
     UnarySyntaxSugarType e, int index, string partialPredicateCall
   ) {
@@ -5136,8 +5105,6 @@ private module Impl {
     or
     result = getImmediateChildOfTupleType(e, index, partialAccessor)
     or
-    result = getImmediateChildOfTypeVariableType(e, index, partialAccessor)
-    or
     result = getImmediateChildOfUnresolvedType(e, index, partialAccessor)
     or
     result = getImmediateChildOfBuiltinBridgeObjectType(e, index, partialAccessor)
@@ -5194,8 +5161,6 @@ private module Impl {
     or
     result = getImmediateChildOfPrimaryArchetypeType(e, index, partialAccessor)
     or
-    result = getImmediateChildOfSequenceArchetypeType(e, index, partialAccessor)
-    or
     result = getImmediateChildOfArraySliceType(e, index, partialAccessor)
     or
     result = getImmediateChildOfBoundGenericClassType(e, index, partialAccessor)

swift/ql/lib/codeql/swift/elements/type/SequenceArchetypeTypeConstructor.qll

@@ -1324,6 +1324,10 @@ module Raw {
 
   class ParameterizedProtocolType extends @parameterized_protocol_type, Type {
     override string toString() { result = "ParameterizedProtocolType" }
+
+    ProtocolType getBase() { parameterized_protocol_types(this, result) }
+
+    Type getArg(int index) { parameterized_protocol_type_args(this, index, result) }
   }
 
   class ProtocolCompositionType extends @protocol_composition_type, Type {
@@ -1348,10 +1352,6 @@ module Raw {
     string getName(int index) { tuple_type_names(this, index, result) }
   }
 
-  class TypeVariableType extends @type_variable_type, Type {
-    override string toString() { result = "TypeVariableType" }
-  }
-
   class UnresolvedType extends @unresolved_type, Type, ErrorElement {
     override string toString() { result = "UnresolvedType" }
   }
@@ -1501,10 +1501,6 @@ module Raw {
     override string toString() { result = "PrimaryArchetypeType" }
   }
 
-  class SequenceArchetypeType extends @sequence_archetype_type, ArchetypeType {
-    override string toString() { result = "SequenceArchetypeType" }
-  }
-
   class UnarySyntaxSugarType extends @unary_syntax_sugar_type, SyntaxSugarType {
     Type getBaseType() { unary_syntax_sugar_types(this, result) }
   }