Merge pull request #543 from haberman/google3-fixes

Fixes for google3 (layering check and formatting).

BUILD

@@ -109,6 +109,16 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "mini_table_internal",
+    hdrs = ["upb/msg_internal.h"],
+    deps = [
+        ":port",
+        ":table",
+        ":upb",
+    ],
+)
+
 cc_library(
     name = "mini_table",
     srcs = ["upb/mini_table.c"],
@@ -118,7 +128,11 @@ cc_library(
     ],
     copts = UPB_DEFAULT_COPTS,
     visibility = ["//visibility:public"],
-    deps = [":upb"],
+    deps = [
+        ":mini_table_internal",
+        ":port",
+        ":upb",
+    ],
 )
 
 cc_test(
@@ -126,8 +140,10 @@ cc_test(
     srcs = ["upb/mini_table_test.cc"],
     deps = [
         ":mini_table",
-        "@com_google_googletest//:gtest_main",
+        ":mini_table_internal",
+        ":upb",
         "@com_google_absl//absl/container:flat_hash_set",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -463,7 +479,7 @@ cc_binary(
     testonly = 1,
     srcs = ["upb/conformance_upb.c"],
     copts = UPB_DEFAULT_COPTS + [
-        "-DREBUILD_MINITABLES"
+        "-DREBUILD_MINITABLES",
     ],
     data = ["upb/conformance_upb_failures.txt"],
     deps = [

bazel/py_extension.bzl

@@ -1,10 +1,9 @@
-
 load(
     "//bazel:build_defs.bzl",
     "UPB_DEFAULT_COPTS",
 )
 
-def py_extension(name, srcs, deps=[]):
+def py_extension(name, srcs, deps = []):
     version_script = name + "_version_script.lds"
     symbol = "PyInit_" + name
     native.genrule(

bazel/pyproto_test_wrapper.bzl

@@ -1,4 +1,3 @@
-
 # copybara:strip_for_google3_begin
 
 def pyproto_test_wrapper(name):

benchmarks/build_defs.bzl

@@ -24,7 +24,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # copybara:insert_for_google3_begin
-# load("//tools/build_defs/proto/cpp:cc_proto_library.bzl", _cc_proto_library="cc_proto_library")
+# load("//tools/build_defs/proto/cpp:cc_proto_library.bzl", _cc_proto_library = "cc_proto_library")
 # copybara:insert_end
 
 # copybara:strip_for_google3_begin
@@ -36,7 +36,7 @@ def proto_library(**kwargs):
         # copybara:insert_for_google3_begin
         # cc_api_version = 2,
         # copybara:insert_end
-        **kwargs,
+        **kwargs
     )
 
 def tmpl_cc_binary(name, gen, args, replacements = [], **kwargs):
@@ -55,7 +55,7 @@ def tmpl_cc_binary(name, gen, args, replacements = [], **kwargs):
         # copybara:insert_end
         name = name,
         srcs = srcs,
-        **kwargs,
+        **kwargs
     )
 
 def cc_optimizefor_proto_library(name, srcs, outs, optimize_for):

benchmarks/compare.py

@@ -81,7 +81,8 @@ def Benchmark(outbase, bench_cpu=True, runs=12, fasttable=False):
         print("{} {} {} ns/op".format(*values), file=f)
     Run("sort {} -o {} ".format(txt_filename, txt_filename))
 
-  Run("CC=clang bazel build -c opt --copt=-g --copt=-march=native :conformance_upb" + extra_args)
+  Run("CC=clang bazel build -c opt --copt=-g --copt=-march=native :conformance_upb"
+      + extra_args)
   Run("cp -f bazel-bin/conformance_upb {}.bin".format(outbase))
 
 

cmake/CMakeLists.txt

@@ -81,11 +81,18 @@ target_link_libraries(upb
   fastdecode
   port
   /third_party/utf8_range)
+add_library(mini_table_internal INTERFACE)
+target_link_libraries(mini_table_internal INTERFACE
+  port
+  table
+  upb)
 add_library(mini_table
   ../upb/mini_table.c
   ../upb/mini_table.h
   ../upb/mini_table.hpp)
 target_link_libraries(mini_table
+  mini_table_internal
+  port
   upb)
 add_library(fastdecode
   ../upb/decode.h

upb/mini_table.c

@@ -163,7 +163,7 @@ char* upb_MtDataEncoder_StartMessage(upb_MtDataEncoder* e, char* ptr,
 
 char* upb_MtDataEncoder_PutField(upb_MtDataEncoder* e, char* ptr,
                                  upb_FieldType type, uint32_t field_num,
-                                 uint64_t modifiers) {
+                                 uint64_t field_mod) {
   static const char kUpb_TypeToEncoded[] = {
       [kUpb_FieldType_Double] = kUpb_EncodedType_Double,
       [kUpb_FieldType_Float] = kUpb_EncodedType_Float,
@@ -199,7 +199,7 @@ char* upb_MtDataEncoder_PutField(upb_MtDataEncoder* e, char* ptr,
 
   // Put field type.
   int encoded_type = kUpb_TypeToEncoded[type];
-  if (modifiers & kUpb_FieldModifier_IsRepeated) {
+  if (field_mod & kUpb_FieldModifier_IsRepeated) {
     // Repeated fields shift the type number up (unlike other modifiers which
     // are bit flags).
     encoded_type += kUpb_EncodedType_RepeatedBase;
@@ -208,13 +208,13 @@ char* upb_MtDataEncoder_PutField(upb_MtDataEncoder* e, char* ptr,
   if (!ptr) return NULL;
 
   uint32_t encoded_modifiers = 0;
-  if (modifiers & kUpb_FieldModifier_IsProto3Singular) {
+  if (field_mod & kUpb_FieldModifier_IsProto3Singular) {
     encoded_modifiers |= kUpb_EncodedFieldModifier_IsProto3Singular;
   }
-  if (modifiers & kUpb_FieldModifier_IsRequired) {
+  if (field_mod & kUpb_FieldModifier_IsRequired) {
     encoded_modifiers |= kUpb_EncodedFieldModifier_IsRequired;
   }
-  if ((modifiers & kUpb_FieldModifier_IsPacked) !=
+  if ((field_mod & kUpb_FieldModifier_IsPacked) !=
       (in->msg_mod & kUpb_MessageModifier_DefaultIsPacked)) {
     encoded_modifiers |= kUpb_EncodedFieldModifier_IsUnpacked;
   }

upb/mini_table.h

@@ -92,13 +92,13 @@ typedef struct {
 //   ptr = upb_MiniTable_PutOneofField(&e, ptr, ...);
 //
 // Oneofs must be encoded after all regular fields.
-char* upb_MtDataEncoder_StartMessage(upb_MtDataEncoder* e, char* buf,
+char* upb_MtDataEncoder_StartMessage(upb_MtDataEncoder* e, char* ptr,
                                      uint64_t msg_mod);
-char* upb_MtDataEncoder_PutField(upb_MtDataEncoder* e, char* buf,
+char* upb_MtDataEncoder_PutField(upb_MtDataEncoder* e, char* ptr,
                                  upb_FieldType type, uint32_t field_num,
                                  uint64_t field_mod);
-char* upb_MtDataEncoder_StartOneof(upb_MtDataEncoder* e, char* buf);
-char* upb_MtDataEncoder_PutOneofField(upb_MtDataEncoder* e, char* buf,
+char* upb_MtDataEncoder_StartOneof(upb_MtDataEncoder* e, char* ptr);
+char* upb_MtDataEncoder_PutOneofField(upb_MtDataEncoder* e, char* ptr,
                                       uint32_t field_num);
 
 /** upb_MiniTable *************************************************************/