re2 1.24.0 → 1.25.0

package/vendor/abseil-cpp/absl/random/uniform_real_distribution.h

@@ -159,7 +159,7 @@ uniform_real_distribution<RealType>::operator()(
   using random_internal::GeneratePositiveTag;
   using random_internal::GenerateRealFromBits;
   using real_type =
-      absl::conditional_t<std::is_same<RealType, float>::value, float, double>;
+      std::conditional_t<std::is_same<RealType, float>::value, float, double>;
 
   while (true) {
     const result_type sample =

package/vendor/abseil-cpp/absl/status/BUILD.bazel

@@ -65,11 +65,14 @@ cc_library(
         "//absl/debugging:stacktrace",
         "//absl/debugging:symbolize",
         "//absl/functional:function_ref",
+        "//absl/hash",
         "//absl/memory",
         "//absl/strings",
         "//absl/strings:cord",
         "//absl/strings:str_format",
         "//absl/types:optional",
+        "//absl/types:optional_ref",
+        "//absl/types:source_location",
         "//absl/types:span",
     ],
 )
@@ -84,6 +87,7 @@ cc_test(
         "//absl/strings",
         "//absl/strings:cord",
         "//absl/strings:str_format",
+        "//absl/types:source_location",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
@@ -96,6 +100,7 @@ cc_binary(
     tags = ["benchmark"],
     deps = [
         ":status",
+        "//absl/types:source_location",
         "@google_benchmark//:benchmark_main",
     ],
 )
@@ -122,6 +127,8 @@ cc_library(
         "//absl/strings",
         "//absl/strings:has_ostream_operator",
         "//absl/strings:str_format",
+        "//absl/types:source_location",
+        "//absl/types:span",
         "//absl/types:variant",
         "//absl/utility",
     ],
@@ -139,6 +146,7 @@ cc_test(
         "//absl/memory",
         "//absl/strings",
         "//absl/types:any",
+        "//absl/types:source_location",
         "//absl/types:variant",
         "//absl/utility",
         "@googletest//:gtest",
@@ -158,6 +166,78 @@ cc_binary(
     ],
 )
 
+cc_library(
+    name = "status_builder",
+    srcs = ["status_builder.cc"],
+    hdrs = ["status_builder.h"],
+    copts = ABSL_DEFAULT_COPTS,
+    linkopts = ABSL_DEFAULT_LINKOPTS,
+    deps = [
+        ":status",
+        "//absl/base:config",
+        "//absl/base:core_headers",
+        "//absl/base:log_severity",
+        "//absl/strings",
+        "//absl/strings:cord",
+        "//absl/strings:internal",
+        "//absl/strings:stringify_stream",
+        "//absl/time",
+        "//absl/types:source_location",
+    ],
+)
+
+cc_test(
+    name = "status_builder_test",
+    srcs = ["status_builder_test.cc"],
+    copts = ABSL_TEST_COPTS,
+    linkopts = ABSL_DEFAULT_LINKOPTS,
+    deps = [
+        ":status",
+        ":status_builder",
+        ":status_matchers",
+        ":statusor",
+        "//absl/base:config",
+        "//absl/log",
+        "//absl/log:flags",
+        "//absl/log:log_entry",
+        "//absl/log:log_sink",
+        "//absl/strings",
+        "//absl/types:source_location",
+        "@googletest//:gtest",
+        "@googletest//:gtest_main",
+    ],
+)
+
+cc_library(
+    name = "status_macros",
+    hdrs = ["status_macros.h"],
+    deps = [
+        ":status",
+        ":status_builder",
+        ":statusor",
+        "//absl/base:config",
+        "//absl/base:core_headers",
+        "//absl/types:source_location",
+    ],
+)
+
+cc_test(
+    name = "status_macros_test",
+    size = "small",
+    srcs = ["status_macros_test.cc"],
+    deps = [
+        ":status",
+        ":status_builder",
+        ":status_macros",
+        ":statusor",
+        "//absl/base:core_headers",
+        "//absl/strings:string_view",
+        "//absl/types:source_location",
+        "@googletest//:gtest",
+        "@googletest//:gtest_main",
+    ],
+)
+
 cc_library(
     name = "status_matchers",
     testonly = 1,
@@ -172,6 +252,7 @@ cc_library(
         ":status",
         ":statusor",
         "//absl/base:config",
+        "//absl/base:core_headers",
         "//absl/strings:string_view",
         "@googletest//:gtest",
     ],

package/vendor/abseil-cpp/absl/status/CMakeLists.txt

@@ -35,12 +35,14 @@ absl_cc_library(
     absl::core_headers
     absl::function_ref
     absl::inlined_vector
+    absl::internal_optional_ref
     absl::leak_check
     absl::memory
     absl::no_destructor
     absl::nullability
     absl::optional
     absl::raw_logging_internal
+    absl::source_location
     absl::span
     absl::stacktrace
     absl::str_format
@@ -59,6 +61,7 @@ absl_cc_test(
     ${ABSL_TEST_COPTS}
   DEPS
     absl::status
+    absl::source_location
     absl::str_format
     absl::strings
     GTest::gmock_main
@@ -82,6 +85,7 @@ absl_cc_library(
     absl::nullability
     absl::raw_logging_internal
     absl::status
+    absl::source_location
     absl::str_format
     absl::strings
     absl::type_traits
@@ -101,10 +105,96 @@ absl_cc_test(
     absl::status
     absl::status_matchers
     absl::statusor
+    absl::source_location
     absl::strings
     GTest::gmock_main
 )
 
+absl_cc_library(
+  NAME
+    status_builder
+  HDRS
+    "status_builder.h"
+  SRCS
+    "status_builder.cc"
+  COPTS
+    ${ABSL_DEFAULT_COPTS}
+  DEPS
+    absl::config
+    absl::cord
+    absl::core_headers
+    absl::nullability
+    absl::optional
+    absl::source_location
+    absl::span
+    absl::status
+    absl::strings
+    absl::time
+  PUBLIC
+)
+
+absl_cc_test(
+  NAME
+    status_builder_test
+  SRCS
+   "status_builder_test.cc"
+  COPTS
+    ${ABSL_TEST_COPTS}
+  DEPS
+    absl::core_headers
+    absl::flags
+    GTest::gmock_main
+    absl::log
+    absl::log_entry
+    absl::log_flags
+    absl::log_internal_flags
+    absl::log_severity
+    absl::log_sink
+    absl::scoped_mock_log
+    absl::source_location
+    absl::span
+    absl::status
+    absl::statusor
+    absl::status_builder
+    absl::status_matchers
+    absl::strings
+    absl::time
+)
+
+absl_cc_library(
+  NAME
+    status_macros
+  HDRS
+    "status_macros.h"
+  COPTS
+    ${ABSL_DEFAULT_COPTS}
+  DEPS
+    absl::core_headers
+    absl::source_location
+    absl::status
+    absl::status_builder
+    absl::statusor
+  PUBLIC
+)
+
+absl_cc_test(
+  NAME
+    status_macros_test
+  SRCS
+   "status_macros_test.cc"
+  COPTS
+    ${ABSL_TEST_COPTS}
+  DEPS
+    absl::core_headers
+    absl::source_location
+    absl::status
+    absl::status_builder
+    absl::status_macros
+    absl::statusor
+    absl::string_view
+    GTest::gmock_main
+)
+
 absl_cc_library(
   NAME
     status_matchers
@@ -119,6 +209,7 @@ absl_cc_library(
     ${ABSL_DEFAULT_LINKOPTS}
   DEPS
     absl::base
+    absl::core_headers
     absl::status
     absl::statusor
     absl::strings

package/vendor/abseil-cpp/absl/status/internal/status_internal.cc

@@ -21,6 +21,7 @@
 #include <cstdio>
 #include <cstring>
 #include <memory>
+#include <optional>
 #include <string>
 #include <utility>
 
@@ -31,6 +32,7 @@
 #include "absl/debugging/leak_check.h"
 #include "absl/debugging/stacktrace.h"
 #include "absl/debugging/symbolize.h"
+#include "absl/hash/hash.h"
 #include "absl/memory/memory.h"
 #include "absl/status/status.h"
 #include "absl/status/status_payload_printer.h"
@@ -40,7 +42,9 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
-#include "absl/types/optional.h"
+#include "absl/types/optional_ref.h"
+#include "absl/types/source_location.h"
+#include "absl/types/span.h"
 
 namespace absl {
 ABSL_NAMESPACE_BEGIN
@@ -56,32 +60,32 @@ void StatusRep::Unref() const {
   }
 }
 
-static absl::optional<size_t> FindPayloadIndexByUrl(
-    const Payloads* payloads, absl::string_view type_url) {
-  if (payloads == nullptr) return absl::nullopt;
+static std::optional<size_t> FindPayloadIndexByUrl(const Payloads* payloads,
+                                                   absl::string_view type_url) {
+  if (payloads == nullptr) return std::nullopt;
 
   for (size_t i = 0; i < payloads->size(); ++i) {
     if ((*payloads)[i].type_url == type_url) return i;
   }
 
-  return absl::nullopt;
+  return std::nullopt;
 }
 
-absl::optional<absl::Cord> StatusRep::GetPayload(
+std::optional<absl::Cord> StatusRep::GetPayload(
     absl::string_view type_url) const {
-  absl::optional<size_t> index =
+  std::optional<size_t> index =
       status_internal::FindPayloadIndexByUrl(payloads_.get(), type_url);
   if (index.has_value()) return (*payloads_)[index.value()].payload;
 
-  return absl::nullopt;
+  return std::nullopt;
 }
 
 void StatusRep::SetPayload(absl::string_view type_url, absl::Cord payload) {
   if (payloads_ == nullptr) {
-    payloads_ = absl::make_unique<status_internal::Payloads>();
+    payloads_ = std::make_unique<status_internal::Payloads>();
   }
 
-  absl::optional<size_t> index =
+  std::optional<size_t> index =
       status_internal::FindPayloadIndexByUrl(payloads_.get(), type_url);
   if (index.has_value()) {
     (*payloads_)[index.value()].payload = std::move(payload);
@@ -92,7 +96,7 @@ void StatusRep::SetPayload(absl::string_view type_url, absl::Cord payload) {
 }
 
 StatusRep::EraseResult StatusRep::ErasePayload(absl::string_view type_url) {
-  absl::optional<size_t> index =
+  std::optional<size_t> index =
       status_internal::FindPayloadIndexByUrl(payloads_.get(), type_url);
   if (!index.has_value()) return {false, Status::PointerToRep(this)};
   payloads_->erase(payloads_->begin() + index.value());
@@ -130,6 +134,14 @@ void StatusRep::ForEachPayload(
   }
 }
 
+absl::Span<const SourceLocation> StatusRep::GetSourceLocations() const {
+  return absl::MakeSpan(source_locations_);
+}
+
+void StatusRep::AddSourceLocation(absl::SourceLocation loc) {
+  source_locations_.push_back(loc);
+}
+
 std::string StatusRep::ToString(StatusToStringMode mode) const {
   std::string text;
   absl::StrAppend(&text, absl::StatusCodeToString(code()), ": ", message());
@@ -142,7 +154,7 @@ std::string StatusRep::ToString(StatusToStringMode mode) const {
         status_internal::GetStatusPayloadPrinter();
     this->ForEachPayload([&](absl::string_view type_url,
                              const absl::Cord& payload) {
-      absl::optional<std::string> result;
+      std::optional<std::string> result;
       if (printer) result = printer(type_url, payload);
       absl::StrAppend(
           &text, " [", type_url, "='",
@@ -150,6 +162,17 @@ std::string StatusRep::ToString(StatusToStringMode mode) const {
           "']");
     });
   }
+  const bool with_source_location =
+      (mode & StatusToStringMode::kWithSourceLocation) ==
+      StatusToStringMode::kWithSourceLocation;
+  if (with_source_location && !source_locations_.empty()) {
+    absl::string_view whitespace = (absl::Hash<int>{}(42) % 2 == 0) ? "" : " ";
+    absl::StrAppend(&text, "\n=== Source Location Trace: ===", whitespace,
+                    "\n");
+    for (const absl::SourceLocation loc : GetSourceLocations()) {
+      absl::StrAppend(&text, loc.file_name(), ":", loc.line(), "\n");
+    }
+  }
 
   return text;
 }
@@ -189,9 +212,12 @@ bool StatusRep::operator==(const StatusRep& other) const {
   return true;
 }
 
-StatusRep* absl_nonnull StatusRep::CloneAndUnref() const {
+StatusRep* absl_nonnull StatusRep::Clone(
+    absl::optional_ref<absl::string_view> new_message, bool include_payloads,
+    bool include_source_locations) const {
   // Optimization: no need to create a clone if we already have a refcount of 1.
-  if (ref_.load(std::memory_order_acquire) == 1) {
+  if (ref_.load(std::memory_order_acquire) == 1 && !new_message.has_value() &&
+      include_payloads && include_source_locations) {
     // All StatusRep instances are heap allocated and mutable, therefore this
     // const_cast will never cast away const from a stack instance.
     //
@@ -200,11 +226,30 @@ StatusRep* absl_nonnull StatusRep::CloneAndUnref() const {
     return const_cast<StatusRep*>(this);
   }
   std::unique_ptr<status_internal::Payloads> payloads;
-  if (payloads_) {
-    payloads = absl::make_unique<status_internal::Payloads>(*payloads_);
+  if (include_payloads && payloads_) {
+    payloads = std::make_unique<status_internal::Payloads>(*payloads_);
+  }
+  auto* new_rep =
+      new StatusRep(code_, new_message.value_or(message_), std::move(payloads));
+  if (include_source_locations) {
+    new_rep->source_locations_ = source_locations_;
+  }
+  return new_rep;
+}
+
+StatusRep* absl_nonnull StatusRep::CloneAndUnref() const {
+  return CloneAndUnref(std::nullopt, true, true);
+}
+
+StatusRep* absl_nonnull StatusRep::CloneAndUnref(
+    absl::optional_ref<absl::string_view> new_message, bool include_payloads,
+    bool include_source_locations) const {
+  StatusRep* new_rep =
+      Clone(new_message, /*include_payloads=*/include_payloads,
+            /*include_source_locations=*/include_source_locations);
+  if (new_rep != this) {
+    Unref();
   }
-  auto* new_rep = new StatusRep(code_, message_, std::move(payloads));
-  Unref();
   return new_rep;
 }
 

package/vendor/abseil-cpp/absl/status/internal/status_internal.h

@@ -17,8 +17,10 @@
 #include <atomic>
 #include <cstdint>
 #include <memory>
+#include <optional>
 #include <string>
 #include <utility>
+#include <vector>
 
 #include "absl/base/attributes.h"
 #include "absl/base/config.h"
@@ -27,6 +29,9 @@
 #include "absl/strings/cord.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "absl/types/optional_ref.h"
+#include "absl/types/source_location.h"
+#include "absl/types/span.h"
 
 #ifndef SWIG
 // Disabled for SWIG as it doesn't parse attributes correctly.
@@ -44,6 +49,7 @@ class [[nodiscard]] ABSL_ATTRIBUTE_TRIVIAL_ABI
 class ABSL_MUST_USE_RESULT ABSL_ATTRIBUTE_TRIVIAL_ABI
     Status;
 #endif
+
 ABSL_NAMESPACE_END
 }  // namespace absl
 #endif  // !SWIG
@@ -55,6 +61,10 @@ enum class StatusCode : int;
 enum class StatusToStringMode : int;
 
 namespace status_internal {
+#ifndef SWIG
+class StatusPrivateAccessor;
+class StatusPrivateAccessorForStatusBuilder;
+#endif  // !SWIG
 
 // Container for status payloads.
 struct Payload {
@@ -83,7 +93,7 @@ class StatusRep {
   void Unref() const;
 
   // Payload methods correspond to the same methods in absl::Status.
-  absl::optional<absl::Cord> GetPayload(absl::string_view type_url) const;
+  std::optional<absl::Cord> GetPayload(absl::string_view type_url) const;
   void SetPayload(absl::string_view type_url, absl::Cord payload);
   struct EraseResult {
     bool erased;
@@ -94,6 +104,9 @@ class StatusRep {
       absl::FunctionRef<void(absl::string_view, const absl::Cord&)> visitor)
       const;
 
+  absl::Span<const SourceLocation> GetSourceLocations() const;
+  void AddSourceLocation(absl::SourceLocation loc);
+
   std::string ToString(StatusToStringMode mode) const;
 
   bool operator==(const StatusRep& other) const;
@@ -101,7 +114,17 @@ class StatusRep {
 
   // Returns an equivalent heap allocated StatusRep with refcount 1.
   //
-  // `this` is not safe to be used after calling as it may have been deleted.
+  // If `new_message` is provided, the message will be replaced with the new
+  // message.
+  StatusRep* absl_nonnull Clone(
+      absl::optional_ref<absl::string_view> new_message, bool include_payloads,
+      bool include_source_locations) const;
+
+  // Same as Clone(), but also removes a reference to `this`. `this` is not safe
+  // to be used after calling as it may have been deleted.
+  StatusRep* absl_nonnull CloneAndUnref(
+      absl::optional_ref<absl::string_view> new_message, bool include_payloads,
+      bool include_source_locations) const;
   StatusRep* absl_nonnull CloneAndUnref() const;
 
  private:
@@ -112,6 +135,7 @@ class StatusRep {
   // is non-empty, then the resulting string_view is null terminated.
   // This is required to implement 'StatusMessageAsCStr(...)'
   std::string message_;
+  absl::InlinedVector<absl::SourceLocation, 1> source_locations_;
   std::unique_ptr<status_internal::Payloads> payloads_;
 };
 

package/vendor/abseil-cpp/absl/status/internal/status_matchers.h

@@ -16,12 +16,12 @@
 #define ABSL_STATUS_INTERNAL_STATUS_MATCHERS_H_
 
 #include <ostream>  // NOLINT
-#include <string>
 #include <type_traits>
 #include <utility>
 
 #include "gmock/gmock.h"  // gmock_for_status_matchers.h
 #include "absl/base/config.h"
+#include "absl/base/macros.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
@@ -30,12 +30,20 @@ namespace absl_testing {
 ABSL_NAMESPACE_BEGIN
 namespace status_internal {
 
-inline const absl::Status& GetStatus(const absl::Status& status) {
+// TODO(b/323927127): Remove ABSL_REFACTOR_INLINE once callers are cleaned up
+// and move it into a namespace like adl_barrier without types to avoid
+// accidental ADL.
+ABSL_REFACTOR_INLINE inline const absl::Status& GetStatus(
+    const absl::Status& status) {
   return status;
 }
 
+// TODO(b/323927127): Remove ABSL_REFACTOR_INLINE once callers are cleaned up
+// and move it into a namespace like adl_barrier without types to avoid
+// accidental ADL.
 template <typename T>
-inline const absl::Status& GetStatus(const absl::StatusOr<T>& status) {
+ABSL_REFACTOR_INLINE const absl::Status& GetStatus(
+    const absl::StatusOr<T>& status) {
   return status.status();
 }
 
@@ -118,18 +126,24 @@ class IsOkAndHoldsMatcher {
 class StatusCode {
  public:
   /*implicit*/ StatusCode(int code)  // NOLINT
-      : code_(static_cast<::absl::StatusCode>(code)) {}
-  /*implicit*/ StatusCode(::absl::StatusCode code) : code_(code) {}  // NOLINT
+      : code_(code) {}
+  /*implicit*/ StatusCode(::absl::StatusCode code)  // NOLINT
+      : code_(static_cast<int>(code)) {}
 
   explicit operator int() const { return static_cast<int>(code_); }
 
   friend inline void PrintTo(const StatusCode& code, std::ostream* os) {
-    // TODO(b/321095377): Change this to print the status code as a string.
-    *os << static_cast<int>(code);
+    absl::string_view text =
+        absl::StatusCodeToStringView(static_cast<absl::StatusCode>(code.code_));
+    if (!text.empty()) {
+      *os << text;
+    } else {
+      *os << code.code_;
+    }
   }
 
  private:
-  ::absl::StatusCode code_;
+  int code_;
 };
 
 // Relational operators to handle matchers like Eq, Lt, etc..