Merge pull request #11209 from github/redsun82/swift-drop-impossible-nodes

Swift: drop impossible nodes from schema

Author: redsun82

swift/extractor/infra/SwiftTagTraits.h

@@ -9,25 +9,39 @@
 
 namespace codeql {
 
-// codegen goes with QL acronym convention (Sil instead of SIL), we need to remap it to Swift's
-// convention
-using SILBlockStorageTypeTag = SilBlockStorageTypeTag;
-using SILBoxTypeTag = SilBoxTypeTag;
-using SILFunctionTypeTag = SilFunctionTypeTag;
-using SILTokenTypeTag = SilTokenTypeTag;
-
 // OverloadSetRefExpr is collapsed with its only derived class OverloadedDeclRefExpr
 using OverloadSetRefExprTag = OverloadedDeclRefExprTag;
 
+// We don't really expect to see the following in extraction. Mapping these tags to void effectively
+// ignores all elements of that class (with a message).
+
+// only generated for code editing
+using CodeCompletionExprTag = void;
+using EditorPlaceholderExprTag = void;
+// not present after the Sema phase
+using ArrowExprTag = void;
+// experimental variadic generics, implemented only in the frontend for now, thus not compilable
+using PackExprTag = void;
+using PackTypeTag = void;
+using ReifyPackExprTag = void;
+using PackExpansionTypeTag = 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;
+
 #define MAP_TYPE_TO_TAG(TYPE, TAG)    \
   template <>                         \
   struct detail::ToTagFunctor<TYPE> { \
     using type = TAG;                 \
   }
 #define MAP_TAG(TYPE) MAP_TYPE_TO_TAG(swift::TYPE, TYPE##Tag)
-#define MAP_SUBTAG(TYPE, PARENT)                           \
-  MAP_TAG(TYPE);                                           \
-  static_assert(std::is_base_of_v<PARENT##Tag, TYPE##Tag>, \
+#define MAP_SUBTAG(TYPE, PARENT)                                                              \
+  MAP_TAG(TYPE);                                                                              \
+  static_assert(std::is_same_v<TYPE##Tag, void> || std::is_base_of_v<PARENT##Tag, TYPE##Tag>, \
                 #PARENT "Tag must be a base of " #TYPE "Tag");
 
 #define OVERRIDE_TAG(TYPE, TAG)               \

swift/extractor/translators/ExprTranslator.cpp

@@ -584,6 +584,7 @@ static int translatePropertyWrapperValueKind(swift::AppliedPropertyWrapperExpr::
       return 0;
   }
 }
+
 codeql::AppliedPropertyWrapperExpr ExprTranslator::translateAppliedPropertyWrapperExpr(
     const swift::AppliedPropertyWrapperExpr& expr) {
   auto entry = createExprEntry(expr);

swift/extractor/translators/TranslatorBase.h

@@ -62,10 +62,15 @@ DEFINE_TRANSLATE_CHECKER(TypeRepr, , )
 // superclasses by default and instead provide our own TBD default (using the exact type).
 // Moreover, if the implementation class has translate##CLASS##KIND (that uses generated C++
 // classes), for the class of for a parent thereof, we want to use that. We detect that by using the
-// type traits HasTranslate##CLASS##KIND defined above
+// type traits HasTranslate##CLASS##KIND defined above.
+// A special case is for explicitly ignored classes marked with void, which we should never
+// encounter.
 #define DEFINE_VISIT(KIND, CLASS, PARENT)                                            \
   void visit##CLASS##KIND(swift::CLASS##KIND* e) {                                   \
-    if constexpr (detail::HasTranslate##CLASS##KIND<CrtpSubclass>::value) {          \
+    if constexpr (std::is_same_v<CLASS##KIND##Tag, void>) {                          \
+      std::cerr << "Unexpected " #CLASS #KIND "\n";                                  \
+      return;                                                                        \
+    } else if constexpr (detail::HasTranslate##CLASS##KIND<CrtpSubclass>::value) {   \
       dispatcher.emit(static_cast<CrtpSubclass*>(this)->translate##CLASS##KIND(*e)); \
     } else if constexpr (detail::HasTranslate##PARENT<CrtpSubclass>::value) {        \
       dispatcher.emit(static_cast<CrtpSubclass*>(this)->translate##PARENT(*e));      \
@@ -105,9 +110,6 @@ class AstTranslatorBase : private swift::ASTVisitor<CrtpSubclass>,
 
 #define PATTERN(CLASS, PARENT) DEFINE_VISIT(Pattern, CLASS, PARENT)
 #include "swift/AST/PatternNodes.def"
-
-#define TYPEREPR(CLASS, PARENT) DEFINE_VISIT(TypeRepr, CLASS, PARENT)
-#include "swift/AST/TypeReprNodes.def"
 };
 
 // base class for our type visitor, getting a SwiftDispatcher member and define_visit emission for

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

@@ -64,7 +64,6 @@ import codeql.swift.elements.expr.ArchetypeToSuperExpr
 import codeql.swift.elements.expr.Argument
 import codeql.swift.elements.expr.ArrayExpr
 import codeql.swift.elements.expr.ArrayToPointerExpr
-import codeql.swift.elements.expr.ArrowExpr
 import codeql.swift.elements.expr.AssignExpr
 import codeql.swift.elements.expr.AutoClosureExpr
 import codeql.swift.elements.expr.AwaitExpr
@@ -79,7 +78,6 @@ import codeql.swift.elements.expr.CaptureListExpr
 import codeql.swift.elements.expr.CheckedCastExpr
 import codeql.swift.elements.expr.ClassMetatypeToObjectExpr
 import codeql.swift.elements.expr.ClosureExpr
-import codeql.swift.elements.expr.CodeCompletionExpr
 import codeql.swift.elements.expr.CoerceExpr
 import codeql.swift.elements.expr.CollectionExpr
 import codeql.swift.elements.expr.CollectionUpcastConversionExpr
@@ -103,7 +101,6 @@ import codeql.swift.elements.expr.DynamicLookupExpr
 import codeql.swift.elements.expr.DynamicMemberRefExpr
 import codeql.swift.elements.expr.DynamicSubscriptExpr
 import codeql.swift.elements.expr.DynamicTypeExpr
-import codeql.swift.elements.expr.EditorPlaceholderExpr
 import codeql.swift.elements.expr.EnumIsCaseExpr
 import codeql.swift.elements.expr.ErasureExpr
 import codeql.swift.elements.expr.ErrorExpr
@@ -151,7 +148,6 @@ import codeql.swift.elements.expr.OptionalEvaluationExpr
 import codeql.swift.elements.expr.OptionalTryExpr
 import codeql.swift.elements.expr.OtherConstructorDeclRefExpr
 import codeql.swift.elements.expr.OverloadedDeclRefExpr
-import codeql.swift.elements.expr.PackExpr
 import codeql.swift.elements.expr.ParenExpr
 import codeql.swift.elements.expr.PointerToPointerExpr
 import codeql.swift.elements.expr.PostfixUnaryExpr
@@ -160,7 +156,6 @@ import codeql.swift.elements.expr.PropertyWrapperValuePlaceholderExpr
 import codeql.swift.elements.expr.ProtocolMetatypeToObjectExpr
 import codeql.swift.elements.expr.RebindSelfInConstructorExpr
 import codeql.swift.elements.expr.RegexLiteralExpr
-import codeql.swift.elements.expr.ReifyPackExpr
 import codeql.swift.elements.expr.SelfApplyExpr
 import codeql.swift.elements.expr.SequenceExpr
 import codeql.swift.elements.expr.StringLiteralExpr
@@ -262,20 +257,13 @@ import codeql.swift.elements.type.NominalType
 import codeql.swift.elements.type.OpaqueTypeArchetypeType
 import codeql.swift.elements.type.OpenedArchetypeType
 import codeql.swift.elements.type.OptionalType
-import codeql.swift.elements.type.PackExpansionType
-import codeql.swift.elements.type.PackType
 import codeql.swift.elements.type.ParameterizedProtocolType
 import codeql.swift.elements.type.ParenType
-import codeql.swift.elements.type.PlaceholderType
 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.SilBlockStorageType
-import codeql.swift.elements.type.SilBoxType
-import codeql.swift.elements.type.SilFunctionType
-import codeql.swift.elements.type.SilTokenType
 import codeql.swift.elements.type.StructType
 import codeql.swift.elements.type.SubstitutableType
 import codeql.swift.elements.type.SugarType