Rollback of CCTZ update due to crash in clang ObjcLink.

PiperOrigin-RevId: 544060862
Change-Id: I6ca631385826f6e10f6c3eeec1af532402d0b532

absl/time/internal/cctz/include/cctz/time_zone.h

@@ -23,7 +23,6 @@
 #include <chrono>
 #include <chrono>
 #include <cstdint>
 #include <cstdint>
 #include <limits>
 #include <limits>
-#include <ratio>  // NOLINT: We use std::ratio in this header
 #include <string>
 #include <string>
 #include <utility>
 #include <utility>
 
 

absl/time/internal/cctz/src/time_zone_format.cc

@@ -14,13 +14,15 @@
 
 
 #if !defined(HAS_STRPTIME)
 #if !defined(HAS_STRPTIME)
 #if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(__VXWORKS__)
 #if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(__VXWORKS__)
-#define HAS_STRPTIME 1  // Assume everyone else has strptime().
+#define HAS_STRPTIME \
+  1  // assume everyone has strptime() except windows
+     // and VxWorks
 #endif
 #endif
 #endif
 #endif
 
 
 #if defined(HAS_STRPTIME) && HAS_STRPTIME
 #if defined(HAS_STRPTIME) && HAS_STRPTIME
 #if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__)
 #if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__)
-#define _XOPEN_SOURCE  // Definedness suffices for strptime().
+#define _XOPEN_SOURCE  // Definedness suffices for strptime.
 #endif
 #endif
 #endif
 #endif
 
 

absl/time/internal/cctz/src/time_zone_if.cc

@@ -23,19 +23,19 @@ ABSL_NAMESPACE_BEGIN
 namespace time_internal {
 namespace time_internal {
 namespace cctz {
 namespace cctz {
 
 
-std::unique_ptr<TimeZoneIf> TimeZoneIf::UTC() { return TimeZoneInfo::UTC(); }
-
-std::unique_ptr<TimeZoneIf> TimeZoneIf::Make(const std::string& name) {
+std::unique_ptr<TimeZoneIf> TimeZoneIf::Load(const std::string& name) {
   // Support "libc:localtime" and "libc:*" to access the legacy
   // Support "libc:localtime" and "libc:*" to access the legacy
   // localtime and UTC support respectively from the C library.
   // localtime and UTC support respectively from the C library.
   // NOTE: The "libc:*" zones are internal, test-only interfaces, and
   // NOTE: The "libc:*" zones are internal, test-only interfaces, and
   // are subject to change/removal without notice. Do not use them.
   // are subject to change/removal without notice. Do not use them.
   if (name.compare(0, 5, "libc:") == 0) {
   if (name.compare(0, 5, "libc:") == 0) {
-    return TimeZoneLibC::Make(name.substr(5));
+    return std::unique_ptr<TimeZoneIf>(new TimeZoneLibC(name.substr(5)));
   }
   }
 
 
-  // Otherwise use the "zoneinfo" implementation.
-  return TimeZoneInfo::Make(name);
+  // Otherwise use the "zoneinfo" implementation by default.
+  std::unique_ptr<TimeZoneInfo> tz(new TimeZoneInfo);
+  if (!tz->Load(name)) tz.reset();
+  return std::unique_ptr<TimeZoneIf>(tz.release());
 }
 }
 
 
 // Defined out-of-line to avoid emitting a weak vtable in all TUs.
 // Defined out-of-line to avoid emitting a weak vtable in all TUs.

absl/time/internal/cctz/src/time_zone_if.h

@@ -33,9 +33,8 @@ namespace cctz {
 // Subclasses implement the functions for civil-time conversions in the zone.
 // Subclasses implement the functions for civil-time conversions in the zone.
 class TimeZoneIf {
 class TimeZoneIf {
  public:
  public:
-  // Factory functions for TimeZoneIf implementations.
-  static std::unique_ptr<TimeZoneIf> UTC();  // never fails
-  static std::unique_ptr<TimeZoneIf> Make(const std::string& name);
+  // A factory function for TimeZoneIf implementations.
+  static std::unique_ptr<TimeZoneIf> Load(const std::string& name);
 
 
   virtual ~TimeZoneIf();
   virtual ~TimeZoneIf();
 
 
@@ -52,9 +51,7 @@ class TimeZoneIf {
   virtual std::string Description() const = 0;
   virtual std::string Description() const = 0;
 
 
  protected:
  protected:
-  TimeZoneIf() = default;
-  TimeZoneIf(const TimeZoneIf&) = delete;
-  TimeZoneIf& operator=(const TimeZoneIf&) = delete;
+  TimeZoneIf() {}
 };
 };
 
 
 // Convert between time_point<seconds> and a count of seconds since the
 // Convert between time_point<seconds> and a count of seconds since the

absl/time/internal/cctz/src/time_zone_impl.cc

@@ -99,13 +99,11 @@ void time_zone::Impl::ClearTimeZoneMapTestOnly() {
   }
   }
 }
 }
 
 
-time_zone::Impl::Impl() : name_("UTC"), zone_(TimeZoneIf::UTC()) {}
-
 time_zone::Impl::Impl(const std::string& name)
 time_zone::Impl::Impl(const std::string& name)
-    : name_(name), zone_(TimeZoneIf::Make(name_)) {}
+    : name_(name), zone_(TimeZoneIf::Load(name_)) {}
 
 
 const time_zone::Impl* time_zone::Impl::UTCImpl() {
 const time_zone::Impl* time_zone::Impl::UTCImpl() {
-  static const Impl* utc_impl = new Impl;
+  static const Impl* utc_impl = new Impl("UTC");  // never fails
   return utc_impl;
   return utc_impl;
 }
 }
 
 

absl/time/internal/cctz/src/time_zone_impl.h

@@ -78,11 +78,7 @@ class time_zone::Impl {
   std::string Description() const { return zone_->Description(); }
   std::string Description() const { return zone_->Description(); }
 
 
  private:
  private:
-  Impl();
   explicit Impl(const std::string& name);
   explicit Impl(const std::string& name);
-  Impl(const Impl&) = delete;
-  Impl& operator=(const Impl&) = delete;
-
   static const Impl* UTCImpl();
   static const Impl* UTCImpl();
 
 
   const std::string name_;
   const std::string name_;

absl/time/internal/cctz/src/time_zone_info.h

@@ -18,7 +18,6 @@
 #include <atomic>
 #include <atomic>
 #include <cstddef>
 #include <cstddef>
 #include <cstdint>
 #include <cstdint>
-#include <memory>
 #include <string>
 #include <string>
 #include <vector>
 #include <vector>
 
 
@@ -65,9 +64,12 @@ struct TransitionType {
 // A time zone backed by the IANA Time Zone Database (zoneinfo).
 // A time zone backed by the IANA Time Zone Database (zoneinfo).
 class TimeZoneInfo : public TimeZoneIf {
 class TimeZoneInfo : public TimeZoneIf {
  public:
  public:
-  // Factories.
-  static std::unique_ptr<TimeZoneInfo> UTC();  // never fails
-  static std::unique_ptr<TimeZoneInfo> Make(const std::string& name);
+  TimeZoneInfo() = default;
+  TimeZoneInfo(const TimeZoneInfo&) = delete;
+  TimeZoneInfo& operator=(const TimeZoneInfo&) = delete;
+
+  // Loads the zoneinfo for the given name, returning true if successful.
+  bool Load(const std::string& name);
 
 
   // TimeZoneIf implementations.
   // TimeZoneIf implementations.
   time_zone::absolute_lookup BreakTime(
   time_zone::absolute_lookup BreakTime(
@@ -81,9 +83,17 @@ class TimeZoneInfo : public TimeZoneIf {
   std::string Description() const override;
   std::string Description() const override;
 
 
  private:
  private:
-  TimeZoneInfo() = default;
-  TimeZoneInfo(const TimeZoneInfo&) = delete;
-  TimeZoneInfo& operator=(const TimeZoneInfo&) = delete;
+  struct Header {            // counts of:
+    std::size_t timecnt;     // transition times
+    std::size_t typecnt;     // transition types
+    std::size_t charcnt;     // zone abbreviation characters
+    std::size_t leapcnt;     // leap seconds (we expect none)
+    std::size_t ttisstdcnt;  // UTC/local indicators (unused)
+    std::size_t ttisutcnt;   // standard/wall indicators (unused)
+
+    bool Build(const tzhead& tzh);
+    std::size_t DataLength(std::size_t time_len) const;
+  };
 
 
   bool GetTransitionType(std::int_fast32_t utc_offset, bool is_dst,
   bool GetTransitionType(std::int_fast32_t utc_offset, bool is_dst,
                          const std::string& abbr, std::uint_least8_t* index);
                          const std::string& abbr, std::uint_least8_t* index);
@@ -92,7 +102,6 @@ class TimeZoneInfo : public TimeZoneIf {
   bool ExtendTransitions();
   bool ExtendTransitions();
 
 
   bool ResetToBuiltinUTC(const seconds& offset);
   bool ResetToBuiltinUTC(const seconds& offset);
-  bool Load(const std::string& name);
   bool Load(ZoneInfoSource* zip);
   bool Load(ZoneInfoSource* zip);
 
 
   // Helpers for BreakTime() and MakeTime().
   // Helpers for BreakTime() and MakeTime().

absl/time/internal/cctz/src/time_zone_libc.cc

@@ -62,7 +62,7 @@ auto tm_zone(const std::tm& tm) -> decltype(tzname[0]) {
 }
 }
 #elif defined(__native_client__) || defined(__myriad2__) || \
 #elif defined(__native_client__) || defined(__myriad2__) || \
     defined(__EMSCRIPTEN__)
     defined(__EMSCRIPTEN__)
-// Uses the globals: '_timezone' and 'tzname'.
+// Uses the globals: 'timezone' and 'tzname'.
 auto tm_gmtoff(const std::tm& tm) -> decltype(_timezone + 0) {
 auto tm_gmtoff(const std::tm& tm) -> decltype(_timezone + 0) {
   const bool is_dst = tm.tm_isdst > 0;
   const bool is_dst = tm.tm_isdst > 0;
   return _timezone + (is_dst ? 60 * 60 : 0);
   return _timezone + (is_dst ? 60 * 60 : 0);
@@ -193,9 +193,8 @@ std::time_t find_trans(std::time_t lo, std::time_t hi, tm_gmtoff_t offset) {
 
 
 }  // namespace
 }  // namespace
 
 
-std::unique_ptr<TimeZoneLibC> TimeZoneLibC::Make(const std::string& name) {
-  return std::unique_ptr<TimeZoneLibC>(new TimeZoneLibC(name));
-}
+TimeZoneLibC::TimeZoneLibC(const std::string& name)
+    : local_(name == "localtime") {}
 
 
 time_zone::absolute_lookup TimeZoneLibC::BreakTime(
 time_zone::absolute_lookup TimeZoneLibC::BreakTime(
     const time_point<seconds>& tp) const {
     const time_point<seconds>& tp) const {
@@ -324,9 +323,6 @@ std::string TimeZoneLibC::Description() const {
   return local_ ? "localtime" : "UTC";
   return local_ ? "localtime" : "UTC";
 }
 }
 
 
-TimeZoneLibC::TimeZoneLibC(const std::string& name)
-    : local_(name == "localtime") {}
-
 }  // namespace cctz
 }  // namespace cctz
 }  // namespace time_internal
 }  // namespace time_internal
 ABSL_NAMESPACE_END
 ABSL_NAMESPACE_END

absl/time/internal/cctz/src/time_zone_libc.h

@@ -27,10 +27,10 @@ namespace cctz {
 
 
 // A time zone backed by gmtime_r(3), localtime_r(3), and mktime(3),
 // A time zone backed by gmtime_r(3), localtime_r(3), and mktime(3),
 // and which therefore only supports UTC and the local time zone.
 // and which therefore only supports UTC and the local time zone.
+// TODO: Add support for fixed offsets from UTC.
 class TimeZoneLibC : public TimeZoneIf {
 class TimeZoneLibC : public TimeZoneIf {
  public:
  public:
-  // Factory.
-  static std::unique_ptr<TimeZoneLibC> Make(const std::string& name);
+  explicit TimeZoneLibC(const std::string& name);
 
 
   // TimeZoneIf implementations.
   // TimeZoneIf implementations.
   time_zone::absolute_lookup BreakTime(
   time_zone::absolute_lookup BreakTime(
@@ -44,10 +44,6 @@ class TimeZoneLibC : public TimeZoneIf {
   std::string Description() const override;
   std::string Description() const override;
 
 
  private:
  private:
-  explicit TimeZoneLibC(const std::string& name);
-  TimeZoneLibC(const TimeZoneLibC&) = delete;
-  TimeZoneLibC& operator=(const TimeZoneLibC&) = delete;
-
   const bool local_;  // localtime or UTC
   const bool local_;  // localtime or UTC
 };
 };
 
 

absl/time/internal/cctz/src/time_zone_lookup_test.cc

@@ -734,10 +734,6 @@ TEST(TimeZone, UTC) {
   time_zone loaded_utc0;
   time_zone loaded_utc0;
   EXPECT_TRUE(load_time_zone("UTC0", &loaded_utc0));
   EXPECT_TRUE(load_time_zone("UTC0", &loaded_utc0));
   EXPECT_EQ(loaded_utc0, utc);
   EXPECT_EQ(loaded_utc0, utc);
-
-  time_zone loaded_bad;
-  EXPECT_FALSE(load_time_zone("Invalid/TimeZone", &loaded_bad));
-  EXPECT_EQ(loaded_bad, utc);
 }
 }
 
 
 TEST(TimeZone, NamedTimeZones) {
 TEST(TimeZone, NamedTimeZones) {