From 13936bb258426293a436b959b275fe111e4c7659 Mon Sep 17 00:00:00 2001
From: "Ralf W. Grosse-Kunstleve" <rwgk@google.com>
Date: Thu, 23 Mar 2023 22:12:13 -0700
Subject: [PATCH] Apply descr.h `src_loc` change (smart_holder PR #4022) to
 code added with master PR #4587

---
 include/pybind11/detail/descr.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/pybind11/detail/descr.h b/include/pybind11/detail/descr.h
index 743bbf2ee..6a30b29bc 100644
--- a/include/pybind11/detail/descr.h
+++ b/include/pybind11/detail/descr.h
@@ -242,7 +242,8 @@ constexpr descr<N, Ts...> concat(const descr<N, Ts...> &descr) {
 template <size_t N1, size_t N2, typename... Ts1, typename... Ts2>
 constexpr descr<N1 + N2 + 2, Ts1..., Ts2...> operator,(const descr<N1, Ts1...> &a,
                                                        const descr<N2, Ts2...> &b) {
-    return a + const_name(", ") + b;
+    // Ensure that src_loc of existing descr is used.
+    return a + const_name(", ", src_loc{nullptr, 0}) + b;
 }
 
 template <size_t N, typename... Ts, typename... Args>