Merge pull request #77475 from slavapestov/fix-rdar139237781

Sema: Fix handling of appliedPropertyWrappers in ConstraintSystem::replaySolution()

Author: slavapestov

lib/AST/NameLookup.cpp

@@ -3812,7 +3812,7 @@ CustomAttrNominalRequest::evaluate(Evaluator &evaluator,
         directReferencesForTypeRepr(evaluator, ctx, typeRepr, dc,
                                     defaultDirectlyReferencedTypeLookupOptions);
   } else if (Type type = attr->getType()) {
-    decls = directReferencesForType(type);
+    return type->getAnyNominal();
   }
 
   // Dig out the nominal type declarations.

lib/Sema/CSApply.cpp

@@ -6403,6 +6403,8 @@ ArgumentList *ExprRewriter::coerceCallArguments(
     arg.setExpr(convertedArg);
     newArgs.push_back(arg);
   }
+
+  ASSERT(appliedWrapperIndex == appliedPropertyWrappers.size());
   return ArgumentList::createTypeChecked(ctx, args, newArgs);
 }
 

lib/Sema/CSGen.cpp

@@ -5045,6 +5045,10 @@ void ConstraintSystem::removePropertyWrapper(Expr *anchor) {
   auto &wrappers = found->second;
   ASSERT(!wrappers.empty());
   wrappers.pop_back();
+  if (wrappers.empty()) {
+    bool erased = appliedPropertyWrappers.erase(anchor);
+    ASSERT(erased);
+  }
 }
 
 ConstraintSystem::TypeMatchResult

lib/Sema/CSSolver.cpp

@@ -431,11 +431,10 @@ void ConstraintSystem::replaySolution(const Solution &solution,
   for (const auto &appliedWrapper : solution.appliedPropertyWrappers) {
     auto found = appliedPropertyWrappers.find(appliedWrapper.first);
     if (found == appliedPropertyWrappers.end()) {
-      appliedPropertyWrappers.insert(appliedWrapper);
+      for (auto applied : appliedWrapper.second)
+        applyPropertyWrapper(getAsExpr(appliedWrapper.first), applied);
     } else {
-      auto &existing = found->second;
-      ASSERT(existing.size() <= appliedWrapper.second.size());
-      existing = appliedWrapper.second;
+      ASSERT(found->second.size() == appliedWrapper.second.size());
     }
   }
 

validation-test/Sema/SwiftUI/rdar139237781.swift

@@ -0,0 +1,30 @@
+// RUN: %target-typecheck-verify-swift -target %target-cpu-apple-macosx12
+
+// REQUIRES: objc_interop
+// REQUIRES: OS=macosx
+
+import SwiftUI
+
+struct V: View {
+    struct M: Identifiable {
+        let id: String
+    }
+
+    class C: ObservableObject {
+        @Published var m: [M]
+
+        init() {
+            self.m = []
+        }
+    }
+
+    @ObservedObject var c: C
+
+    var body: some View {
+        Table($c.m) {
+            TableColumn("") { $entry in
+                Text("hi")
+            }
+        }
+    }
+}