Merge pull request #15527 from DougGregor/typealias-from-debugger

[AST] Skip verification of typealiases marked as "debugger aliases".

Author: DougGregor

include/swift/AST/Decl.h

@@ -426,9 +426,11 @@ class alignas(1 << DeclAlignInBits) Decl {
 
   SWIFT_INLINE_BITFIELD_EMPTY(GenericTypeDecl, TypeDecl);
 
-  SWIFT_INLINE_BITFIELD(TypeAliasDecl, GenericTypeDecl, 1,
+  SWIFT_INLINE_BITFIELD(TypeAliasDecl, GenericTypeDecl, 1+1,
     /// Whether the typealias forwards perfectly to its underlying type.
-    IsCompatibilityAlias : 1
+    IsCompatibilityAlias : 1,
+    /// Whether this was a global typealias synthesized by the debugger.
+    IsDebuggerAlias : 1;
   );
 
   SWIFT_INLINE_BITFIELD(NominalTypeDecl, GenericTypeDecl, 1+1+1,
@@ -2519,6 +2521,12 @@ class TypeAliasDecl : public GenericTypeDecl {
     Bits.TypeAliasDecl.IsCompatibilityAlias = newValue;
   }
 
+  /// Is this a special debugger variable?
+  bool isDebuggerAlias() const { return Bits.TypeAliasDecl.IsDebuggerAlias; }
+  void markAsDebuggerAlias(bool isDebuggerAlias) {
+    Bits.TypeAliasDecl.IsDebuggerAlias = isDebuggerAlias;
+  }
+
   static bool classof(const Decl *D) {
     return D->getKind() == DeclKind::TypeAlias;
   }

lib/AST/ASTVerifier.cpp

@@ -445,6 +445,20 @@ class Verifier : public ASTWalker {
     bool shouldVerify(Pattern *S) { return true; }
     bool shouldVerify(Decl *S) { return true; }
 
+    bool shouldVerify(TypeAliasDecl *typealias) {
+      // Don't verify type aliases formed by the debugger; they violate some
+      // AST invariants involving archetypes.
+      if (typealias->isDebuggerAlias()) return false;
+
+      // FIXME: Temporary hack to bridge the gap until LLDB starts setting
+      // the "debugger alias" flag.
+      if (typealias->getName().str().startswith("$") &&
+          typealias->getName().str().contains("lldb"))
+        return false;
+
+      return true;
+    }
+
     // Default cases for whether we should verify a checked subtree.
     bool shouldVerifyChecked(Expr *E) {
       if (!E->getType()) {
@@ -582,8 +596,7 @@ class Verifier : public ASTWalker {
         abort();
       }
 
-      bool foundError = false &&
-      type->getCanonicalType().findIf([&](Type type) -> bool {
+      bool foundError = type->getCanonicalType().findIf([&](Type type) -> bool {
         if (auto archetype = type->getAs<ArchetypeType>()) {
           // Only visit each archetype once.
           if (!visitedArchetypes.insert(archetype).second)

lib/AST/Decl.cpp

@@ -2527,6 +2527,7 @@ TypeAliasDecl::TypeAliasDecl(SourceLoc TypeAliasLoc, SourceLoc EqualLoc,
   : GenericTypeDecl(DeclKind::TypeAlias, DC, Name, NameLoc, {}, GenericParams),
     TypeAliasLoc(TypeAliasLoc), EqualLoc(EqualLoc) {
   Bits.TypeAliasDecl.IsCompatibilityAlias = false;
+  Bits.TypeAliasDecl.IsDebuggerAlias = false;
 }
 
 SourceRange TypeAliasDecl::getSourceRange() const {