Merge pull request swiftlang#28446 from DougGregor/rdar57040259

Author: swift-ci

lib/Sema/TypeCheckStorage.cpp

@@ -2770,7 +2770,8 @@ StorageImplInfoRequest::evaluate(Evaluator &evaluator,
 
   // Check if we have observers.
   } else if (hasWillSet || hasDidSet) {
-    if (storage->getAttrs().hasAttribute<OverrideAttr>()) {
+    if (storage->getAttrs().hasAttribute<OverrideAttr>() &&
+        storage->getDeclContext()->isTypeContext()) {
       readImpl = ReadImplKind::Inherited;
     } else {
       readImpl = ReadImplKind::Stored;

validation-test/compiler_crashers_2_fixed/rdar57040259.swift

@@ -0,0 +1,9 @@
+// RUN: not %target-swift-frontend -typecheck %s
+class A { }
+class B: A {
+  func foo(_: () -> ()) {
+
+  override var prop: Any? {
+      didSet { }
+  }
+}