Status tweaks to reduce binary size.

iree-org · Aug 17, 2020 · 10b2711 · 10b2711
1 parent 5c11733
commit 10b2711
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/iree/base/BUILD b/iree/base/BUILD
@@ -41,7 +41,6 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":api_hdrs",
-        ":api_util",
         ":tracing",
     ],
 )

diff --git a/iree/base/CMakeLists.txt b/iree/base/CMakeLists.txt
@@ -34,7 +34,6 @@ iree_cc_library(
     "api_time.cc"
   DEPS
     ::api_hdrs
-    ::api_util
     ::tracing
   PUBLIC
 )

diff --git a/iree/base/internal/status.h b/iree/base/internal/status.h
@@ -50,7 +50,11 @@ class SourceLocation {
 
 // If a function takes an `iree::SourceLocation` parameter, pass this as the
 // argument.
+#if IREE_STATUS_FEATURES == 0
+#define IREE_LOC ::iree::SourceLocation(0, NULL)
+#else
 #define IREE_LOC ::iree::SourceLocation(__LINE__, __FILE__)
+#endif  // IREE_STATUS_FEATURES == 0
 
 enum class StatusCode : uint32_t {
   kOk = IREE_STATUS_OK,

diff --git a/iree/base/internal/status_builder.h b/iree/base/internal/status_builder.h
@@ -127,13 +127,21 @@ inline StatusBuilder& StatusBuilder::operator=(const StatusBuilder& sb) {
   return *this;
 }
 
+// Disable << streaming when status messages are disabled.
+#if (IREE_STATUS_FEATURES & IREE_STATUS_FEATURE_ANNOTATIONS) == 0
+template <typename T>
+StatusBuilder& StatusBuilder::operator<<(const T& value) & {
+  return *this;
+}
+#else
 template <typename T>
 StatusBuilder& StatusBuilder::operator<<(const T& value) & {
   if (status_.ok()) return *this;
   if (rep_ == nullptr) rep_ = std::make_unique<Rep>();
   rep_->stream << value;
   return *this;
 }
+#endif  // (IREE_STATUS_FEATURES & IREE_STATUS_FEATURE_ANNOTATIONS) == 0
 
 template <typename T>
 StatusBuilder&& StatusBuilder::operator<<(const T& value) && {