grpc 1.63.2 → 1.64.0.pre1

data/src/core/lib/json/json_object_loader.cc

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/json/json_object_loader.h"
 
 #include <utility>
@@ -23,6 +21,7 @@
 #include "absl/strings/strip.h"
 
 #include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 
 namespace grpc_core {
 namespace json_detail {

data/src/core/lib/json/json_object_loader.h

@@ -15,8 +15,6 @@
 #ifndef GRPC_SRC_CORE_LIB_JSON_JSON_OBJECT_LOADER_H
 #define GRPC_SRC_CORE_LIB_JSON_JSON_OBJECT_LOADER_H
 
-#include <grpc/support/port_platform.h>
-
 #include <cstdint>
 #include <cstring>
 #include <map>
@@ -32,6 +30,8 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/no_destruct.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/time.h"

data/src/core/lib/json/json_reader.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -26,6 +24,7 @@
 #include <vector>
 
 #include "absl/base/attributes.h"
+#include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
@@ -36,6 +35,7 @@
 
 #include <grpc/support/json.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/gprpp/match.h"
 #include "src/core/lib/json/json.h"
@@ -280,14 +280,14 @@ bool JsonReader::StartContainer(Json::Type type) {
   if (type == Json::Type::kObject) {
     scope.data = Json::Object();
   } else {
-    GPR_ASSERT(type == Json::Type::kArray);
+    CHECK(type == Json::Type::kArray);
     scope.data = Json::Array();
   }
   return true;
 }
 
 void JsonReader::EndContainer() {
-  GPR_ASSERT(!stack_.empty());
+  CHECK(!stack_.empty());
   Scope scope = std::move(stack_.back());
   stack_.pop_back();
   key_ = std::move(scope.parent_object_key);

data/src/core/lib/json/json_reader.h

@@ -17,11 +17,11 @@
 #ifndef GRPC_SRC_CORE_LIB_JSON_JSON_READER_H
 #define GRPC_SRC_CORE_LIB_JSON_JSON_READER_H
 
-#include <grpc/support/port_platform.h>
-
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/json/json.h"
 
 namespace grpc_core {

data/src/core/lib/json/json_util.cc

@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/json/json_util.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/no_destruct.h"
 #include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/lib/json/json_args.h"

data/src/core/lib/json/json_util.h

@@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CORE_LIB_JSON_JSON_UTIL_H
 #define GRPC_SRC_CORE_LIB_JSON_JSON_UTIL_H
 
-#include <grpc/support/port_platform.h>
-
 #include <algorithm>
 #include <map>
 #include <string>
@@ -32,6 +30,8 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/json/json.h"

data/src/core/lib/json/json_writer.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -28,6 +26,8 @@
 
 #include "absl/strings/string_view.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/json/json.h"
 
 namespace grpc_core {

data/src/core/lib/json/json_writer.h

@@ -17,10 +17,10 @@
 #ifndef GRPC_SRC_CORE_LIB_JSON_JSON_WRITER_H
 #define GRPC_SRC_CORE_LIB_JSON_JSON_WRITER_H
 
-#include <grpc/support/port_platform.h>
-
 #include <string>
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/json/json.h"
 
 namespace grpc_core {

data/src/core/lib/matchers/matchers.cc

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/matchers/matchers.h"
 
 #include <utility>
@@ -25,6 +23,8 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 //

data/src/core/lib/matchers/matchers.h

@@ -15,8 +15,6 @@
 #ifndef GRPC_SRC_CORE_LIB_MATCHERS_MATCHERS_H
 #define GRPC_SRC_CORE_LIB_MATCHERS_MATCHERS_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <memory>
@@ -27,6 +25,8 @@
 #include "absl/types/optional.h"
 #include "re2/re2.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 class StringMatcher {

data/src/core/lib/promise/activity.cc

@@ -12,18 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/activity.h"
 
 #include <stddef.h>
 
 #include <vector>
 
+#include "absl/log/check.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/atomic_utils.h"
 
 namespace grpc_core {
@@ -54,7 +55,7 @@ class FreestandingActivity::Handle final : public Wakeable {
   // Activity is going away... drop its reference and sever the connection back.
   void DropActivity() ABSL_LOCKS_EXCLUDED(mu_) {
     mu_.Lock();
-    GPR_ASSERT(activity_ != nullptr);
+    CHECK_NE(activity_, nullptr);
     activity_ = nullptr;
     mu_.Unlock();
     Unref();

data/src/core/lib/promise/activity.h

@@ -15,8 +15,6 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_ACTIVITY_H
 #define GRPC_SRC_CORE_LIB_PROMISE_ACTIVITY_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <algorithm>
@@ -26,10 +24,12 @@
 #include <utility>
 
 #include "absl/base/thread_annotations.h"
+#include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/gprpp/construct_destruct.h"
@@ -468,11 +468,11 @@ class PromiseActivity final
     // We shouldn't destruct without calling Cancel() first, and that must get
     // us to be done_, so we assume that and have no logic to destruct the
     // promise here.
-    GPR_ASSERT(done_);
+    CHECK(done_);
   }
 
   void RunScheduledWakeup() {
-    GPR_ASSERT(wakeup_scheduled_.exchange(false, std::memory_order_acq_rel));
+    CHECK(wakeup_scheduled_.exchange(false, std::memory_order_acq_rel));
     Step();
     WakeupComplete();
   }
@@ -536,7 +536,7 @@ class PromiseActivity final
   // Notification that we're no longer executing - it's ok to destruct the
   // promise.
   void MarkDone() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu()) {
-    GPR_ASSERT(!std::exchange(done_, true));
+    CHECK(!std::exchange(done_, true));
     ScopedContext contexts(this);
     Destruct(&promise_holder_.promise);
   }
@@ -581,10 +581,10 @@ class PromiseActivity final
   // Until there are no wakeups from within and the promise is incomplete:
   // poll the promise.
   absl::optional<ResultType> StepLoop() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu()) {
-    GPR_ASSERT(is_current());
+    CHECK(is_current());
     while (true) {
       // Run the promise.
-      GPR_ASSERT(!done_);
+      CHECK(!done_);
       auto r = promise_holder_.promise();
       if (auto* status = r.value_if_ready()) {
         // If complete, destroy the promise, flag done, and exit this loop.

data/src/core/lib/promise/all_ok.h

@@ -15,8 +15,6 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_ALL_OK_H
 #define GRPC_SRC_CORE_LIB_PROMISE_ALL_OK_H
 
-#include <grpc/support/port_platform.h>
-
 #include <tuple>
 #include <variant>
 
@@ -24,6 +22,8 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/promise/detail/join_state.h"
 #include "src/core/lib/promise/map.h"
 #include "src/core/lib/promise/poll.h"

data/src/core/lib/promise/arena_promise.h

@@ -15,8 +15,6 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_ARENA_PROMISE_H
 #define GRPC_SRC_CORE_LIB_PROMISE_ARENA_PROMISE_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stdlib.h>
 
 #include <cstddef>
@@ -26,6 +24,8 @@
 
 #include "absl/meta/type_traits.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/construct_destruct.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/poll.h"

data/src/core/lib/promise/context.h

@@ -15,13 +15,13 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_CONTEXT_H
 #define GRPC_SRC_CORE_LIB_PROMISE_CONTEXT_H
 
-#include <grpc/support/port_platform.h>
-
 #include <utility>
 
+#include "absl/log/check.h"
 #include "absl/meta/type_traits.h"
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/gprpp/down_cast.h"
 
@@ -115,7 +115,7 @@ bool HasContext() {
 template <typename T>
 T* GetContext() {
   auto* p = promise_detail::Context<T>::get();
-  GPR_ASSERT(p != nullptr);
+  CHECK_NE(p, nullptr);
   return p;
 }
 

data/src/core/lib/promise/detail/join_state.h

@@ -17,13 +17,14 @@
 
 // This file is generated by tools/codegen/core/gen_seq.py
 
-#include <grpc/support/port_platform.h>
-
 #include <tuple>
 #include <type_traits>
 #include <utility>
 
+#include "absl/log/check.h"
+
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/gprpp/bitset.h"
 #include "src/core/lib/gprpp/construct_destruct.h"
@@ -58,7 +59,7 @@ struct JoinState<Traits, P0, P1> {
     Construct(&promise1, std::forward<P1>(p1));
   }
   JoinState(const JoinState& other) {
-    GPR_ASSERT(other.ready.none());
+    CHECK(other.ready.none());
     Construct(&promise0, other.promise0);
     Construct(&promise1, other.promise1);
   }
@@ -173,7 +174,7 @@ struct JoinState<Traits, P0, P1, P2> {
     Construct(&promise2, std::forward<P2>(p2));
   }
   JoinState(const JoinState& other) {
-    GPR_ASSERT(other.ready.none());
+    CHECK(other.ready.none());
     Construct(&promise0, other.promise0);
     Construct(&promise1, other.promise1);
     Construct(&promise2, other.promise2);
@@ -330,7 +331,7 @@ struct JoinState<Traits, P0, P1, P2, P3> {
     Construct(&promise3, std::forward<P3>(p3));
   }
   JoinState(const JoinState& other) {
-    GPR_ASSERT(other.ready.none());
+    CHECK(other.ready.none());
     Construct(&promise0, other.promise0);
     Construct(&promise1, other.promise1);
     Construct(&promise2, other.promise2);
@@ -529,7 +530,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4> {
     Construct(&promise4, std::forward<P4>(p4));
   }
   JoinState(const JoinState& other) {
-    GPR_ASSERT(other.ready.none());
+    CHECK(other.ready.none());
     Construct(&promise0, other.promise0);
     Construct(&promise1, other.promise1);
     Construct(&promise2, other.promise2);
@@ -770,7 +771,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5> {
     Construct(&promise5, std::forward<P5>(p5));
   }
   JoinState(const JoinState& other) {
-    GPR_ASSERT(other.ready.none());
+    CHECK(other.ready.none());
     Construct(&promise0, other.promise0);
     Construct(&promise1, other.promise1);
     Construct(&promise2, other.promise2);
@@ -1052,7 +1053,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6> {
     Construct(&promise6, std::forward<P6>(p6));
   }
   JoinState(const JoinState& other) {
-    GPR_ASSERT(other.ready.none());
+    CHECK(other.ready.none());
     Construct(&promise0, other.promise0);
     Construct(&promise1, other.promise1);
     Construct(&promise2, other.promise2);
@@ -1377,7 +1378,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6, P7> {
     Construct(&promise7, std::forward<P7>(p7));
   }
   JoinState(const JoinState& other) {
-    GPR_ASSERT(other.ready.none());
+    CHECK(other.ready.none());
     Construct(&promise0, other.promise0);
     Construct(&promise1, other.promise1);
     Construct(&promise2, other.promise2);
@@ -1743,7 +1744,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6, P7, P8> {
     Construct(&promise8, std::forward<P8>(p8));
   }
   JoinState(const JoinState& other) {
-    GPR_ASSERT(other.ready.none());
+    CHECK(other.ready.none());
     Construct(&promise0, other.promise0);
     Construct(&promise1, other.promise1);
     Construct(&promise2, other.promise2);

data/src/core/lib/promise/detail/promise_factory.h

@@ -15,14 +15,14 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_DETAIL_PROMISE_FACTORY_H
 #define GRPC_SRC_CORE_LIB_PROMISE_DETAIL_PROMISE_FACTORY_H
 
-#include <grpc/support/port_platform.h>
-
 #include <memory>
 #include <type_traits>
 #include <utility>
 
 #include "absl/meta/type_traits.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/promise/detail/promise_like.h"
 
 // PromiseFactory is an adaptor class.

data/src/core/lib/promise/detail/promise_like.h

@@ -15,12 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_DETAIL_PROMISE_LIKE_H
 #define GRPC_SRC_CORE_LIB_PROMISE_DETAIL_PROMISE_LIKE_H
 
-#include <grpc/support/port_platform.h>
-
 #include <utility>
 
 #include "absl/meta/type_traits.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/promise/poll.h"
 
 // A Promise is a callable object that returns Poll<T> for some T.
@@ -71,13 +71,7 @@ class PromiseLike<void>;
 
 template <typename F>
 class PromiseLike<F, absl::enable_if_t<!std::is_void<
-#if (defined(__cpp_lib_is_invocable) && __cpp_lib_is_invocable >= 201703L) || \
-    (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
-                         std::invoke_result_t<F>
-#else
-                         typename std::result_of<F()>::type
-#endif
-                         >::value>> {
+                         typename std::result_of<F()>::type>::value>> {
  private:
   GPR_NO_UNIQUE_ADDRESS F f_;