[Name Lookup] Remove property wrapper name lookup flags and generalize

unqualified lookup of auxiliary decl names.

Author: hborla

include/swift/AST/NameLookup.h

@@ -225,8 +225,6 @@ enum class UnqualifiedLookupFlags {
   /// This lookup should include results from outside the innermost scope with
   /// results.
   IncludeOuterResults   = 1 << 4,
-  /// Includes property wrapper name lookup results
-  IncludePropertyWrapperResults = 1 << 5,
 };
 
 using UnqualifiedLookupOptions = OptionSet<UnqualifiedLookupFlags>;

lib/AST/UnqualifiedLookup.cpp

@@ -605,25 +605,19 @@ bool ASTScopeDeclConsumerForUnqualifiedLookup::consume(
 
     auto fullName = factory.Name.getFullName();
     if (!value->getName().matchesRef(fullName)) {
-      if (!factory.options.contains(UnqualifiedLookupFlags::IncludePropertyWrapperResults))
-        continue;
-
-      auto *varDecl = dyn_cast<VarDecl>(value);
-      if (!varDecl || !varDecl->hasAttachedPropertyWrapper())
-        continue;
-
-      auto wrapperInfo = varDecl->getPropertyWrapperBackingPropertyInfo();
-      if (!wrapperInfo)
-        continue;
+      bool foundMatch = false;
+      if (auto *varDecl = dyn_cast<VarDecl>(value)) {
+        // Check if the name matches any auxiliary decls not in the AST
+        varDecl->visitAuxiliaryDecls([&](VarDecl *auxiliaryVar) {
+          if (auxiliaryVar->ValueDecl::getName().matchesRef(fullName)) {
+            value = auxiliaryVar;
+            foundMatch = true;
+          }
+        });
+      }
 
-      if (wrapperInfo.backingVar->ValueDecl::getName().matchesRef(fullName)) {
-        value = wrapperInfo.backingVar;
-      } else if (wrapperInfo.projectionVar &&
-                 wrapperInfo.projectionVar->ValueDecl::getName().matchesRef(fullName)) {
-        value = wrapperInfo.projectionVar;
-      } else {
+      if (!foundMatch)
         continue;
-      }
     }
 
     // In order to preserve the behavior of the existing context-based lookup,

lib/Sema/TypeCheckConstraints.cpp

@@ -538,10 +538,6 @@ Expr *TypeChecker::resolveDeclRefExpr(UnresolvedDeclRefExpr *UDRE,
   //       name/module qualifier to access top-level name.
   lookupOptions |= NameLookupFlags::IncludeOuterResults;
 
-  // Include property wrapper results in case we have a reference to a backing
-  // property wrapper or projected value
-  lookupOptions |= NameLookupFlags::IncludePropertyWrapperResults;
-
   if (Loc.isInvalid())
     DC = DC->getModuleScopeContext();
 

lib/Sema/TypeCheckNameLookup.cpp

@@ -211,8 +211,6 @@ convertToUnqualifiedLookupOptions(NameLookupOptions options) {
     newOptions |= UnqualifiedLookupFlags::IgnoreAccessControl;
   if (options.contains(NameLookupFlags::IncludeOuterResults))
     newOptions |= UnqualifiedLookupFlags::IncludeOuterResults;
-  if (options.contains(NameLookupFlags::IncludePropertyWrapperResults))
-    newOptions |= UnqualifiedLookupFlags::IncludePropertyWrapperResults;
 
   return newOptions;
 }

lib/Sema/TypeChecker.h

@@ -192,8 +192,6 @@ enum class NameLookupFlags {
   /// Whether to include results from outside the innermost scope that has a
   /// result.
   IncludeOuterResults = 1 << 1,
-  /// Whether to consider property wrapper names
-  IncludePropertyWrapperResults = 1 << 2,
 };
 
 /// A set of options that control name lookup.