From b39e3d4406a4ebdd4a5d60fce33aba2335af64d5 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Tue, 3 May 2022 20:46:42 -0700
Subject: [PATCH] [iwyu] slice (#29546)

---
 src/core/lib/slice/b64.cc                  | 2 +-
 src/core/lib/slice/b64.h                   | 2 ++
 src/core/lib/slice/percent_encoding.cc     | 5 ++++-
 src/core/lib/slice/slice.cc                | 3 ++-
 src/core/lib/slice/slice.h                 | 5 +++++
 src/core/lib/slice/slice_api.cc            | 2 +-
 src/core/lib/slice/slice_buffer.cc         | 6 +++++-
 src/core/lib/slice/slice_internal.h        | 4 ++++
 src/core/lib/slice/slice_refcount.h        | 2 ++
 src/core/lib/slice/slice_refcount_base.h   | 2 ++
 src/core/lib/slice/slice_split.cc          | 3 +++
 src/core/lib/slice/slice_string_helpers.cc | 4 ++++
 src/core/lib/slice/slice_string_helpers.h  | 1 +
 tools/dockerfile/grpc_iwyu/iwyu.sh         | 2 +-
 14 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/core/lib/slice/b64.cc b/src/core/lib/slice/b64.cc
index 0a06a05c934..75af1246580 100644
--- a/src/core/lib/slice/b64.cc
+++ b/src/core/lib/slice/b64.cc
@@ -27,7 +27,7 @@
 #include <grpc/support/log.h>
 
 #include "src/core/lib/gpr/useful.h"
-#include "src/core/lib/slice/slice_internal.h"
+#include "src/core/lib/slice/slice_refcount.h"
 
 /* --- Constants. --- */
 
diff --git a/src/core/lib/slice/b64.h b/src/core/lib/slice/b64.h
index 65ba6622b20..573fc6877b4 100644
--- a/src/core/lib/slice/b64.h
+++ b/src/core/lib/slice/b64.h
@@ -21,6 +21,8 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <stddef.h>
+
 #include <grpc/slice.h>
 
 /* Encodes data using base64. It is the caller's responsibility to free
diff --git a/src/core/lib/slice/percent_encoding.cc b/src/core/lib/slice/percent_encoding.cc
index 98e17bc5027..6b69a0f54c3 100644
--- a/src/core/lib/slice/percent_encoding.cc
+++ b/src/core/lib/slice/percent_encoding.cc
@@ -20,12 +20,15 @@
 
 #include "src/core/lib/slice/percent_encoding.h"
 
+#include <stdlib.h>
+
 #include <cstdint>
+#include <type_traits>
+#include <utility>
 
 #include <grpc/support/log.h>
 
 #include "src/core/lib/gprpp/bitset.h"
-#include "src/core/lib/slice/slice_internal.h"
 
 #if __cplusplus > 201103l
 #define GRPC_PCTENCODE_CONSTEXPR_FN constexpr
diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc
index 2e78b4de9e6..fb596f32f56 100644
--- a/src/core/lib/slice/slice.cc
+++ b/src/core/lib/slice/slice.cc
@@ -22,12 +22,13 @@
 
 #include <string.h>
 
+#include <new>
+
 #include <grpc/slice.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 
 #include "src/core/lib/gprpp/memory.h"
-#include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/slice/slice_refcount_base.h"
 
diff --git a/src/core/lib/slice/slice.h b/src/core/lib/slice/slice.h
index c4c9284bec6..52ddcc6c980 100644
--- a/src/core/lib/slice/slice.h
+++ b/src/core/lib/slice/slice.h
@@ -17,11 +17,16 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <string.h>
+
 #include <cstdint>
+#include <string>
+#include <utility>
 
 #include "absl/strings/string_view.h"
 
 #include <grpc/slice.h>
+#include <grpc/support/log.h>
 
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/slice/slice_internal.h"
diff --git a/src/core/lib/slice/slice_api.cc b/src/core/lib/slice/slice_api.cc
index 28827d20872..d455fd82c00 100644
--- a/src/core/lib/slice/slice_api.cc
+++ b/src/core/lib/slice/slice_api.cc
@@ -21,7 +21,7 @@
 #include <grpc/slice.h>
 
 #include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/lib/slice/slice_internal.h"
+#include "src/core/lib/slice/slice_refcount.h"
 
 /* Public API */
 grpc_slice grpc_slice_ref(grpc_slice slice) {
diff --git a/src/core/lib/slice/slice_buffer.cc b/src/core/lib/slice/slice_buffer.cc
index 20854b2d0e2..12e005c1412 100644
--- a/src/core/lib/slice/slice_buffer.cc
+++ b/src/core/lib/slice/slice_buffer.cc
@@ -18,15 +18,19 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <stdint.h>
 #include <string.h>
 
+#include <utility>
+
+#include <grpc/slice.h>
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/slice/slice_internal.h"
+#include "src/core/lib/slice/slice_refcount.h"
 
 /* grow a buffer; requires GRPC_SLICE_BUFFER_INLINE_ELEMENTS > 1 */
 #define GROW(x) (3 * (x) / 2)
diff --git a/src/core/lib/slice/slice_internal.h b/src/core/lib/slice/slice_internal.h
index d4f22bbfec0..4db61ae3d02 100644
--- a/src/core/lib/slice/slice_internal.h
+++ b/src/core/lib/slice/slice_internal.h
@@ -21,8 +21,12 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <stdint.h>
 #include <string.h>
 
+#include <cstddef>
+#include <string>
+
 #include "absl/strings/string_view.h"
 
 #include <grpc/slice.h>
diff --git a/src/core/lib/slice/slice_refcount.h b/src/core/lib/slice/slice_refcount.h
index c3a90ca6f2a..4062e7180d1 100644
--- a/src/core/lib/slice/slice_refcount.h
+++ b/src/core/lib/slice/slice_refcount.h
@@ -17,8 +17,10 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <stdint.h>
 #include <string.h>
 
+#include <grpc/slice.h>
 #include <grpc/support/alloc.h>
 
 #include "src/core/lib/gpr/murmur_hash.h"
diff --git a/src/core/lib/slice/slice_refcount_base.h b/src/core/lib/slice/slice_refcount_base.h
index 79aaf9c1f04..dae994198eb 100644
--- a/src/core/lib/slice/slice_refcount_base.h
+++ b/src/core/lib/slice/slice_refcount_base.h
@@ -17,6 +17,8 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <stddef.h>
+
 #include <atomic>
 
 #include <grpc/slice.h>
diff --git a/src/core/lib/slice/slice_split.cc b/src/core/lib/slice/slice_split.cc
index d2a951cb54d..2c1448b23c7 100644
--- a/src/core/lib/slice/slice_split.cc
+++ b/src/core/lib/slice/slice_split.cc
@@ -16,8 +16,11 @@
 
 #include "src/core/lib/slice/slice_split.h"
 
+#include <stddef.h>
+#include <stdint.h>
 #include <string.h>
 
+#include <grpc/slice_buffer.h>
 #include <grpc/support/log.h>
 
 /** Finds the initial (\a begin) and final (\a end) offsets of the next
diff --git a/src/core/lib/slice/slice_string_helpers.cc b/src/core/lib/slice/slice_string_helpers.cc
index 35744d0aa01..f1af01ffe69 100644
--- a/src/core/lib/slice/slice_string_helpers.cc
+++ b/src/core/lib/slice/slice_string_helpers.cc
@@ -20,6 +20,10 @@
 
 #include "src/core/lib/slice/slice_string_helpers.h"
 
+#include <stddef.h>
+
+#include <utility>
+
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/slice/slice_internal.h"
diff --git a/src/core/lib/slice/slice_string_helpers.h b/src/core/lib/slice/slice_string_helpers.h
index df9cadd5a81..a4ac647b0b0 100644
--- a/src/core/lib/slice/slice_string_helpers.h
+++ b/src/core/lib/slice/slice_string_helpers.h
@@ -23,6 +23,7 @@
 
 #include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <grpc/slice.h>
 
diff --git a/tools/dockerfile/grpc_iwyu/iwyu.sh b/tools/dockerfile/grpc_iwyu/iwyu.sh
index 84910141e45..ff10c2e83bf 100755
--- a/tools/dockerfile/grpc_iwyu/iwyu.sh
+++ b/tools/dockerfile/grpc_iwyu/iwyu.sh
@@ -30,7 +30,7 @@ cat compile_commands.json | sed "s,\"file\": \",\"file\": \"${IWYU_ROOT}/,g" > c
 
 # figure out which files to include
 cat compile_commands.json | jq -r '.[].file' \
-  | grep -E "^src/core/lib/(config|resource_quota|promise|uri)/" \
+  | grep -E "^src/core/lib/(config|slice|resource_quota|promise|uri)/" \
   | grep -v -E "/upb-generated/|/upbdefs-generated/" \
   | sort \
   | tee iwyu_files.txt