Upgrade Protobuf to v33.6

.github/workflows/android.yml

@@ -79,8 +79,8 @@ jobs:
       run: |
         set -e -x
         BINARY_SIZE_THRESHOLD_ARGS=""
-        echo "Binary size threshold in bytes: 1451008"
-        BINARY_SIZE_THRESHOLD_ARGS="--threshold_size_in_bytes 1451008"
+        echo "Binary size threshold in bytes: 1585152"
+        BINARY_SIZE_THRESHOLD_ARGS="--threshold_size_in_bytes 1585152"
 
         # Ensure ANDROID_NDK_HOME is available and get its real path
         if [ -z "$ANDROID_NDK_HOME" ]; then

cgmanifests/cgmanifest.json

@@ -18,7 +18,7 @@
         "maven": {
           "GroupId": "com.google.protobuf",
           "ArtifactId": "protobuf-java",
-          "Version": "3.25.5"
+          "Version": "4.33.6"
         },
         "DevelopmentDependency": true
       }

cmake/deps.txt

@@ -40,13 +40,13 @@ mp11;https://github.com/boostorg/mp11/archive/refs/tags/boost-1.82.0.zip;9bc9e01
 onnx;https://github.com/onnx/onnx/archive/refs/tags/v1.22.0.zip;2b2cd58ac7a26df5371266149e0c76776330cdf1
 # Use the latest commit of 10.9-GA
 onnx_tensorrt;https://github.com/onnx/onnx-tensorrt/archive/d5dce67db7c2e64b07e055571f5ec06f7f254de2.zip;01114d3b67650857281fa50faa2e412130a63b69
-protobuf;https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.12.zip;7cf2733949036c7d52fda017badcab093fe73bfa
-protoc_win64;https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-win64.zip;b4521f7ada5b260380f94c4bd7f1b7684c76969a
-protoc_win32;https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-win32.zip;3688010318192c46ce73213cdfb6b3e5656da874
-protoc_linux_x64;https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-linux-x86_64.zip;338462004aa5be9fba45b35b5b4be43f69b47a90
-protoc_linux_x86;https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-linux-x86_32.zip;61fdbe7d6360e065ec6fea23bca2cca673115fb8
-protoc_linux_aarch64;https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-linux-aarch_64.zip;df9d45470b0b8cf939dd2f0ec6b88e9cafc4d617
-protoc_mac_universal;https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-osx-universal_binary.zip;23710c3d1c2036d8d65a6a22234372fa2d7af9ef
+protobuf;https://github.com/protocolbuffers/protobuf/releases/download/v33.6/protobuf-33.6.tar.gz;051fee744fcca04dab37eb009d49aa3e9546acda
+protoc_win64;https://github.com/protocolbuffers/protobuf/releases/download/v33.6/protoc-33.6-win64.zip;9f43a76f18e37325079f772bd47673f9d2f06385
+protoc_win32;https://github.com/protocolbuffers/protobuf/releases/download/v33.6/protoc-33.6-win32.zip;127b589423e076fe5f9724e61b2aa9e91eab3936
+protoc_linux_x64;https://github.com/protocolbuffers/protobuf/releases/download/v33.6/protoc-33.6-linux-x86_64.zip;44c6aeb3f494e4f8e46d283b05e087c47cf6369d
+protoc_linux_x86;https://github.com/protocolbuffers/protobuf/releases/download/v33.6/protoc-33.6-linux-x86_32.zip;6a4b46fa6b090ff8e64f03bdd4a865ea504fa261
+protoc_linux_aarch64;https://github.com/protocolbuffers/protobuf/releases/download/v33.6/protoc-33.6-linux-aarch_64.zip;b7ec3edf45c31fed5318f65693ce5f14c850a72f
+protoc_mac_universal;https://github.com/protocolbuffers/protobuf/releases/download/v33.6/protoc-33.6-osx-universal_binary.zip;3c2f883c5f828ae184550763ab8ae9dc642d5d97
 psimd;https://github.com/Maratyszcza/psimd/archive/072586a71b55b7f8c584153d223e95687148a900.zip;1f5454b01f06f9656b77e4a5e2e31d7422487013
 pthreadpool;https://github.com/google/pthreadpool/archive/dcc9f28589066af0dbd4555579281230abbf74dd.zip;533a77943203ef15ca608bcd9dbe2c94da7451d2
 pybind11;https://github.com/pybind/pybind11/archive/refs/tags/v3.0.2.zip;a064e663b4d7a337ac291d1bef7337ef4e60a1ae

cmake/external/abseil-cpp.cmake

@@ -20,7 +20,8 @@ if(Patch_FOUND)
   if (WIN32)
     set(ABSL_PATCH_COMMAND ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/vcpkg-ports/abseil/absl_windows.patch &&
                            ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/vcpkg-ports/abseil/absl_cuda_warnings.patch &&
-                           ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/vcpkg-ports/abseil/absl_cuda13_member_template.patch)
+                           ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/vcpkg-ports/abseil/absl_cuda13_member_template.patch &&
+                           ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/vcpkg-ports/abseil/absl_msvc_unreachable_code.patch)
   else()
     set(ABSL_PATCH_COMMAND ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/vcpkg-ports/abseil/absl_cuda_warnings.patch &&
                            ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/vcpkg-ports/abseil/absl_cuda13_member_template.patch)

cmake/external/onnxruntime_external_deps.cmake

@@ -186,9 +186,10 @@ endif()
 #   for cross-compiling
 #2. if ONNX_CUSTOM_PROTOC_EXECUTABLE is not set, Compile everything(including protoc) from source code.
 if(Patch_FOUND)
-  set(ONNXRUNTIME_PROTOBUF_PATCH_COMMAND ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/protobuf/protobuf_cmake.patch &&
-                                         ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/protobuf/protobuf_android_log.patch &&
-                                         ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/protobuf/protobuf_s390x.patch)
+  set(ONNXRUNTIME_PROTOBUF_PATCH_COMMAND ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/protobuf/protobuf_android_log.patch &&
+                                         ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/protobuf/protobuf_msvc_unreachable_code.patch &&
+                                         ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/protobuf/protobuf_msvc_map_unreachable_code.patch &&
+                                         ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/protobuf/protobuf_compiler_incomplete_type.patch)
 else()
  set(ONNXRUNTIME_PROTOBUF_PATCH_COMMAND "")
 endif()

cmake/onnxruntime_providers_cuda_plugin.cmake

@@ -235,6 +235,8 @@ if (CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 12.8)
     list(APPEND _cuda_plugin_shared_compile_options
             "$<$<COMPILE_LANGUAGE:CUDA>:--static-global-template-stub=false>"
             "$<$<COMPILE_LANGUAGE:CUDA>:--diag-suppress=221>"
+      # Protobuf uses offsetof on MessageLite, which is intentionally non-standard-layout.
+      "$<$<COMPILE_LANGUAGE:CUDA>:--diag-suppress=1427>"
             "$<$<COMPILE_LANGUAGE:CUDA>:--diag-suppress=2908>"
     )
 
@@ -245,12 +247,21 @@ if (CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 12.8)
     endif()
 endif()
 
-  if (CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0 AND MSVC)
+if (CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0)
+  # CUDA 13 diagnoses qualified friend declarations in Abseil and Protobuf as 970-D,
+  # and Protobuf's always_inline template redeclaration as 2189-D.
+  list(APPEND _cuda_plugin_shared_compile_options
+      "$<$<COMPILE_LANGUAGE:CUDA>:--diag-suppress=970>"
+      "$<$<COMPILE_LANGUAGE:CUDA>:--diag-suppress=2189>"
+  )
+
+  if (MSVC)
     # Suppress unrecognized __pragma warnings emitted from CUDA headers in device code.
     list(APPEND _cuda_plugin_shared_compile_options
         "$<$<COMPILE_LANGUAGE:CUDA>:--diag-suppress=20199>"
     )
   endif()
+endif()
 
 if (MSVC)
     list(APPEND _cuda_plugin_shared_compile_options

cmake/onnxruntime_unittests.cmake

@@ -1009,7 +1009,8 @@ if (onnxruntime_ENABLE_CUDA_EP_INTERNAL_TESTS AND NOT onnxruntime_BUILD_CUDA_EP_
   onnxruntime_add_include_to_target(onnxruntime_providers_cuda_ut GTest::gtest GTest::gmock)
   add_dependencies(onnxruntime_providers_cuda_ut onnxruntime_test_utils)
   target_include_directories(onnxruntime_providers_cuda_ut PRIVATE ${ONNXRUNTIME_ROOT}/core/mickey)
-  target_link_libraries(onnxruntime_providers_cuda_ut PRIVATE GTest::gtest GTest::gmock ${ONNXRUNTIME_MLAS_LIBS} onnxruntime_test_utils)
+  target_link_libraries(onnxruntime_providers_cuda_ut PRIVATE GTest::gtest GTest::gmock ${ONNXRUNTIME_MLAS_LIBS}
+                                                        onnxruntime_test_utils ${PROTOBUF_LIB})
   # Link architecture-specific OBJECT libraries (same as onnxruntime_providers_cuda).
   if(TARGET onnxruntime_providers_cuda_sm90_tma)
     target_link_libraries(onnxruntime_providers_cuda_ut PRIVATE onnxruntime_providers_cuda_sm90_tma)

cmake/patches/protobuf/protobuf_android_log.patch

@@ -1,26 +1,28 @@
 diff --git a/cmake/libprotobuf-lite.cmake b/cmake/libprotobuf-lite.cmake
-index 83e970312..96908991f 100644
+index 6a923f6c8..4c485d054 100644
 --- a/cmake/libprotobuf-lite.cmake
 +++ b/cmake/libprotobuf-lite.cmake
-@@ -102,7 +102,7 @@ if(protobuf_LINK_LIBATOMIC)
-   target_link_libraries(libprotobuf-lite PRIVATE atomic)
- endif()
+@@ -18,6 +18,6 @@ endif()
+ target_link_libraries(libprotobuf-lite PRIVATE ${CMAKE_THREAD_LIBS_INIT})
  if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
 -  target_link_libraries(libprotobuf-lite PRIVATE log)
 +  target_link_libraries(libprotobuf-lite PRIVATE -llog)
  endif()
- target_include_directories(libprotobuf-lite PUBLIC ${protobuf_SOURCE_DIR}/src)
- if(protobuf_BUILD_SHARED_LIBS)
+ target_include_directories(libprotobuf-lite PUBLIC
+   $<BUILD_INTERFACE:${protobuf_SOURCE_DIR}/src>
+@@ -46 +46 @@ add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite)
+-target_link_libraries(libprotobuf-lite PRIVATE utf8_validity)
++target_link_libraries(libprotobuf-lite PUBLIC utf8_validity)
 diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake
-index 07e4bcf57..0cf27caff 100644
+index 22df1fd14..e4b24ece6 100644
 --- a/cmake/libprotobuf.cmake
 +++ b/cmake/libprotobuf.cmake
-@@ -118,7 +118,7 @@ if(protobuf_LINK_LIBATOMIC)
-   target_link_libraries(libprotobuf PRIVATE atomic)
+@@ -21,7 +21,7 @@ if(protobuf_WITH_ZLIB)
+   target_link_libraries(libprotobuf PRIVATE ${ZLIB_LIBRARIES})
  endif()
  if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
 -  target_link_libraries(libprotobuf PRIVATE log)
 +  target_link_libraries(libprotobuf PRIVATE -llog)
  endif()
- target_include_directories(libprotobuf PUBLIC ${protobuf_SOURCE_DIR}/src)
- if(protobuf_BUILD_SHARED_LIBS)
+ target_include_directories(libprotobuf PUBLIC
+   $<BUILD_INTERFACE:${protobuf_SOURCE_DIR}/src>

cmake/patches/protobuf/protobuf_compiler_incomplete_type.patch

@@ -0,0 +1,17 @@
+diff --git a/src/google/protobuf/message_lite.h b/src/google/protobuf/message_lite.h
+index 710ce671c..acfdfb4df 100644
+--- a/src/google/protobuf/message_lite.h
++++ b/src/google/protobuf/message_lite.h
+@@ -295,7 +295,11 @@ using MessageTraits = decltype(MessageTraitsImpl::value<T>);
+ struct EnumTraitsImpl {
+   struct Undefined;
++  // We use an incomplete type to cause a compiler error if something tries to
++  // instantiate `value<T>` with a `T` that had no specialization.
++  // The `enable_if` is there to workaround some compilers/tools that complain
++  // on the declaration even with no instantiations.
+   template <typename T>
+-  static Undefined value;
++  static std::enable_if_t<sizeof(T) != 0, Undefined> value;
+ };
+ template <typename T>
+ using EnumTraits = decltype(EnumTraitsImpl::value<T>);

cmake/patches/protobuf/protobuf_msvc_map_unreachable_code.patch

@@ -0,0 +1,20 @@
+diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h
+index f0839fbd2..83432444a 100644
+--- a/src/google/protobuf/map.h
++++ b/src/google/protobuf/map.h
+@@ -680,7 +680,10 @@ inline map_index_t Hash(absl::string_view k, void* salt) {
+ inline map_index_t Hash(uint64_t k, void* salt) {
+-  if constexpr (!HasCrc32()) return absl::HashOf(k, salt);
+-  uintptr_t salt_int = reinterpret_cast<uintptr_t>(salt);
+-  // Note: Crc32(salt_int, k) causes the random iteration order test to fail so
+-  // we also rotate.
+-  return Crc32(salt_int, absl::rotr(k, salt_int & 0x3f));
++  if constexpr (!HasCrc32()) {
++    return absl::HashOf(k, salt);
++  } else {
++    uintptr_t salt_int = reinterpret_cast<uintptr_t>(salt);
++    // Note: Crc32(salt_int, k) causes the random iteration order test to fail so
++    // we also rotate.
++    return Crc32(salt_int, absl::rotr(k, salt_int & 0x3f));
++  }
+ }

cmake/patches/protobuf/protobuf_msvc_unreachable_code.patch

@@ -0,0 +1,11 @@
+diff --git a/src/google/protobuf/repeated_ptr_field.h b/src/google/protobuf/repeated_ptr_field.h
+index e3c9a779f..32e79a122 100644
+--- a/src/google/protobuf/repeated_ptr_field.h
++++ b/src/google/protobuf/repeated_ptr_field.h
+@@ -326,4 +326,5 @@ class PROTOBUF_EXPORT RepeatedPtrFieldBase {
+       return MergeFrom<MessageLite>(from, arena);
++    } else {
++      MergeFromConcreteMessage(from, arena, Arena::CopyConstruct<T>);
+     }
+-    MergeFromConcreteMessage(from, arena, Arena::CopyConstruct<T>);
+   }

cmake/vcpkg-ports/abseil/absl_msvc_unreachable_code.patch

@@ -0,0 +1,17 @@
+diff --git a/absl/container/internal/container_memory.h b/absl/container/internal/container_memory.h
+index 2c893482..f70d8ecf 100644
+--- a/absl/container/internal/container_memory.h
++++ b/absl/container/internal/container_memory.h
+@@ -495,9 +495,10 @@ struct HashElement {
+       // "absl::hash_internal::SupportsHashWithSeed" is directly included`.
+       // Maybe we should make "internal/hash.h" be a separate library.
+       return absl::hash_internal::HashWithSeed().hash(hash, key, seed);
++    } else {
++      // NOLINTNEXTLINE(clang-diagnostic-sign-conversion)
++      return hash(key) ^ seed;
+     }
+-    // NOLINTNEXTLINE(clang-diagnostic-sign-conversion)
+-    return hash(key) ^ seed;
+   }
+   const Hash& hash;
+   size_t seed;

cmake/vcpkg-ports/abseil/portfile.cmake

@@ -11,6 +11,7 @@ vcpkg_from_github(
     PATCHES absl_windows.patch
             absl_cuda_warnings.patch
             absl_cuda13_member_template.patch
+            absl_msvc_unreachable_code.patch
 )
 
 
@@ -24,7 +25,7 @@ vcpkg_cmake_configure(
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DABSL_PROPAGATE_CXX_STD=ON
-        ${ABSL_USE_CXX17_OPTION}
+        -DCMAKE_CXX_STANDARD=17
         ${ABSL_STATIC_RUNTIME_OPTION}
 )
 

cmake/vcpkg-ports/dawn/vcpkg.json

@@ -9,7 +9,7 @@
     { "name": "vcpkg-cmake", "host": true },
     { "name": "vcpkg-cmake-config", "host": true },
     { "name": "abseil", "version>=": "20250127.1" },
-    { "name": "protobuf", "version>=": "3.21.12" },
+    { "name": "protobuf", "version>=": "6.33.6" },
     {
       "name": "spirv-headers",
       "version>=": "1.4.304.1",

cmake/vcpkg-ports/protobuf/portfile.cmake

@@ -3,11 +3,14 @@ vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO protocolbuffers/protobuf
-    REF v3.21.12
-    SHA512 152f8441c325e808b942153c15e82fdb533d5273b50c25c28916ec568ada880f79242bb61ee332ac5fb0d20f21239ed6f8de02ef6256cc574b1fc354d002c6b0
+    REF v33.6
+    SHA512 16f8689ec7aba47d29f27c2360c33c78d6e11ae9f29e815f792e6b943713395e680f0ab6d48f9395e8bec1df44c4afdc212ad4e4fc3629b820e7b3ac82e132e9
     HEAD_REF master
     PATCHES
-	protobuf_cmake.patch
+        protobuf_cmake.patch
+        "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf/protobuf_msvc_unreachable_code.patch"
+        "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf/protobuf_msvc_map_unreachable_code.patch"
+        "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf/protobuf_compiler_incomplete_type.patch"
 )
 
 string(COMPARE EQUAL "${TARGET_TRIPLET}" "${HOST_TRIPLET}" protobuf_BUILD_PROTOC_BINARIES)
@@ -31,17 +34,6 @@ if (VCPKG_DOWNLOAD_MODE)
     vcpkg_find_acquire_program(PKGCONFIG)
 endif()
 
-# Delete language backends we aren't targeting to reduce false positives in automated dependency
-# detectors like Dependabot.
-file(REMOVE_RECURSE
-    "${SOURCE_PATH}/csharp"
-    "${SOURCE_PATH}/java"
-    "${SOURCE_PATH}/objectivec"
-    "${SOURCE_PATH}/php"
-    "${SOURCE_PATH}/python"
-    "${SOURCE_PATH}/ruby"
-)
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
@@ -55,6 +47,7 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME utf8_range CONFIG_PATH lib/cmake/utf8_range)
 
 # It appears that at this point the build hasn't actually finished. There is probably
 # a process spawned by the build, therefore we need to wait a bit.
@@ -88,9 +81,27 @@ protobuf_try_remove_recurse_wait("${CURRENT_PACKAGES_DIR}/debug/share")
 
 if(protobuf_BUILD_PROTOC_BINARIES)
     if(VCPKG_TARGET_IS_WINDOWS)
-        vcpkg_copy_tools(TOOL_NAMES protoc AUTO_CLEAN)
+        vcpkg_copy_tools(
+            TOOL_NAMES protoc protoc-gen-upb protoc-gen-upbdefs protoc-gen-upb_minitable
+            AUTO_CLEAN
+        )
     else()
-        vcpkg_copy_tools(TOOL_NAMES protoc protoc-${VERSION}.0 AUTO_CLEAN)
+        string(REPLACE "." ";" VERSION_LIST ${VERSION})
+        list(GET VERSION_LIST 1 VERSION_MINOR)
+        list(GET VERSION_LIST 2 VERSION_PATCH)
+        set(PROTOBUF_VERSION_SUFFIX "${VERSION_MINOR}.${VERSION_PATCH}.0")
+        vcpkg_copy_tools(
+            TOOL_NAMES
+                protoc
+                protoc-${PROTOBUF_VERSION_SUFFIX}
+                protoc-gen-upb
+                protoc-gen-upb-${PROTOBUF_VERSION_SUFFIX}
+                protoc-gen-upbdefs
+                protoc-gen-upbdefs-${PROTOBUF_VERSION_SUFFIX}
+                protoc-gen-upb_minitable
+                protoc-gen-upb_minitable-${PROTOBUF_VERSION_SUFFIX}
+            AUTO_CLEAN
+        )
     endif()
 else()
     file(COPY "${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools")