Merge pull request #19754 from DougGregor/objc-assoc-type-crash

Author: swift-ci

lib/AST/Decl.cpp

@@ -3651,13 +3651,22 @@ ProtocolDecl::getInheritedProtocols() const {
 llvm::TinyPtrVector<AssociatedTypeDecl *>
 ProtocolDecl::getAssociatedTypeMembers() const {
   llvm::TinyPtrVector<AssociatedTypeDecl *> result;
-  if (!isObjC()) {
-    for (auto member : getMembers()) {
-      if (auto ATD = dyn_cast<AssociatedTypeDecl>(member)) {
-        result.push_back(ATD);
-      }
+
+  // Clang-imported protocols never have associated types.
+  if (hasClangNode())
+    return result;
+
+  // Deserialized @objc protocols never have associated types.
+  if (!getParentSourceFile() && isObjC())
+    return result;
+
+  // Find the associated type declarations.
+  for (auto member : getMembers()) {
+    if (auto ATD = dyn_cast<AssociatedTypeDecl>(member)) {
+      result.push_back(ATD);
     }
   }
+
   return result;
 }
 

validation-test/Runtime/sr8666.swift

@@ -0,0 +1,57 @@
+// RUN: %target-run-simple-swift
+// REQUIRES: executable_test
+
+private protocol AnyChangeTracker {
+    var myVariable: Any? { get }
+    var isModified: Bool { get }
+}
+
+protocol ChangeTrackerType {
+    associatedtype Value
+    var originalValue: Value { get }
+    var value: Value { get set }
+    var isModified: Bool { get }
+}
+
+extension ChangeTrackerType where Value: Equatable {
+    var isModified: Bool {
+	return value != originalValue
+    }
+}
+
+struct ChangeTracker<T: Equatable>: ChangeTrackerType {
+    let originalValue: T
+    var value: T
+
+    init(value: T) {
+	originalValue = value
+	self.value = value
+    }
+}
+
+extension ChangeTracker: AnyChangeTracker where Value: OptionalType, Value.Wrapped: Equatable {
+    var myVariable: Any? {
+	return value
+    }
+}
+
+protocol OptionalType {
+    associatedtype Wrapped
+    var value: Wrapped? { get }
+}
+
+extension Optional: OptionalType {
+    var value: Wrapped? {
+	return self
+    }
+}
+
+let s: Any = ChangeTracker<String?>(value: "Foo")
+
+guard let s = s as? AnyChangeTracker else {
+  fatalError("Does not comply to AnyChangeTracker")
+}
+
+let myVar = String(describing: s.myVariable ?? "nil")
+assert(myVar == "Optional(\"Foo\")")
+

validation-test/compiler_crashers_2_fixed/0176-sr-8094.swift

@@ -0,0 +1,14 @@
+// RUN: not %target-swift-frontend -typecheck %s
+
+@objc protocol Foo {
+    associatedtype Bar
+    var property: Generic<Bar> { get }
+}
+
+class Generic<Element> {
+}
+
+class FooImpl<T>: NSObject, Foo {
+    let property: Generic<T>
+}
+

validation-test/compiler_crashers/28859-resolver-unable-to-resolve-type-witness.swift renamed to validation-test/compiler_crashers_fixed/28859-resolver-unable-to-resolve-type-witness.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
 
-// REQUIRES: asserts
-// RUN: not --crash %target-swift-frontend %s -emit-ir
+
+// RUN: not %target-swift-frontend %s -emit-ir
 class a:P@objc protocol P{{}func a:a{}{}typealias a