Merge branch 'shush-chaotic-protocol' into shush-multipass

ctiller · Jan 22, 2024 · a5cdfe9 · a5cdfe9
2 parents 1119e26 + e821e87
commit a5cdfe9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/include/grpc/support/port_platform.h b/include/grpc/support/port_platform.h
@@ -670,6 +670,14 @@ typedef unsigned __int64 uint64_t;
 #endif
 #endif
 
+#ifndef GRPC_REINITIALIZES
+#if GPR_HAS_CPP_ATTRIBUTE(clang::reinitializes)
+#define GRPC_REINITIALIZES [[clang::reinitializes]]
+#else
+#define GRPC_REINITIALIZES
+#endif
+#endif
+
 #ifndef GPR_HAS_ATTRIBUTE
 #ifdef __has_attribute
 #define GPR_HAS_ATTRIBUTE(a) __has_attribute(a)

diff --git a/src/core/lib/slice/slice_buffer.h b/src/core/lib/slice/slice_buffer.h
@@ -113,7 +113,9 @@ class SliceBuffer {
   }
 
   /// Removes and unrefs all slices in the SliceBuffer.
-  void Clear() { grpc_slice_buffer_reset_and_unref(&slice_buffer_); }
+  GRPC_REINITIALIZES void Clear() {
+    grpc_slice_buffer_reset_and_unref(&slice_buffer_);
+  }
 
   /// Removes the first slice in the SliceBuffer and returns it.
   Slice TakeFirst();