From e2b1bab19a782cb62bb010d1c2925ab7314fb113 Mon Sep 17 00:00:00 2001
diff --git a/absl/base/internal/strerror.cc b/absl/base/internal/strerror.cc
index d66ba120..0d6226fd 100644
--- a/absl/base/internal/strerror.cc
+++ b/absl/base/internal/strerror.cc
@@ -51,7 +51,6 @@ const char* StrErrorAdaptor(int errnum, char* buf, size_t buflen) {
 }
 
 std::string StrErrorInternal(int errnum) {
-  absl::base_internal::ErrnoSaver errno_saver;
   char buf[100];
   const char* str = StrErrorAdaptor(errnum, buf, sizeof buf);
   if (*str == '\0') {
@@ -76,6 +75,7 @@ std::array<std::string, kSysNerr>* NewStrErrorTable() {
 }  // namespace
 
 std::string StrError(int errnum) {
+  absl::base_internal::ErrnoSaver errno_saver;
   static const auto* table = NewStrErrorTable();
   if (errnum >= 0 && errnum < static_cast<int>(table->size())) {
     return (*table)[errnum];
diff --git a/absl/base/internal/strerror_test.cc b/absl/base/internal/strerror_test.cc
index a53da97f..e32d5b5c 100644
--- a/absl/base/internal/strerror_test.cc</td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=357436b8404f1a08171e41ac14ff7d16ebc3d79f'>refs</a><a href='/guix/log/gnu/packages/perl-compression.scm'>log</a><a href='/guix/tree/gnu/packages/perl-compression.scm?id=357436b8404f1a08171e41ac14ff7d16ebc3d79f'>tree</a><a class='active' href='/guix/commit/gnu/packages/perl-compression.scm?id=357436b8404f1a08171e41ac14ff7d16ebc3d79f'>commit</a><a href='/guix/diff/gnu/packages/perl-compression.scm?id=357436b8404f1a08171e41ac14ff7d16ebc3d79f'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/perl-compression.scm'>
<input type='hidden' name='id' va