[grpc] Update to v1.32.0

ports/grpc/00005-fix-uwp-error.patch

@@ -1,34 +1,34 @@
-diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc
-index 0dacbfef3e..310bf1de1b 100644
---- a/src/core/lib/slice/slice.cc
-+++ b/src/core/lib/slice/slice.cc
-@@ -234,6 +234,7 @@ grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr<char> p,
-                                         size_t len) {
-   uint8_t* ptr = reinterpret_cast<uint8_t*>(p.get());
-   grpc_slice slice;
-+  memset(&slice, 0, sizeof(grpc_slice));
-   if (len <= sizeof(slice.data.inlined.bytes)) {
-     slice.refcount = nullptr;
-     slice.data.inlined.length = len;
-@@ -253,7 +254,7 @@ grpc_slice grpc_slice_from_moved_string(grpc_core::UniquePtr<char> p) {
- }
-
- grpc_slice grpc_slice_from_cpp_string(std::string str) {
--  grpc_slice slice;
-+  grpc_slice slice = { 0 };
-   if (str.size() <= sizeof(slice.data.inlined.bytes)) {
-     slice.refcount = nullptr;
-     slice.data.inlined.length = str.size();
-diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc
-index cab0cd56c4..2c88fd625b 100644
---- a/src/core/lib/surface/server.cc
-+++ b/src/core/lib/surface/server.cc
-@@ -1301,7 +1301,7 @@ grpc_call_error queue_call_request(grpc_server* server, size_t cq_idx,
-               GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown"));
-     return GRPC_CALL_OK;
-   }
--  RequestMatcherInterface* rm;
-+  RequestMatcherInterface* rm = nullptr;
-   switch (rc->type) {
-     case RequestedCallType::BATCH_CALL:
-       rm = server->unregistered_request_matcher.get();
+diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc
+index 0dacbfe..0743a1b 100644
+--- a/src/core/lib/slice/slice.cc
++++ b/src/core/lib/slice/slice.cc
+@@ -234,6 +234,7 @@ grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr<char> p,
+                                         size_t len) {
+   uint8_t* ptr = reinterpret_cast<uint8_t*>(p.get());
+   grpc_slice slice;
++  memset(&slice, 0, sizeof(grpc_slice));
+   if (len <= sizeof(slice.data.inlined.bytes)) {
+     slice.refcount = nullptr;
+     slice.data.inlined.length = len;
+@@ -253,7 +254,7 @@ grpc_slice grpc_slice_from_moved_string(grpc_core::UniquePtr<char> p) {
+ }
+ 
+ grpc_slice grpc_slice_from_cpp_string(std::string str) {
+-  grpc_slice slice;
++  grpc_slice slice = { 0 };
+   if (str.size() <= sizeof(slice.data.inlined.bytes)) {
+     slice.refcount = nullptr;
+     slice.data.inlined.length = str.size();
+diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc
+index c945515..3fd9797 100644
+--- a/src/core/lib/surface/server.cc
++++ b/src/core/lib/surface/server.cc
+@@ -878,7 +878,7 @@ grpc_call_error Server::QueueRequestedCall(size_t cq_idx, RequestedCall* rc) {
+              GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown"));
+     return GRPC_CALL_OK;
+   }
+-  RequestMatcherInterface* rm;
++  RequestMatcherInterface* rm = nullptr;
+   switch (rc->type) {
+     case RequestedCall::Type::BATCH_CALL:
+       rm = unregistered_request_matcher_.get();

ports/grpc/00009-use-system-upb.patch

@@ -1,139 +1,140 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a337149f1f..6baab5d37b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -84,6 +84,9 @@ set_property(CACHE gRPC_SSL_PROVIDER PROPERTY STRINGS "module" "package")
- set(gRPC_PROTOBUF_PROVIDER "module" CACHE STRING "Provider of protobuf library")
- set_property(CACHE gRPC_PROTOBUF_PROVIDER PROPERTY STRINGS "module" "package")
-
-+set(gRPC_UPB_PROVIDER "module" CACHE STRING "Provider of upb library")
-+set_property(CACHE gRPC_UPB_PROVIDER PROPERTY STRINGS "module" "package")
-+
- set(gRPC_PROTOBUF_PACKAGE_TYPE "" CACHE STRING "Algorithm for searching protobuf package")
- set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG" "MODULE")
-
-@@ -1807,7 +1810,6 @@ target_link_libraries(grpc
-   ${_gRPC_ALLTARGETS_LIBRARIES}
-   gpr
-   address_sorting
--  upb
-   absl::optional
-   absl::strings
-   absl::inlined_vector
-@@ -1887,7 +1889,6 @@ target_link_libraries(grpc_csharp_ext
-   grpc
-   gpr
-   address_sorting
--  upb
- )
-
-
-@@ -2409,7 +2410,6 @@ target_link_libraries(grpc_unsecure
-   ${_gRPC_ALLTARGETS_LIBRARIES}
-   gpr
-   address_sorting
--  upb
-   absl::optional
-   absl::strings
-   absl::inlined_vector
-@@ -2606,7 +2606,6 @@ target_link_libraries(grpc++
-   grpc
-   gpr
-   address_sorting
--  upb
- )
-
- foreach(_hdr
-@@ -2876,7 +2875,6 @@ target_link_libraries(grpc++_alts
-   grpc
-   gpr
-   address_sorting
--  upb
- )
-
- foreach(_hdr
-@@ -2945,7 +2943,6 @@ target_link_libraries(grpc++_error_details
-   grpc
-   gpr
-   address_sorting
--  upb
- )
-
- foreach(_hdr
-@@ -3019,7 +3016,6 @@ target_link_libraries(grpc++_reflection
-   grpc
-   gpr
-   address_sorting
--  upb
- )
-
- foreach(_hdr
-@@ -3300,7 +3296,6 @@ target_link_libraries(grpc++_unsecure
-   grpc_unsecure
-   gpr
-   address_sorting
--  upb
- )
-
- foreach(_hdr
-@@ -3642,7 +3637,6 @@ target_link_libraries(grpcpp_channelz
-   grpc
-   gpr
-   address_sorting
--  upb
- )
-
- foreach(_hdr
-@@ -3669,6 +3663,7 @@ endif()
-
- endif()
-
-+if (gRPC_UPB_PROVIDER STREQUAL "module")
- add_library(upb
-   third_party/upb/upb/decode.c
-   third_party/upb/upb/encode.c
-@@ -3719,7 +3714,7 @@ if(gRPC_INSTALL)
-     ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
-   )
- endif()
--
-+endif()
-
-
- add_executable(check_epollexclusive
-diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in
-index 3623f4aa5e..df6ced560e 100644
---- a/cmake/gRPCConfig.cmake.in
-+++ b/cmake/gRPCConfig.cmake.in
-@@ -8,6 +8,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules)
- @_gRPC_FIND_CARES@
- @_gRPC_FIND_ABSL@
- @_gRPC_FIND_RE2@
-+@_gRPC_FIND_UPB@
-
- # Targets
- include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake)
-diff --git a/cmake/upb.cmake b/cmake/upb.cmake
-index 2c0ab84e67..07dd613a78 100644
---- a/cmake/upb.cmake
-+++ b/cmake/upb.cmake
-@@ -12,9 +12,18 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
-
-+set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated")
-+if (gRPC_UPB_PROVIDER STREQUAL "module")
- set(UPB_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/upb)
-
- set(_gRPC_UPB_INCLUDE_DIR "${UPB_ROOT_DIR}")
--set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated")
-
- set(_gRPC_UPB_LIBRARIES upb)
-+
-+elseif(gRPC_UPB_PROVIDER STREQUAL "package")
-+    find_package(upb CONFIG REQUIRED)
-+    set(_gRPC_UPB_LIBRARIES upb::upb)
-+    set(_gRPC_UPB_INCLUDE_DIR)
-+    set(upb ${_gRPC_UPB_LIBRARIES})
-+    set(_gRPC_FIND_UPB "if(NOT upb_FOUND)\n  find_package(upb CONFIG REQUIRED)\nendif()")
-+endif()
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e3fe299..4bae849 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -84,6 +84,9 @@ set_property(CACHE gRPC_SSL_PROVIDER PROPERTY STRINGS "module" "package")
+ set(gRPC_PROTOBUF_PROVIDER "module" CACHE STRING "Provider of protobuf library")
+ set_property(CACHE gRPC_PROTOBUF_PROVIDER PROPERTY STRINGS "module" "package")
+
++set(gRPC_UPB_PROVIDER "module" CACHE STRING "Provider of upb library")
++set_property(CACHE gRPC_UPB_PROVIDER PROPERTY STRINGS "module" "package")
++
+ set(gRPC_PROTOBUF_PACKAGE_TYPE "" CACHE STRING "Algorithm for searching protobuf package")
+ set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG" "MODULE")
+
+@@ -1891,7 +1894,6 @@ target_link_libraries(grpc
+   ${_gRPC_ALLTARGETS_LIBRARIES}
+   gpr
+   address_sorting
+-  upb
+   absl::optional
+   absl::strings
+   absl::status
+@@ -1973,7 +1975,6 @@ target_link_libraries(grpc_csharp_ext
+   grpc
+   gpr
+   address_sorting
+-  upb
+ )
+
+
+@@ -2503,7 +2504,6 @@ target_link_libraries(grpc_unsecure
+   ${_gRPC_ALLTARGETS_LIBRARIES}
+   gpr
+   address_sorting
+-  upb
+   absl::optional
+   absl::strings
+   absl::status
+@@ -2701,7 +2701,6 @@ target_link_libraries(grpc++
+   grpc
+   gpr
+   address_sorting
+-  upb
+ )
+
+ foreach(_hdr
+@@ -2963,7 +2962,6 @@ target_link_libraries(grpc++_alts
+   grpc
+   gpr
+   address_sorting
+-  upb
+ )
+
+ foreach(_hdr
+@@ -3032,7 +3030,6 @@ target_link_libraries(grpc++_error_details
+   grpc
+   gpr
+   address_sorting
+-  upb
+ )
+
+ foreach(_hdr
+@@ -3105,7 +3102,6 @@ target_link_libraries(grpc++_reflection
+   grpc
+   gpr
+   address_sorting
+-  upb
+ )
+
+ foreach(_hdr
+@@ -3386,7 +3382,6 @@ target_link_libraries(grpc++_unsecure
+   grpc_unsecure
+   gpr
+   address_sorting
+-  upb
+ )
+
+ foreach(_hdr
+@@ -3720,7 +3715,6 @@ target_link_libraries(grpcpp_channelz
+   grpc
+   gpr
+   address_sorting
+-  upb
+ )
+
+ foreach(_hdr
+@@ -3747,6 +3741,7 @@ endif()
+
+ endif()
+
++if (gRPC_UPB_PROVIDER STREQUAL "module")
+ add_library(upb
+   third_party/upb/upb/decode.c
+   third_party/upb/upb/encode.c
+@@ -3798,7 +3793,7 @@ if(gRPC_INSTALL)
+   )
+ endif()
+
+-
++endif()
+
+ add_executable(check_epollexclusive
+   test/build/check_epollexclusive.c
+diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in
+index 3623f4a..df6ced5 100644
+--- a/cmake/gRPCConfig.cmake.in
++++ b/cmake/gRPCConfig.cmake.in
+@@ -8,6 +8,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules)
+ @_gRPC_FIND_CARES@
+ @_gRPC_FIND_ABSL@
+ @_gRPC_FIND_RE2@
++@_gRPC_FIND_UPB@
+
+ # Targets
+ include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake)
+diff --git a/cmake/upb.cmake b/cmake/upb.cmake
+index f2a0e50..ecce7ba 100644
+--- a/cmake/upb.cmake
++++ b/cmake/upb.cmake
+@@ -12,9 +12,20 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+
++set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated")
++if (gRPC_UPB_PROVIDER STREQUAL "module")
++
+ set(UPB_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/upb)
+
+ set(_gRPC_UPB_INCLUDE_DIR "${UPB_ROOT_DIR}")
+ set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated")
+
+ set(_gRPC_UPB_LIBRARIES upb)
++
++elseif(gRPC_UPB_PROVIDER STREQUAL "package")
++    find_package(upb CONFIG REQUIRED)
++    set(_gRPC_UPB_LIBRARIES upb::upb)
++    set(_gRPC_UPB_INCLUDE_DIR)
++    set(upb ${_gRPC_UPB_LIBRARIES})
++    set(_gRPC_FIND_UPB "if(NOT upb_FOUND)\n  find_package(upb CONFIG REQUIRED)\nendif()")
++endif()