Merge pull request #10439 from tshortli/feature-avail-decl-lookup-swift-6.2

[swift/release/6.2] Store the backing decl on AvailabilityDomainInfo

Author: bnbarham

clang/include/clang/AST/ASTContext.h

@@ -804,6 +804,7 @@ class ASTContext : public RefCountedBase<ASTContext> {
 
   struct AvailabilityDomainInfo {
     FeatureAvailKind Kind = FeatureAvailKind::None;
+    Decl *Decl = nullptr;
     ImplicitCastExpr *Call = nullptr;
     bool isInvalid() const { return Kind == FeatureAvailKind::None; }
   };

clang/lib/AST/ASTContext.cpp

@@ -950,7 +950,7 @@ ASTContext::getFeatureAvailInfo(Decl *D) const {
     llvm_unreachable("invalid feature kind");
   }
 
-  ASTContext::AvailabilityDomainInfo Info{Kind, nullptr};
+  ASTContext::AvailabilityDomainInfo Info{Kind, D, nullptr};
 
   if (Kind == FeatureAvailKind::Dynamic) {
     Expr *FnExpr = Init->getInit(1);