Merge pull request #17278 from DougGregor/inherited-protos-recurse

[AST] Block recursion through ProtocolDecl::getInheritedProtocols().

Author: DougGregor

include/swift/AST/Decl.h

@@ -487,7 +487,7 @@ class alignas(1 << DeclAlignInBits) Decl {
     HasValidatedLayout : 1
   );
 
-  SWIFT_INLINE_BITFIELD_FULL(ProtocolDecl, NominalTypeDecl, 1+1+1+1+1+1+1+2+8+16,
+  SWIFT_INLINE_BITFIELD_FULL(ProtocolDecl, NominalTypeDecl, 1+1+1+1+1+1+1+2+8+16+1,
     /// Whether the \c RequiresClass bit is valid.
     RequiresClassValid : 1,
 
@@ -520,7 +520,10 @@ class alignas(1 << DeclAlignInBits) Decl {
     KnownProtocol : 8, // '8' for speed. This only needs 6.
 
     /// The number of requirements in the requirement signature.
-    NumRequirementsInSignature : 16
+		NumRequirementsInSignature : 16,
+
+		/// Whether we are currently computing inherited protocols.
+		ComputingInheritedProtocols : 1
   );
 
   SWIFT_INLINE_BITFIELD(ClassDecl, NominalTypeDecl, 1+2+1+2+1+3+1+1,

lib/AST/Decl.cpp

@@ -3170,6 +3170,7 @@ ProtocolDecl::ProtocolDecl(DeclContext *DC, SourceLoc ProtocolLoc,
   Bits.ProtocolDecl.NumRequirementsInSignature = 0;
   Bits.ProtocolDecl.HasMissingRequirements = false;
   Bits.ProtocolDecl.KnownProtocol = 0;
+	Bits.ProtocolDecl.ComputingInheritedProtocols = false;
 }
 
 llvm::TinyPtrVector<ProtocolDecl *>
@@ -3180,6 +3181,10 @@ ProtocolDecl::getInheritedProtocols() const {
   // We shouldn't need this, but it shows up in recursive invocations.
   if (!isRequirementSignatureComputed()) {
     SmallPtrSet<ProtocolDecl *, 4> known;
+		if (Bits.ProtocolDecl.ComputingInheritedProtocols) return result;
+
+		auto *self = const_cast<ProtocolDecl *>(this);
+		self->Bits.ProtocolDecl.ComputingInheritedProtocols = true;
     for (unsigned index : indices(getInherited())) {
       if (auto type = getInheritedType(index)) {
         // Only protocols can appear in the inheritance clause
@@ -3195,6 +3200,7 @@ ProtocolDecl::getInheritedProtocols() const {
         }
       }
     }
+		self->Bits.ProtocolDecl.ComputingInheritedProtocols = false;
     return result;
   }
 

validation-test/compiler_crashers/28837-swift-protocolcompositiontype-get-swift-astcontext-const-llvm-arrayref-swift-typ.swift renamed to validation-test/compiler_crashers_fixed/28837-swift-protocolcompositiontype-get-swift-astcontext-const-llvm-arrayref-swift-typ.swift

@@ -5,6 +5,6 @@
 // See https://swift.org/LICENSE.txt for license information
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// RUN: not --crash %target-swift-frontend %s -emit-ir
+// RUN: not %target-swift-frontend %s -emit-ir
 protocol b:Self.a&(Int
 protocol b{}

validation-test/compiler_crashers/28844-swift-typebase-getcanonicaltype.swift renamed to validation-test/compiler_crashers_fixed/28844-swift-typebase-getcanonicaltype.swift

@@ -5,5 +5,5 @@
 // See https://swift.org/LICENSE.txt for license information
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// RUN: not --crash %target-swift-frontend %s -emit-ir
+// RUN: not %target-swift-frontend %s -emit-ir
 protocol A:Self.a&( A

validation-test/compiler_crashers/28862-swift-protocoldecl-getinheritedprotocols-const.swift renamed to validation-test/compiler_crashers_fixed/28862-swift-protocoldecl-getinheritedprotocols-const.swift

@@ -5,7 +5,7 @@
 // See https://swift.org/LICENSE.txt for license information
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// RUN: not --crash %target-swift-frontend %s -emit-ir
+// RUN: not %target-swift-frontend %s -emit-ir
 protocol A:RangeReplaceableCollection&(t:A{extension{}a e:class a{}class a
 {{}lass a=_{case.a<a =nil??as?=
 :a<a

validation-test/compiler_crashers/28867-swift-iterativetypechecker-issatisfied-swift-typecheckrequest.swift renamed to validation-test/compiler_crashers_fixed/28867-swift-iterativetypechecker-issatisfied-swift-typecheckrequest.swift

@@ -5,6 +5,6 @@
 // See https://swift.org/LICENSE.txt for license information
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// RUN: not --crash %target-swift-frontend %s -emit-ir
+// RUN: not %target-swift-frontend %s -emit-ir
 protocol A:a
 & {}typealias a:A