From 85431e745cda668bb4559b2839834d4899141e2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alex@alexrp.com>
Date: Fri, 9 May 2025 10:21:37 +0200
Subject: [PATCH] libcxx: Backport llvm/llvm-project#137594.

---
 lib/libcxx/include/__flat_map/flat_map.h      | 2 +-
 lib/libcxx/include/__flat_map/flat_multimap.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/libcxx/include/__flat_map/flat_map.h b/lib/libcxx/include/__flat_map/flat_map.h
index a0594ed9dc..9cc39c0a1e 100644
--- a/lib/libcxx/include/__flat_map/flat_map.h
+++ b/lib/libcxx/include/__flat_map/flat_map.h
@@ -113,7 +113,7 @@ public:
 
   class value_compare {
   private:
-    key_compare __comp_;
+    _LIBCPP_NO_UNIQUE_ADDRESS key_compare __comp_;
     _LIBCPP_HIDE_FROM_ABI value_compare(key_compare __c) : __comp_(__c) {}
     friend flat_map;
 
diff --git a/lib/libcxx/include/__flat_map/flat_multimap.h b/lib/libcxx/include/__flat_map/flat_multimap.h
index ea77fb5d79..15fcd7995a 100644
--- a/lib/libcxx/include/__flat_map/flat_multimap.h
+++ b/lib/libcxx/include/__flat_map/flat_multimap.h
@@ -115,7 +115,7 @@ public:
 
   class value_compare {
   private:
-    key_compare __comp_;
+    _LIBCPP_NO_UNIQUE_ADDRESS key_compare __comp_;
     _LIBCPP_HIDE_FROM_ABI value_compare(key_compare __c) : __comp_(__c) {}
     friend flat_multimap;