Remove ABSL patch that is no longer needed.
PiperOrigin-RevId: 366365441
Change-Id: Ia0f01531f3a81ae29f877e3b68e7e2dd1572008f
diff --git a/third_party/absl/com_google_absl_fix_mac_and_nvcc_build.patch b/third_party/absl/com_google_absl_fix_mac_and_nvcc_build.patch
index 5509d02..14e4d1e 100644
--- a/third_party/absl/com_google_absl_fix_mac_and_nvcc_build.patch
+++ b/third_party/absl/com_google_absl_fix_mac_and_nvcc_build.patch
@@ -232,84 +232,3 @@
}
};
-diff --git a/absl/strings/string_view.h b/absl/strings/string_view.h
-index 5260b5b..1e4740c 100644
---- a/absl/strings/string_view.h
-+++ b/absl/strings/string_view.h
-@@ -288,7 +288,14 @@ class string_view {
- // Returns the ith element of the `string_view` using the array operator.
- // Note that this operator does not perform any bounds checking.
- constexpr const_reference operator[](size_type i) const {
-+#if defined(__NVCC__) && (__CUDACC_VER_MAJOR__ < 10 || (__CUDACC_VER_MAJOR__ == 10 && __CUDACC_VER_MINOR__ < 2))
-+ // An NVCC bug treats the original return expression as a non-constant,
-+ // which is not allowed in a constexpr function. This will be fixed in the
-+ // CUDA 10.2 release.
-+ return ptr_[i];
-+#else
- return ABSL_HARDENING_ASSERT(i < size()), ptr_[i];
-+#endif
- }
-
- // string_view::at()
-@@ -297,25 +304,46 @@ class string_view {
- // and an exception of type `std::out_of_range` will be thrown on invalid
- // access.
- constexpr const_reference at(size_type i) const {
-+#if defined(__NVCC__) && (__CUDACC_VER_MAJOR__ < 10 || (__CUDACC_VER_MAJOR__ == 10 && __CUDACC_VER_MINOR__ < 2))
-+ // An NVCC bug treats the original return expression as a non-constant,
-+ // which is not allowed in a constexpr function. This will be fixed in the
-+ // CUDA 10.2 release.
-+ return ptr_[i];
-+#else
- return ABSL_PREDICT_TRUE(i < size())
- ? ptr_[i]
- : ((void)base_internal::ThrowStdOutOfRange(
- "absl::string_view::at"),
- ptr_[i]);
-+#endif
- }
-
- // string_view::front()
- //
- // Returns the first element of a `string_view`.
- constexpr const_reference front() const {
-+#if defined(__NVCC__) && (__CUDACC_VER_MAJOR__ < 10 || (__CUDACC_VER_MAJOR__ == 10 && __CUDACC_VER_MINOR__ < 2))
-+ // An NVCC bug treats the original return expression as a non-constant,
-+ // which is not allowed in a constexpr function. This will be fixed in the
-+ // CUDA 10.2 release.
-+ return ptr_[0];
-+#else
- return ABSL_HARDENING_ASSERT(!empty()), ptr_[0];
-+#endif
- }
-
- // string_view::back()
- //
- // Returns the last element of a `string_view`.
- constexpr const_reference back() const {
-+#if defined(__NVCC__) && (__CUDACC_VER_MAJOR__ < 10 || (__CUDACC_VER_MAJOR__ == 10 && __CUDACC_VER_MINOR__ < 2))
-+ // An NVCC bug treats the original return expression as a non-constant,
-+ // which is not allowed in a constexpr function. This will be fixed in the
-+ // CUDA 10.2 release.
-+ return ptr_[size() - 1];
-+#else
- return ABSL_HARDENING_ASSERT(!empty()), ptr_[size() - 1];
-+#endif
- }
-
- // string_view::data()
-@@ -526,7 +554,14 @@ class string_view {
- (std::numeric_limits<difference_type>::max)();
-
- static constexpr size_type CheckLengthInternal(size_type len) {
-+#if defined(__NVCC__) && (__CUDACC_VER_MAJOR__ < 10 || (__CUDACC_VER_MAJOR__ == 10 && __CUDACC_VER_MINOR__ < 2))
-+ // An NVCC bug treats the original return expression as a non-constant,
-+ // which is not allowed in a constexpr function. This will be fixed in the
-+ // CUDA 10.2 release.
-+ return len;
-+#else
- return ABSL_HARDENING_ASSERT(len <= kMaxSize), len;
-+#endif
- }
-
- static constexpr size_type StrlenInternal(const char* str) {
