CVS-171145 Update Protobuf to 4.25.1

- Solution revised by Copilot

Author: bumbosiepsak

cmake/developer_package/frontends/frontends.cmake

@@ -99,22 +99,6 @@ macro(ov_frontend_group_files root_dir rel_path file_mask)
    endforeach()
 endmacro()
 
-#
-# ov_suppress_version_dependent_warnings(TARGET_NAME)
-# 
-# Suppress version dependent warnings in third-party libraries for specific compilers
-#
-function(ov_suppress_version_dependent_warnings target_name)
-    # Required for abseil lts_20230802 and GCC 14
-    # Remove once abseil is updated to a newer version
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-        target_compile_options(${target_name} PRIVATE
-            -Wno-error=array-bounds
-            -Wno-error=stringop-overflow
-        )
-    endif()
-endfunction()
-
 #
 # ov_add_frontend(NAME <IR|ONNX|...>
 #                 FILEDESCRIPTION <description> # used on Windows to describe DLL file
@@ -335,7 +319,14 @@ macro(ov_add_frontend)
         endif()
 
         ov_link_system_libraries(${TARGET_NAME} PRIVATE ${protobuf_target_name})
-	ov_suppress_version_dependent_warnings(${TARGET_NAME})
+
+        # GCC emits -Warray-bounds / -Wstringop-overflow even from SYSTEM includes
+        # when instantiating header-only abseil code inside frontend translation units.
+        # With -Werror these become hard errors; downgrade to warnings here.
+        if(CMAKE_COMPILER_IS_GNUCXX)
+            target_compile_options(${TARGET_NAME} PRIVATE
+                -Wno-error=array-bounds -Wno-error=stringop-overflow)
+        endif()
 
         # protobuf generated code emits -Wsuggest-override error
         if(SUGGEST_OVERRIDE_SUPPORTED)

thirdparty/dependencies.cmake

@@ -401,15 +401,6 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
         endif()
     else()
         add_subdirectory(thirdparty/protobuf EXCLUDE_FROM_ALL)
-        # protobuf fails to build with -fsanitize=thread by clang
-        if(ENABLE_THREAD_SANITIZER AND OV_COMPILER_IS_CLANG)
-            foreach(proto_target protoc libprotobuf libprotobuf-lite)
-                if(TARGET ${proto_target})
-                    target_compile_options(${proto_target} PRIVATE -fno-sanitize=thread)
-                    target_link_options(${proto_target} PRIVATE -fno-sanitize=thread)
-                endif()
-            endforeach()
-        endif()
     endif()
 
     # forward additional variables used in the other places
@@ -435,30 +426,6 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
 
     _ov_fix_protobuf_warnings(protobuf::libprotobuf)
     _ov_fix_protobuf_warnings(protobuf::libprotobuf-lite)
-
-    function(_ov_fix_absl_warnings target_name)
-        if(TARGET ${target_name})
-            if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG OR (OV_COMPILER_IS_INTEL_LLVM AND UNIX))
-                set(link_type PRIVATE)    
-                get_target_property(target_type ${target_name} TYPE)
-                if(target_type STREQUAL "INTERFACE_LIBRARY")
-                    set(link_type INTERFACE)
-                endif()
-
-                get_target_property(original_name ${target_name} ALIASED_TARGET)
-                if(TARGET ${original_name})
-                    set(target_name ${original_name})
-                endif()
-                
-                target_compile_options(${target_name} ${link_type} -Wno-sign-conversion)
-            endif()
-        endif()
-    endfunction()
-
-    _ov_fix_absl_warnings(absl::base)
-    _ov_fix_absl_warnings(absl::debugging)
-    _ov_fix_absl_warnings(absl::malloc_internal)
-    _ov_fix_absl_warnings(absl::stacktrace)
 endif()
 
 #

thirdparty/protobuf/CMakeLists.txt

@@ -15,15 +15,14 @@ set(BUILD_SHARED_LIBS OFF)
 
 if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG OR (OV_COMPILER_IS_INTEL_LLVM AND UNIX))
     ov_add_compiler_flags(-Wno-all)
-    # GCC (any version) may emit "overflow in constant expression" for the
-    # static_assert in abseil's ascii.cc when evaluating static_cast<char>(i)
-    # for i >= 128 in a constexpr context. -fpermissive downgrades it from
-    # a hard error to a warning (GCC >= 12 only). For GCC < 12, -fpermissive
-    # does NOT affect static_assert, so we additionally use -funsigned-char
-    # which makes char unsigned — then static_cast<char>(i) for i < 256 is
-    # always in-range and the constexpr evaluator accepts it on all versions.
-    ov_add_compiler_flags(-fpermissive)
     if(CMAKE_COMPILER_IS_GNUCXX)
+        # GCC may emit "non-constant condition for static assertion" in abseil's
+        # ascii.cc because static_cast<char>(i) for i >= 128 is implementation-
+        # defined when char is signed, and older GCC constexpr evaluators reject
+        # it.  -fpermissive downgrades it to a warning on GCC >= 12.
+        # -funsigned-char makes char unsigned so the cast is always in-range,
+        # fixing all GCC versions.
+        ov_add_compiler_flags(-fpermissive)
         ov_add_compiler_flags(-funsigned-char)
     endif()
     if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 11 AND CMAKE_COMPILER_IS_GNUCXX)
@@ -125,12 +124,16 @@ if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG OR OV_COMPILER_IS_INTEL_LLVM
             C_VISIBILITY_PRESET default
             VISIBILITY_INLINES_HIDDEN OFF
             INTERPROCEDURAL_OPTIMIZATION_RELEASE OFF)
-        if(ENABLE_THREAD_SANITIZER)
-            foreach(_lib ${_protoc_libs})
+    endif()
+    # Disable thread sanitizer for all protobuf/abseil targets — protobuf
+    # is incompatible with -fsanitize=thread (especially under clang).
+    if(ENABLE_THREAD_SANITIZER)
+        foreach(_lib protoc libprotoc libprotobuf libprotobuf-lite)
+            if(TARGET ${_lib})
                 target_compile_options(${_lib} PRIVATE -fno-sanitize=thread)
-            endforeach()
-            target_link_options(protoc PRIVATE -fno-sanitize=thread)
-        endif()
+                target_link_options(${_lib} PRIVATE -fno-sanitize=thread)
+            endif()
+        endforeach()
     endif()
     ov_disable_all_warnings(${_protoc_libs} libprotobuf-lite)
     set_target_properties(libprotobuf-lite PROPERTIES