Merge pull request #35533 from CodaFi/con-forma-session

[5.4] Use the Correct DeclContext When Simplifying Member Constraints

Author: tkremenek

lib/Sema/CSSimplify.cpp

@@ -7472,11 +7472,11 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyMemberConstraint(
           if (!paramDecl)
             continue;
 
-          auto descriptor = UnqualifiedLookupDescriptor(
+          auto descriptor = UnqualifiedLookupDescriptor{
               DeclNameRef(param->getName()),
-              paramDecl->getDeclContext()->getParentSourceFile(),
+              paramDecl->getDeclContext()->getModuleScopeContext(),
               SourceLoc(),
-              UnqualifiedLookupFlags::TypeLookup);
+              UnqualifiedLookupFlags::TypeLookup};
           auto lookup = evaluateOrDefault(
               Context.evaluator, UnqualifiedLookupRequest{descriptor}, {});
           for (auto &result : lookup) {

validation-test/compiler_crashers_2_fixed/rdar73379770.swift

@@ -0,0 +1,8 @@
+// RUN: not %target-swift-frontend -typecheck %s
+
+typealias IndexResult = Result<Bol, Error>
+extension IndexResult {
+  func perfect() -> Self {
+    Success(true)
+  }
+}