Don't ask for the typechecked body in featureset

Author: Azoy

include/swift/AST/TypeCheckRequests.h

@@ -3598,7 +3598,7 @@ class LookupAllConformancesInContextRequest
 class CheckRedeclarationRequest
     : public SimpleRequest<
           CheckRedeclarationRequest,
-          evaluator::SideEffect(ValueDecl *),
+          evaluator::SideEffect(ValueDecl *, NominalTypeDecl *),
           RequestFlags::SeparatelyCached | RequestFlags::DependencySource |
               RequestFlags::DependencySink> {
 public:
@@ -3611,7 +3611,8 @@ class CheckRedeclarationRequest
   /// \p SelfNominalType is \c VD->getDeclContext()->getSelfNominalType().
   /// Passed as a parameter in here so this request doesn't tigger self nominal
   /// type computation.
-  evaluator::SideEffect evaluate(Evaluator &evaluator, ValueDecl *VD) const;
+  evaluator::SideEffect evaluate(Evaluator &evaluator, ValueDecl *VD,
+                                 NominalTypeDecl *SelfNominalType) const;
 
 public:
   // Separate caching.

lib/AST/FeatureSet.cpp

@@ -507,7 +507,7 @@ static bool usesFeatureValueGenericsNameLookup(Decl *decl) {
   if (!fn)
     return false;
 
-  auto body = fn->getTypecheckedBody();
+  auto body = fn->getMacroExpandedBody();
 
   if (!body)
     return false;

lib/AST/TypeCheckRequests.cpp

@@ -1579,7 +1579,7 @@ void CheckRedeclarationRequest::writeDependencySink(
     return;
 
   if (currentDC->isTypeContext()) {
-    if (auto nominal = currentDC->getSelfNominalTypeDecl()) {
+    if (auto nominal = std::get<1>(getStorage())) {
       tracker.addUsedMember(nominal, current->getBaseName());
     }
   } else {

lib/Sema/TypeCheckDeclPrimary.cpp

@@ -691,7 +691,8 @@ static void checkRedeclaration(PrecedenceGroupDecl *group) {
 
 /// Check whether \c current is a redeclaration.
 evaluator::SideEffect
-CheckRedeclarationRequest::evaluate(Evaluator &eval, ValueDecl *current) const {
+CheckRedeclarationRequest::evaluate(Evaluator &eval, ValueDecl *current,
+                                    NominalTypeDecl *SelfNominalType) const {
   // Ignore invalid and anonymous declarations.
   if (current->isInvalid() || !current->hasName())
     return std::make_tuple<>();
@@ -2362,7 +2363,11 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
       // Force some requests, which can produce diagnostics.
 
       // Check redeclaration.
-      (void)evaluateOrDefault(Ctx.evaluator, CheckRedeclarationRequest{VD}, {});
+      (void)evaluateOrDefault(
+          Ctx.evaluator,
+          CheckRedeclarationRequest{
+              VD, VD->getDeclContext()->getSelfNominalTypeDecl()},
+          {});
 
       // Compute access level.
       (void) VD->getFormalAccess();