Merge pull request #84405 from nate-chandler/rdar160692694

[DiagnoseStaticExclusivity] Fix this assertion.

Author: nate-chandler

lib/SILOptimizer/Mandatory/DiagnoseStaticExclusivity.cpp

@@ -336,7 +336,7 @@ static StringRef extractExprText(const Expr *E, SourceManager &SM) {
 /// it is in the ifndef.
 #ifndef NDEBUG
 static bool isCallToStandardLibrarySwap(CallExpr *CE, ASTContext &Ctx) {
-  if (CE->getCalledValue() == Ctx.getSwap())
+  if (CE->getCalledValue(/*skipFunctionConversions=*/true) == Ctx.getSwap())
     return true;
 
   // Is the call module qualified, i.e. Swift.swap(&a[i], &[j)?

validation-test/SILOptimizer/rdar160692694.swift

@@ -0,0 +1,12 @@
+// RUN: %target-swift-frontend \
+// RUN:     -c \
+// RUN:     -verify \
+// RUN:     -disable-availability-checking \
+// RUN:     -swift-version 6 \
+// RUN:     %s
+
+typealias A = InlineArray<2, UInt64>
+func mix(_ a: inout A) {
+    swap(&a[0], &a[1]) // expected-error{{overlapping accesses}}
+                       // expected-note@-1{{conflicting access}}
+}