From d82a85b6161cbeebfe3de5d3d4cdd355e4617e69 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 17 Aug 2023 20:39:02 +0100
Subject: [PATCH] libstdc++: Replace global std::string objects in tzdb.cc
When the library is built with --disable-libstdcxx-dual-abi the only
type of std::string supported is the COW string, and the two global
std::string objects in tzdb.cc have to allocate memory. I added them
thinking they would fit in the SSO string buffer, but that's not the
case when the library only uses COW strings.
Replace them with string_view objects to avoid any allocations.
libstdc++-v3/ChangeLog:
* src/c++20/tzdb.cc (tzdata_file, leaps_file): Change type to
std::string_view.
---
libstdc++-v3/src/c++20/tzdb.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libstdc++-v3/src/c++20/tzdb.cc b/libstdc++-v3/src/c++20/tzdb.cc
index 8d27726016ec..0fcbf6a4824e 100644
--- a/libstdc++-v3/src/c++20/tzdb.cc
+++ b/libstdc++-v3/src/c++20/tzdb.cc
@@ -1078,8 +1078,8 @@ namespace std::chrono
}
// N.B. Leading slash as required by zoneinfo_file function.
- const string tzdata_file = "/tzdata.zi";
- const string leaps_file = "/leapseconds";
+ const string_view tzdata_file = "/tzdata.zi";
+ const string_view leaps_file = "/leapseconds";
#ifdef _GLIBCXX_STATIC_TZDATA
// Static copy of tzdata.zi embedded in the library as tzdata_chars[]
--
GitLab