grpc 1.63.0 → 1.64.0

data/src/core/lib/gprpp/table.h

@@ -15,8 +15,6 @@
 #ifndef GRPC_SRC_CORE_LIB_GPRPP_TABLE_H
 #define GRPC_SRC_CORE_LIB_GPRPP_TABLE_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <initializer_list>
@@ -27,6 +25,8 @@
 #include "absl/meta/type_traits.h"
 #include "absl/utility/utility.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/bitset.h"
 
 namespace grpc_core {

data/src/core/lib/gprpp/tchar.cc

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/gprpp/tchar.h"
 
+#include <grpc/support/port_platform.h>
+
 #ifdef GPR_WINDOWS
 
 namespace grpc_core {

data/src/core/lib/gprpp/thd.h

@@ -21,16 +21,16 @@
 
 /// Internal thread interface.
 
-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
 
 #include "absl/functional/any_invocable.h"
+#include "absl/log/check.h"
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/thd_id.h>
 
 namespace grpc_core {
@@ -125,7 +125,7 @@ class Thread {
   Thread& operator=(Thread&& other) noexcept {
     if (this != &other) {
       // TODO(vjpai): if we can be sure that all Thread's are actually
-      // constructed, then we should assert GPR_ASSERT(impl_ == nullptr) here.
+      // constructed, then we should assert CHECK(impl_ == nullptr) here.
       // However, as long as threads come in structures that are
       // allocated via gpr_malloc, this will not be the case, so we cannot
       // assert it for the time being.
@@ -144,11 +144,11 @@ class Thread {
   /// the Join function kills it, or it was detached (non-joinable) and it has
   /// run to completion and is now killing itself. The destructor shouldn't have
   /// to do anything.
-  ~Thread() { GPR_ASSERT(!options_.joinable() || impl_ == nullptr); }
+  ~Thread() { CHECK(!options_.joinable() || impl_ == nullptr); }
 
   void Start() {
     if (impl_ != nullptr) {
-      GPR_ASSERT(state_ == ALIVE);
+      CHECK(state_ == ALIVE);
       state_ = STARTED;
       impl_->Start();
       // If the Thread is not joinable, then the impl_ will cause the deletion
@@ -157,7 +157,7 @@ class Thread {
       // no need to change the value of the impl_ or state_ . The next operation
       // on this object will be the deletion, which will trigger the destructor.
     } else {
-      GPR_ASSERT(state_ == FAILED);
+      CHECK(state_ == FAILED);
     }
   }
 
@@ -169,7 +169,7 @@ class Thread {
       state_ = DONE;
       impl_ = nullptr;
     } else {
-      GPR_ASSERT(state_ == FAILED);
+      CHECK(state_ == FAILED);
     }
   }
 

data/src/core/lib/gprpp/time.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/gprpp/time.h"
 
 #include <atomic>
@@ -22,9 +20,11 @@
 #include <string>
 #include <utility>
 
+#include "absl/log/check.h"
 #include "absl/strings/str_format.h"
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
 #include "src/core/lib/gprpp/no_destruct.h"
@@ -67,13 +67,13 @@ GPR_ATTRIBUTE_NOINLINE std::pair<int64_t, gpr_cycle_counter> InitTime() {
   }
 
   // Check time has increased past 1 second.
-  GPR_ASSERT(process_epoch_seconds > 1);
+  CHECK_GT(process_epoch_seconds, 1);
   // Fake the epoch to always return >=1 second from our monotonic clock (to
   // avoid bugs elsewhere)
   process_epoch_seconds -= 1;
   int64_t expected = 0;
   gpr_cycle_counter process_epoch_cycles = (cycles_start + cycles_end) / 2;
-  GPR_ASSERT(process_epoch_cycles != 0);
+  CHECK_NE(process_epoch_cycles, 0);
   if (!g_process_epoch_seconds.compare_exchange_strong(
           expected, process_epoch_seconds, std::memory_order_relaxed,
           std::memory_order_relaxed)) {
@@ -120,7 +120,7 @@ gpr_timespec MillisecondsAsTimespec(int64_t millis, gpr_clock_type clock_type) {
 }
 
 int64_t TimespanToMillisRoundUp(gpr_timespec ts) {
-  GPR_ASSERT(ts.clock_type == GPR_TIMESPAN);
+  CHECK(ts.clock_type == GPR_TIMESPAN);
   double x = GPR_MS_PER_SEC * static_cast<double>(ts.tv_sec) +
              static_cast<double>(ts.tv_nsec) / GPR_NS_PER_MS +
              static_cast<double>(GPR_NS_PER_SEC - 1) /
@@ -135,7 +135,7 @@ int64_t TimespanToMillisRoundUp(gpr_timespec ts) {
 }
 
 int64_t TimespanToMillisRoundDown(gpr_timespec ts) {
-  GPR_ASSERT(ts.clock_type == GPR_TIMESPAN);
+  CHECK(ts.clock_type == GPR_TIMESPAN);
   double x = GPR_MS_PER_SEC * static_cast<double>(ts.tv_sec) +
              static_cast<double>(ts.tv_nsec) / GPR_NS_PER_MS;
   if (x <= static_cast<double>(std::numeric_limits<int64_t>::min())) {

data/src/core/lib/gprpp/time.h

@@ -15,8 +15,6 @@
 #ifndef GRPC_SRC_CORE_LIB_GPRPP_TIME_H
 #define GRPC_SRC_CORE_LIB_GPRPP_TIME_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <limits>
@@ -26,6 +24,7 @@
 #include "absl/types/optional.h"
 
 #include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
 #include "src/core/lib/gpr/time_precise.h"

data/src/core/lib/gprpp/time_averaged_stats.cc

@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/gprpp/time_averaged_stats.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 TimeAveragedStats::TimeAveragedStats(double init_avg, double regress_weight,

data/src/core/lib/gprpp/time_util.cc

@@ -14,14 +14,15 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/gprpp/time_util.h"
 
 #include <stdint.h>
 #include <time.h>
 
+#include "absl/log/check.h"
+
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
 namespace grpc_core {
@@ -55,7 +56,7 @@ gpr_timespec ToGprTimeSpec(absl::Time time) {
 }
 
 absl::Duration ToAbslDuration(gpr_timespec ts) {
-  GPR_ASSERT(ts.clock_type == GPR_TIMESPAN);
+  CHECK(ts.clock_type == GPR_TIMESPAN);
   if (gpr_time_cmp(ts, gpr_inf_future(GPR_TIMESPAN)) == 0) {
     return absl::InfiniteDuration();
   } else if (gpr_time_cmp(ts, gpr_inf_past(GPR_TIMESPAN)) == 0) {
@@ -66,7 +67,7 @@ absl::Duration ToAbslDuration(gpr_timespec ts) {
 }
 
 absl::Time ToAbslTime(gpr_timespec ts) {
-  GPR_ASSERT(ts.clock_type != GPR_TIMESPAN);
+  CHECK(ts.clock_type != GPR_TIMESPAN);
   gpr_timespec rts = gpr_convert_clock_type(ts, GPR_CLOCK_REALTIME);
   if (gpr_time_cmp(rts, gpr_inf_future(GPR_CLOCK_REALTIME)) == 0) {
     return absl::InfiniteFuture();

data/src/core/lib/gprpp/time_util.h

@@ -17,10 +17,9 @@
 #ifndef GRPC_SRC_CORE_LIB_GPRPP_TIME_UTIL_H
 #define GRPC_SRC_CORE_LIB_GPRPP_TIME_UTIL_H
 
-#include <grpc/support/port_platform.h>
-
 #include "absl/time/time.h"
 
+#include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
 namespace grpc_core {

data/src/core/lib/gprpp/unique_type_name.h

@@ -17,12 +17,12 @@
 #ifndef GRPC_SRC_CORE_LIB_GPRPP_UNIQUE_TYPE_NAME_H
 #define GRPC_SRC_CORE_LIB_GPRPP_UNIQUE_TYPE_NAME_H
 
-#include <grpc/support/port_platform.h>
-
 #include <string>
 
 #include "absl/strings/string_view.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gpr/useful.h"
 
 // Provides a type name that is unique by instance rather than by

data/src/core/lib/gprpp/uuid_v4.cc

@@ -16,12 +16,12 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/gprpp/uuid_v4.h"
 
 #include "absl/strings/str_format.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 std::string GenerateUUIDv4(uint64_t hi, uint64_t lo) {

data/src/core/lib/gprpp/uuid_v4.h

@@ -19,12 +19,12 @@
 #ifndef GRPC_SRC_CORE_LIB_GPRPP_UUID_V4_H
 #define GRPC_SRC_CORE_LIB_GPRPP_UUID_V4_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <string>
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 // Generates string in the UUIDv4 form. \a hi and \a lo are expected to be

data/src/core/lib/gprpp/validation_errors.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/gprpp/validation_errors.h"
 
 #include <utility>
@@ -23,6 +21,8 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/strip.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 void ValidationErrors::PushField(absl::string_view ext) {

data/src/core/lib/gprpp/validation_errors.h

@@ -15,8 +15,6 @@
 #ifndef GRPC_SRC_CORE_LIB_GPRPP_VALIDATION_ERRORS_H
 #define GRPC_SRC_CORE_LIB_GPRPP_VALIDATION_ERRORS_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <map>
@@ -27,6 +25,8 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 // Tracks errors that occur during validation of a data structure (e.g.,

data/src/core/lib/gprpp/windows/stat.cc

@@ -22,6 +22,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include "absl/log/check.h"
+
 #include <grpc/support/log.h>
 
 #include "src/core/lib/gprpp/crash.h"
@@ -31,8 +33,8 @@
 namespace grpc_core {
 
 absl::Status GetFileModificationTime(const char* filename, time_t* timestamp) {
-  GPR_ASSERT(filename != nullptr);
-  GPR_ASSERT(timestamp != nullptr);
+  CHECK_NE(filename, nullptr);
+  CHECK_NE(timestamp, nullptr);
   struct _stat buf;
   if (_stat(filename, &buf) != 0) {
     std::string error_msg = StrError(errno);

data/src/core/lib/gprpp/windows/thd.cc

@@ -23,6 +23,8 @@
 
 #include <string.h>
 
+#include "absl/log/check.h"
+
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/sync.h>
@@ -101,7 +103,7 @@ class ThreadInternalsWindows
 
   void Join() override {
     DWORD ret = WaitForSingleObject(info_->join_event, INFINITE);
-    GPR_ASSERT(ret == WAIT_OBJECT_0);
+    CHECK(ret == WAIT_OBJECT_0);
     destroy_thread();
   }
 
@@ -121,7 +123,7 @@ class ThreadInternalsWindows
     g_thd_info->body(g_thd_info->arg);
     if (g_thd_info->joinable) {
       BOOL ret = SetEvent(g_thd_info->join_event);
-      GPR_ASSERT(ret);
+      CHECK(ret);
     } else {
       gpr_free(g_thd_info);
     }

data/src/core/lib/gprpp/work_serializer.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/gprpp/work_serializer.h"
 
 #include <stdint.h>
@@ -29,9 +27,11 @@
 #include <utility>
 
 #include "absl/container/inlined_vector.h"
+#include "absl/log/check.h"
 
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/debug/stats.h"
 #include "src/core/lib/debug/stats_data.h"
@@ -108,7 +108,7 @@ class WorkSerializer::LegacyWorkSerializer final : public WorkSerializerImpl {
   // First 16 bits indicate ownership of the WorkSerializer, next 48 bits are
   // queue size (i.e., refs).
   static uint64_t MakeRefPair(uint16_t owners, uint64_t size) {
-    GPR_ASSERT(size >> 48 == 0);
+    CHECK_EQ(size >> 48, 0u);
     return (static_cast<uint64_t>(owners) << 48) + static_cast<int64_t>(size);
   }
   static uint32_t GetOwners(uint64_t ref_pair) {
@@ -146,7 +146,7 @@ void WorkSerializer::LegacyWorkSerializer::Run(std::function<void()> callback,
   const uint64_t prev_ref_pair =
       refs_.fetch_add(MakeRefPair(1, 1), std::memory_order_acq_rel);
   // The work serializer should not have been orphaned.
-  GPR_DEBUG_ASSERT(GetSize(prev_ref_pair) > 0);
+  DCHECK_GT(GetSize(prev_ref_pair), 0u);
   if (GetOwners(prev_ref_pair) == 0) {
     // We took ownership of the WorkSerializer. Invoke callback and drain queue.
     SetCurrentThread();
@@ -425,7 +425,7 @@ void WorkSerializer::DispatchingWorkSerializer::Run(
     running_start_time_ = std::chrono::steady_clock::now();
     items_processed_during_run_ = 0;
     time_running_items_ = std::chrono::steady_clock::duration();
-    GPR_ASSERT(processing_.empty());
+    CHECK(processing_.empty());
     processing_.emplace_back(std::move(callback), location);
     event_engine_->Run(this);
   } else {

data/src/core/lib/gprpp/work_serializer.h

@@ -17,14 +17,13 @@
 #ifndef GRPC_SRC_CORE_LIB_GPRPP_WORK_SERIALIZER_H
 #define GRPC_SRC_CORE_LIB_GPRPP_WORK_SERIALIZER_H
 
-#include <grpc/support/port_platform.h>
-
 #include <functional>
 #include <memory>
 
 #include "absl/base/thread_annotations.h"
 
 #include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/orphanable.h"

data/src/core/lib/http/format_request.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/http/format_request.h"
 
 #include <stdio.h>
@@ -33,6 +31,7 @@
 #include "absl/strings/string_view.h"
 
 #include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/http/httpcli.h"
 

data/src/core/lib/http/format_request.h

@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_LIB_HTTP_FORMAT_REQUEST_H
 #define GRPC_SRC_CORE_LIB_HTTP_FORMAT_REQUEST_H
 
-#include <grpc/support/port_platform.h>
-
 #include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/http/parser.h"
 

data/src/core/lib/http/httpcli.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/http/httpcli.h"
 
 #include <limits.h>
@@ -26,6 +24,7 @@
 #include <utility>
 
 #include "absl/functional/bind_front.h"
+#include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
 
@@ -33,7 +32,10 @@
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
+#include "src/core/handshaker/handshaker_registry.h"
+#include "src/core/handshaker/tcp_connect/tcp_connect_handshaker.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_args_preconditioning.h"
@@ -50,8 +52,6 @@
 #include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/error_utils.h"
-#include "src/core/lib/transport/handshaker_registry.h"
-#include "src/core/lib/transport/tcp_connect_handshaker.h"
 
 namespace grpc_core {
 
@@ -184,7 +184,7 @@ HttpRequest::HttpRequest(
   GRPC_CLOSURE_INIT(&continue_done_write_after_schedule_on_exec_ctx_,
                     ContinueDoneWriteAfterScheduleOnExecCtx, this,
                     grpc_schedule_on_exec_ctx);
-  GPR_ASSERT(pollent);
+  CHECK(pollent);
   grpc_polling_entity_add_to_pollset_set(pollent, pollset_set_);
 }
 
@@ -217,7 +217,7 @@ void HttpRequest::Start() {
 void HttpRequest::Orphan() {
   {
     MutexLock lock(&mu_);
-    GPR_ASSERT(!cancelled_);
+    CHECK(!cancelled_);
     cancelled_ = true;
     // cancel potentially pending DNS resolution.
     if (dns_request_handle_.has_value() &&

data/src/core/lib/http/httpcli.h

@@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CORE_LIB_HTTP_HTTPCLI_H
 #define GRPC_SRC_CORE_LIB_HTTP_HTTPCLI_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <functional>
@@ -34,7 +32,9 @@
 
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 
+#include "src/core/handshaker/handshaker.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
@@ -51,7 +51,6 @@
 #include "src/core/lib/iomgr/resolve_address.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
-#include "src/core/lib/transport/handshaker.h"
 #include "src/core/lib/uri/uri_parser.h"
 
 // User agent this library reports

data/src/core/lib/http/httpcli_security_connector.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include <string.h>
 
 #include <string>
@@ -27,13 +25,17 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
+#include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 
+#include "src/core/handshaker/handshaker.h"
+#include "src/core/handshaker/security/security_handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
@@ -48,8 +50,6 @@
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/lib/security/security_connector/ssl_utils.h"
-#include "src/core/lib/security/transport/security_handshaker.h"
-#include "src/core/lib/transport/handshaker.h"
 #include "src/core/tsi/ssl_transport_security.h"
 #include "src/core/tsi/transport_security_interface.h"
 

data/src/core/lib/http/httpcli_ssl_credentials.h

@@ -17,9 +17,8 @@
 #ifndef GRPC_SRC_CORE_LIB_HTTP_HTTPCLI_SSL_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_HTTP_HTTPCLI_SSL_CREDENTIALS_H
 
-#include <grpc/support/port_platform.h>
-
 #include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 

data/src/core/lib/http/parser.cc

@@ -16,18 +16,18 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/http/parser.h"
 
 #include <string.h>
 
 #include <algorithm>
 
+#include "absl/log/check.h"
 #include "absl/status/status.h"
 
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 grpc_core::TraceFlag grpc_http1_trace(false, "http1");
 
@@ -178,7 +178,7 @@ static grpc_error_handle add_header(grpc_http_parser* parser) {
   grpc_http_header hdr = {nullptr, nullptr};
   grpc_error_handle error;
 
-  GPR_ASSERT(cur != end);
+  CHECK(cur != end);
 
   if (*cur == ' ' || *cur == '\t') {
     error = GRPC_ERROR_CREATE("Continued header lines not supported yet");
@@ -192,14 +192,14 @@ static grpc_error_handle add_header(grpc_http_parser* parser) {
     error = GRPC_ERROR_CREATE("Didn't find ':' in header string");
     goto done;
   }
-  GPR_ASSERT(cur >= beg);
+  CHECK(cur >= beg);
   hdr.key = buf2str(beg, static_cast<size_t>(cur - beg));
   cur++;  // skip :
 
   while (cur != end && (*cur == ' ' || *cur == '\t')) {
     cur++;
   }
-  GPR_ASSERT((size_t)(end - cur) >= parser->cur_line_end_length);
+  CHECK((size_t)(end - cur) >= parser->cur_line_end_length);
   size = static_cast<size_t>(end - cur) - parser->cur_line_end_length;
   if ((size != 0) && (cur[size - 1] == '\r')) {
     size--;

data/src/core/lib/http/parser.h

@@ -19,12 +19,11 @@
 #ifndef GRPC_SRC_CORE_LIB_HTTP_PARSER_H
 #define GRPC_SRC_CORE_LIB_HTTP_PARSER_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>
 
 #include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/error.h"

data/src/core/lib/iomgr/buffer_list.cc

@@ -16,11 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/buffer_list.h"
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
 #include "src/core/lib/gprpp/crash.h"

data/src/core/lib/iomgr/buffer_list.h

@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_BUFFER_LIST_H
 #define GRPC_SRC_CORE_LIB_IOMGR_BUFFER_LIST_H
 
-#include <grpc/support/port_platform.h>
-
 #include "absl/types/optional.h"
 
+#include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
 #include "src/core/lib/gprpp/sync.h"