Merge pull request #20047 from veblush/clean-nanopb

Remove all nanopb defines

CMakeLists.txt

@@ -96,8 +96,6 @@ endif()
 
 set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
 
-add_definitions(-DPB_FIELD_32BIT)
-
 if (MSVC)
   include(cmake/msvc_static_runtime.cmake)
   add_definitions(-D_WIN32_WINNT=0x600 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS)

Makefile

@@ -354,7 +354,7 @@ CXXFLAGS += -stdlib=libc++
 LDFLAGS += -framework CoreFoundation
 endif
 CXXFLAGS += -Wnon-virtual-dtor
-CPPFLAGS += -g -Wall -Wextra -Werror $(W_NO_UNKNOWN_WARNING_OPTION) -Wno-long-long -Wno-unused-parameter -Wno-deprecated-declarations -Wno-sign-conversion -Wno-shadow -Wno-conversion -Wno-implicit-fallthrough -Wno-sign-compare -Wno-missing-field-initializers -Wno-maybe-uninitialized -DPB_FIELD_32BIT -DOSATOMIC_USE_INLINED=1 -Ithird_party/upb -Isrc/core/ext/upb-generated
+CPPFLAGS += -g -Wall -Wextra -Werror $(W_NO_UNKNOWN_WARNING_OPTION) -Wno-long-long -Wno-unused-parameter -Wno-deprecated-declarations -Wno-sign-conversion -Wno-shadow -Wno-conversion -Wno-implicit-fallthrough -Wno-sign-compare -Wno-missing-field-initializers -Wno-maybe-uninitialized -DOSATOMIC_USE_INLINED=1 -Ithird_party/upb -Isrc/core/ext/upb-generated
 COREFLAGS += -fno-rtti -fno-exceptions
 LDFLAGS += -g
 

build.yaml

@@ -6200,8 +6200,7 @@ defaults:
     CPPFLAGS: -g -Wall -Wextra -Werror $(W_NO_UNKNOWN_WARNING_OPTION) -Wno-long-long
       -Wno-unused-parameter -Wno-deprecated-declarations -Wno-sign-conversion -Wno-shadow
       -Wno-conversion -Wno-implicit-fallthrough -Wno-sign-compare -Wno-missing-field-initializers
-      -Wno-maybe-uninitialized -DPB_FIELD_32BIT -DOSATOMIC_USE_INLINED=1 -Ithird_party/upb
-      -Isrc/core/ext/upb-generated
+      -Wno-maybe-uninitialized -DOSATOMIC_USE_INLINED=1 -Ithird_party/upb -Isrc/core/ext/upb-generated
     CXXFLAGS: -Wnon-virtual-dtor
     LDFLAGS: -g
   zlib:

config.m4

@@ -14,8 +14,8 @@ if test "$PHP_GRPC" != "no"; then
 
   LIBS="-lpthread $LIBS"
 
-  CFLAGS="-Wall -Werror -Wno-parentheses-equality -Wno-unused-value -std=c11 -g -O2 -D PB_FIELD_32BIT=1"
-  CXXFLAGS="-std=c++11 -fno-exceptions -fno-rtti -g -O2 -D PB_FIELD_32BIT=1"
+  CFLAGS="-Wall -Werror -Wno-parentheses-equality -Wno-unused-value -std=c11 -g -O2"
+  CXXFLAGS="-std=c++11 -fno-exceptions -fno-rtti -g -O2"
   GRPC_SHARED_LIBADD="-lpthread $GRPC_SHARED_LIBADD"
   PHP_REQUIRE_CXX()
   PHP_ADD_LIBRARY(pthread)

config.w32

@@ -706,7 +706,6 @@ if (PHP_GRPC != "no") {
   EXTENSION("grpc", grpc_source, null,
     "/DOPENSSL_NO_ASM /D_GNU_SOURCE /DWIN32_LEAN_AND_MEAN "+
     "/D_HAS_EXCEPTIONS=0 /DNOMINMAX /DGRPC_ARES=0 /D_WIN32_WINNT=0x600 "+
-    "/DPB_FIELD_32BIT "+
     "/I"+configure_module_dirname+" "+
     "/I"+configure_module_dirname+"\\include "+
     "/I"+configure_module_dirname+"\\src\\core\\ext\\upb-generated "+

gRPC-C++.podspec

@@ -56,7 +56,7 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig = {
     'HEADER_SEARCH_PATHS' => '"$(inherited)" "$(PODS_TARGET_SRCROOT)/include"',
     'USER_HEADER_SEARCH_PATHS' => '"$(PODS_TARGET_SRCROOT)"',
-    'GCC_PREPROCESSOR_DEFINITIONS' => '"$(inherited)" "COCOAPODS=1" "PB_NO_PACKED_STRUCTS=1"',
+    'GCC_PREPROCESSOR_DEFINITIONS' => '"$(inherited)" "COCOAPODS=1"',
     'CLANG_WARN_STRICT_PROTOTYPES' => 'NO',
     'CLANG_WARN_DOCUMENTATION_COMMENTS' => 'NO',
 

gRPC-Core.podspec

@@ -91,12 +91,12 @@ Pod::Spec.new do |s|
     # build.
     'USE_HEADERMAP' => 'NO',
     'ALWAYS_SEARCH_USER_PATHS' => 'NO',
-    'GCC_PREPROCESSOR_DEFINITIONS' => '"$(inherited)" "COCOAPODS=1" "PB_NO_PACKED_STRUCTS=1"',
+    'GCC_PREPROCESSOR_DEFINITIONS' => '"$(inherited)" "COCOAPODS=1"',
     'CLANG_WARN_STRICT_PROTOTYPES' => 'NO',
   }
 
   s.default_subspecs = 'Interface', 'Implementation'
-  s.compiler_flags = '-DGRPC_ARES=0', '-DPB_FIELD_32BIT'
+  s.compiler_flags = '-DGRPC_ARES=0'
   s.libraries = 'c++'
 
   # Like many other C libraries, gRPC-Core has its public headers under `include/<libname>/` and its

grpc.gyp

@@ -66,7 +66,6 @@
       '-Wno-sign-compare',
       '-Wno-missing-field-initializers',
       '-Wno-maybe-uninitialized',
-      '-DPB_FIELD_32BIT',
       '-DOSATOMIC_USE_INLINED=1',
       '-Ithird_party/upb',
       '-Isrc/core/ext/upb-generated',
@@ -155,7 +154,6 @@
             '-Wno-sign-compare',
             '-Wno-missing-field-initializers',
             '-Wno-maybe-uninitialized',
-            '-DPB_FIELD_32BIT',
             '-DOSATOMIC_USE_INLINED=1',
             '-Ithird_party/upb',
             '-Isrc/core/ext/upb-generated',
@@ -176,7 +174,6 @@
             '-Wno-sign-compare',
             '-Wno-missing-field-initializers',
             '-Wno-maybe-uninitialized',
-            '-DPB_FIELD_32BIT',
             '-DOSATOMIC_USE_INLINED=1',
             '-Ithird_party/upb',
             '-Isrc/core/ext/upb-generated',

setup.py

@@ -161,7 +161,6 @@ if EXTRA_ENV_COMPILE_ARGS is None:
     EXTRA_ENV_COMPILE_ARGS += ' -std=gnu99 -fvisibility=hidden -fno-wrapv -fno-exceptions'
   elif "darwin" in sys.platform:
     EXTRA_ENV_COMPILE_ARGS += ' -stdlib=libc++ -fvisibility=hidden -fno-wrapv -fno-exceptions'
-EXTRA_ENV_COMPILE_ARGS += ' -DPB_FIELD_32BIT'
 
 if EXTRA_ENV_LINK_ARGS is None:
   EXTRA_ENV_LINK_ARGS = ''

src/objective-c/tests/BUILD

@@ -63,9 +63,6 @@ grpc_objc_testing_library(
     data = [":TestCertificates"],
     defines = [
         "DEBUG=1",
-        "PB_FIELD_32BIT=1",
-        "PB_NO_PACKED_STRUCTS=1",
-        "PB_ENABLE_MALLOC=1",
         "HOST_PORT_LOCALSSL=localhost:5051",
         "HOST_PORT_LOCAL=localhost:5050",
         "HOST_PORT_REMOTE=grpc-test.sandbox.googleapis.com",

src/objective-c/tests/Tests.xcodeproj/project.pbxproj

@@ -1702,9 +1702,6 @@
 					"$(inherited)",
 					"COCOAPODS=1",
 					"GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1",
-					"PB_FIELD_32BIT=1",
-					"PB_NO_PACKED_STRUCTS=1",
-					"PB_ENABLE_MALLOC=1",
 					"GRPC_TEST_OBJC=1",
 				);
 				INFOPLIST_FILE = MacTests/Info.plist;

templates/CMakeLists.txt.template

@@ -145,8 +145,6 @@
   ## Some libraries are shared even with BUILD_SHARED_LIBRARIES=OFF
   set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
   
-  add_definitions(-DPB_FIELD_32BIT)
-
   if (MSVC)
     include(cmake/msvc_static_runtime.cmake)
     add_definitions(-D_WIN32_WINNT=0x600 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS)

templates/config.m4.template

@@ -16,8 +16,8 @@
 
     LIBS="-lpthread $LIBS"
 
-    CFLAGS="-Wall -Werror -Wno-parentheses-equality -Wno-unused-value -std=c11 -g -O2 -D PB_FIELD_32BIT=1"
-    CXXFLAGS="-std=c++11 -fno-exceptions -fno-rtti -g -O2 -D PB_FIELD_32BIT=1"
+    CFLAGS="-Wall -Werror -Wno-parentheses-equality -Wno-unused-value -std=c11 -g -O2"
+    CXXFLAGS="-std=c++11 -fno-exceptions -fno-rtti -g -O2"
     GRPC_SHARED_LIBADD="-lpthread $GRPC_SHARED_LIBADD"
     PHP_REQUIRE_CXX()
     PHP_ADD_LIBRARY(pthread)

templates/config.w32.template

@@ -23,7 +23,6 @@
     EXTENSION("grpc", grpc_source, null,
       "/DOPENSSL_NO_ASM /D_GNU_SOURCE /DWIN32_LEAN_AND_MEAN "+
       "/D_HAS_EXCEPTIONS=0 /DNOMINMAX /DGRPC_ARES=0 /D_WIN32_WINNT=0x600 "+
-      "/DPB_FIELD_32BIT "+
       "/I"+configure_module_dirname+" "+
       "/I"+configure_module_dirname+"\\include "+
       "/I"+configure_module_dirname+"\\src\\core\\ext\\upb-generated "+

templates/gRPC-C++.podspec.template

@@ -170,7 +170,7 @@
     s.pod_target_xcconfig = {
       'HEADER_SEARCH_PATHS' => '"$(inherited)" "$(PODS_TARGET_SRCROOT)/include"',
       'USER_HEADER_SEARCH_PATHS' => '"$(PODS_TARGET_SRCROOT)"',
-      'GCC_PREPROCESSOR_DEFINITIONS' => '"$(inherited)" "COCOAPODS=1" "PB_NO_PACKED_STRUCTS=1"',
+      'GCC_PREPROCESSOR_DEFINITIONS' => '"$(inherited)" "COCOAPODS=1"',
       'CLANG_WARN_STRICT_PROTOTYPES' => 'NO',
       'CLANG_WARN_DOCUMENTATION_COMMENTS' => 'NO',
 

templates/gRPC-Core.podspec.template

@@ -144,12 +144,12 @@
       # build.
       'USE_HEADERMAP' => 'NO',
       'ALWAYS_SEARCH_USER_PATHS' => 'NO',
-      'GCC_PREPROCESSOR_DEFINITIONS' => '"$(inherited)" "COCOAPODS=1" "PB_NO_PACKED_STRUCTS=1"',
+      'GCC_PREPROCESSOR_DEFINITIONS' => '"$(inherited)" "COCOAPODS=1"',
       'CLANG_WARN_STRICT_PROTOTYPES' => 'NO',
     }
 
     s.default_subspecs = 'Interface', 'Implementation'
-    s.compiler_flags = '-DGRPC_ARES=0', '-DPB_FIELD_32BIT'
+    s.compiler_flags = '-DGRPC_ARES=0'
     s.libraries = 'c++'
 
     # Like many other C libraries, gRPC-Core has its public headers under `include/<libname>/` and its

test/core/iomgr/ios/CFStreamTests/CFStreamTests.xcodeproj/project.pbxproj

@@ -271,8 +271,6 @@
 					"$(inherited)",
 					"COCOAPODS=1",
 					"$(inherited)",
-					"PB_FIELD_32BIT=1",
-					"PB_NO_PACKED_STRUCTS=1",
 					"GRPC_CFSTREAM=1",
 				);
 				INFOPLIST_FILE = Info.plist;

tools/bazel.rc

@@ -75,7 +75,6 @@ build:ubsan --linkopt=-fsanitize=undefined
 build:ubsan --action_env=UBSAN_OPTIONS=halt_on_error=1:print_stacktrace=1:suppressions=test/core/util/ubsan_suppressions.txt
 # For some reasons, these two stopped being propagated, so, redeclaring them here.
 # That's a hack that needs to be removed once we understand what's going on.
-build:ubsan --copt=-DPB_FIELD_32BIT=1
 build:ubsan --copt=-DGRPC_PORT_ISOLATED_RUNTIME=1
 
 build:basicprof --strip=never

tools/distrib/check_nanopb_output.sh

@@ -1,59 +0,0 @@
-#!/bin/bash
-# Copyright 2015 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -ex
-
-readonly NANOPB_HEALTH_TMP_OUTPUT="$(mktemp -d)"
-readonly NANOPB_TMP_OUTPUT="$(mktemp -d)"
-readonly PROTOBUF_INSTALL_PREFIX="$(mktemp -d)"
-
-# install protoc version 3
-pushd third_party/protobuf
-./autogen.sh
-./configure --prefix="$PROTOBUF_INSTALL_PREFIX"
-make -j 8
-make install
-#ldconfig
-popd
-
-readonly PROTOC_BIN_PATH="$PROTOBUF_INSTALL_PREFIX/bin"
-if [ ! -x "$PROTOBUF_INSTALL_PREFIX/bin/protoc" ]; then
-  echo "Error: protoc not found in temp install dir '$PROTOBUF_INSTALL_PREFIX'"
-  exit 1
-fi
-
-# stack up and change to nanopb's proto generator directory
-pushd third_party/nanopb/generator/proto
-export PATH="$PROTOC_BIN_PATH:$PATH"
-make -j 8
-# back to the root directory
-popd
-
-#
-# checks for health.proto
-#
-readonly HEALTH_GRPC_OUTPUT_PATH='src/core/ext/filters/client_channel/health'
-# nanopb-compile the proto to a temp location
-./tools/codegen/core/gen_nano_proto.sh \
-  src/proto/grpc/health/v1/health.proto \
-  "$NANOPB_HEALTH_TMP_OUTPUT" \
-  "$HEALTH_GRPC_OUTPUT_PATH"
-# compare outputs to checked compiled code
-for NANOPB_OUTPUT_FILE in $NANOPB_HEALTH_TMP_OUTPUT/*.pb.*; do
-  if ! diff "$NANOPB_OUTPUT_FILE" "${HEALTH_GRPC_OUTPUT_PATH}/$(basename $NANOPB_OUTPUT_FILE)"; then
-    echo "Outputs differ: $NANOPB_HEALTH_TMP_OUTPUT vs $HEALTH_GRPC_OUTPUT_PATH"
-    exit 2
-  fi
-done