Make SourceLocation more closely mirror std::source_location, add an extension point so it can be customized for various platform types.

PiperOrigin-RevId: 501903611

Author: mkuperst

tsl/platform/BUILD

@@ -264,21 +264,20 @@ cc_library(
         ":logging",
         ":macros",
         ":mutex",
-        ":platform",
         ":stack_frame",
         ":stacktrace",
         ":str_util",
         ":strcat",
         ":stringprintf",
         ":types",
+        "//tsl/protobuf:error_codes_proto_impl_cc",
         "@com_google_absl//absl/base",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:cord",
         "@com_google_absl//absl/types:optional",
-        "//tsl/protobuf:error_codes_proto_impl_cc",
-    ] + tf_platform_deps("status"),
+    ],
 )
 
 cc_library(

tsl/platform/default/BUILD

@@ -545,24 +545,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "status",
-    tags = [
-        "manual",
-        "no_oss",
-        "nobuilder",
-    ],
-    textual_hdrs = ["status.h"],
-    visibility = ["//third_party/tensorflow:__subpackages__"],
-    deps = [
-        "//tsl/platform:types",
-        "//tsl/protobuf:error_codes_proto_impl_cc",
-        "@com_google_absl//absl/base:core_headers",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/strings",
-    ],
-)
-
 bzl_library(
     name = "cuda_build_defs_bzl",
     srcs = ["cuda_build_defs.bzl"],
@@ -593,7 +575,6 @@ filegroup(
         "posix_file_system.cc",
         "posix_file_system.h",
         "stacktrace.h",
-        "status.h",
         "tracing_impl.h",
         "//tsl/platform/profile_utils:cpu_utils.h",
         "//tsl/platform/profile_utils:i_cpu_utils_helper.h",

tsl/platform/default/build_config.bzl

@@ -654,7 +654,6 @@ def tf_additional_lib_hdrs():
         clean_dep("//tsl/platform/default:mutex_data.h"),
         clean_dep("//tsl/platform/default:notification.h"),
         clean_dep("//tsl/platform/default:stacktrace.h"),
-        clean_dep("//tsl/platform/default:status.h"),
         clean_dep("//tsl/platform/default:tracing_impl.h"),
         clean_dep("//tsl/platform/default:unbounded_work_queue.h"),
     ] + select({

tsl/platform/default/status.h

@@ -154,13 +154,13 @@ void Status::MaybeAddSourceLocation(SourceLocation loc) {
   if (state_ == nullptr) {
     return;
   }
-  if (loc.line() <= 0) {
+  if (loc.line <= 0) {
     return;
   }
-  if (loc.file_name() == nullptr) {
+  if (loc.file_name == nullptr) {
     return;
   }
-  if (loc.file_name()[0] == '\0') {
+  if (loc.file_name[0] == '\0') {
     return;
   }
   state_->source_locations.push_back(loc);
@@ -320,31 +320,26 @@ std::ostream& operator<<(std::ostream& os, const Status& x) {
 
 Status OkStatus() { return Status(); }
 
-Status FromAbslStatus(const absl::Status& s, SourceLocation loc) {
+Status FromAbslStatus(const absl::Status& s) {
   if (s.ok()) {
     return Status();
   }
-  absl::Span<const SourceLocation> locs = internal::GetSourceLocations(s);
-  const SourceLocation first_loc = locs.empty() ? loc : locs[0];
-  Status converted(static_cast<tsl::error::Code>(s.code()), s.message(),
-                   first_loc);
-  for (int i = 1; i < locs.size(); ++i) {
-    converted.MaybeAddSourceLocation(locs[i]);
-  }
+  Status converted(static_cast<tsl::error::Code>(s.code()), s.message());
   s.ForEachPayload(
       [&converted](absl::string_view key, const absl::Cord& value) {
         converted.SetPayload(key, std::string(value));
       });
+
   return converted;
 }
 
-absl::Status ToAbslStatus(const ::tsl::Status& s, SourceLocation loc) {
+absl::Status ToAbslStatus(const ::tsl::Status& s) {
   if (s.ok()) {
     return absl::OkStatus();
   }
 
-  absl::Status converted = internal::MakeAbslStatus(
-      s.code(), s.error_message(), s.GetSourceLocations(), loc);
+  absl::Status converted(static_cast<absl::StatusCode>(s.code()),
+                         s.error_message());
   s.ForEachPayload([&converted](tsl::StringPiece key, tsl::StringPiece value) {
     converted.SetPayload(key, absl::Cord(value));
   });

tsl/platform/status.cc

@@ -31,25 +31,42 @@ limitations under the License.
 #include "absl/types/optional.h"
 #include "tsl/platform/logging.h"
 #include "tsl/platform/macros.h"
-#include "tsl/platform/platform.h"
 #include "tsl/platform/stack_frame.h"
 #include "tsl/platform/types.h"
 #include "tsl/protobuf/error_codes.pb.h"
 
-// Include appropriate platform-dependent parts of status.
-#if defined(PLATFORM_GOOGLE)
-#include "tsl/platform/google/status.h"  // IWYU pragma: export
-#else
-#include "tsl/platform/default/status.h"  // IWYU pragma: export
-#endif
-
 namespace tsl {
 
 #if TF_HAS_CPP_ATTRIBUTE(nodiscard)
 class [[nodiscard]] Status;
 #endif
 
-typedef SourceLocationImpl SourceLocation;
+#if ABSL_HAVE_BUILTIN(__builtin_LINE) && ABSL_HAVE_BUILTIN(__builtin_FILE)
+#define TF_INTERNAL_HAVE_BUILTIN_LINE_FILE 1
+#endif
+
+struct SourceLocation {
+  uint32_t line;
+  const char* file_name;
+
+#ifdef TF_INTERNAL_HAVE_BUILTIN_LINE_FILE
+  static SourceLocation current(uint32_t line = __builtin_LINE(),
+                                const char* file_name = __builtin_FILE()) {
+    SourceLocation loc;
+    loc.line = line;
+    loc.file_name = file_name;
+    return loc;
+  }
+#else
+  static SourceLocation current(uint32_t line = 0,
+                                const char* file_name = nullptr) {
+    SourceLocation loc;
+    loc.line = line;
+    loc.file_name = file_name;
+    return loc;
+  }
+#endif
+};
 
 namespace errors {
 typedef ::tensorflow::error::Code Code;
@@ -191,8 +208,6 @@ class Status {
   absl::Span<const SourceLocation> GetSourceLocations() const;
 
  private:
-  friend Status FromAbslStatus(const absl::Status& s, SourceLocation loc);
-
   void MaybeAddSourceLocation(SourceLocation loc);
 
   static const std::string& empty_string();
@@ -223,10 +238,8 @@ class Status {
 // usage of `OkStatus()` when constructing such an OK status.
 Status OkStatus();
 
-Status FromAbslStatus(const absl::Status& s,
-                      SourceLocation loc = SourceLocation::current());
-absl::Status ToAbslStatus(const ::tsl::Status& s,
-                          SourceLocation loc = SourceLocation::current());
+Status FromAbslStatus(const absl::Status& s);
+absl::Status ToAbslStatus(const ::tsl::Status& s);
 
 // TODO(b/197552541) Move this namespace to errors.h.
 namespace errors {