Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #323 from haberman/build-files

Browse Source 
Split monolithic BUILD file into many build files.
pull/13171/head
Joshua Haberman 4 years ago committed by GitHub
parent 4f066765a9 4ea81ab107
commit b86cf2d789
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
38 changed files with 866 additions and 989 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 676
      BUILD
  2. 71
      bazel/build_defs.bzl
  3. 10
      bazel/lua.BUILD
  4. 6
      bazel/ragel.BUILD
  5. 4
      bazel/upb_proto_library.bzl
  6. 53
      benchmarks/BUILD
  7. 10
      benchmarks/benchmark.cc
  8. 0
      benchmarks/compare.py
  9. 0
      benchmarks/descriptor.proto
  10. 0
      benchmarks/descriptor_sv.proto
  11. 89
      cmake/BUILD
  12. 106
      cmake/CMakeLists.txt
  13. 23
      cmake/README.md
  14. 44
      cmake/build_defs.bzl
  15. 0
      cmake/google/protobuf/descriptor.upb.c
  16. 0
      cmake/google/protobuf/descriptor.upb.h
  17. 11
      cmake/make_cmakelists.py
  18. 2
      cmake/staleness_test.py
  19. 13
      cmake/staleness_test_lib.py
  20. 0
      cmake/upb/json/parser.c
  21. 2
      examples/bazel/BUILD
  22. 2
      examples/bazel/test_binary.c
  23. 6
      kokoro/ubuntu/build.sh
  24. 282
      tests/BUILD
  25. 57
      tests/bindings/lua/BUILD
  26. 8
      tests/bindings/lua/test.proto
  27. 2
      tests/bindings/lua/test_upb.lua
  28. 24
      tests/pb/test_decoder.cc
  29. 57
      tests/pb/test_encoder.cc
  30. 126
      tests/pb/test_varint.c
  31. 40
      upb/bindings/lua/BUILD
  32. 12
      upb/bindings/lua/def.c
  33. 2
      upb/bindings/lua/lua_proto_library.bzl
  34. 2
      upb/bindings/lua/msg.c
  35. 69
      upb/bindings/stdc++/string.h
  36. 3
      upb/json_decode.c
  37. 8
      upb/upb.h
  38. 35
      upbc/BUILD

676
BUILD
Unescape View File

@ -1,9 +1,7 @@
load( load(
"//bazel:build_defs.bzl", "//bazel:build_defs.bzl",
"generated_file_staleness_test", "UPB_DEFAULT_COPTS",
"licenses", # copybara:strip_for_google3 "upb_amalgamation", # copybara:strip_for_google3
"make_shell_script",
"upb_amalgamation",
) )
load( load(
"//bazel:upb_proto_library.bzl", "//bazel:upb_proto_library.bzl",
@ -16,10 +14,7 @@ load(
"@rules_proto//proto:defs.bzl", "@rules_proto//proto:defs.bzl",
"proto_library", "proto_library",
) )
load(
"//:upb/bindings/lua/lua_proto_library.bzl",
"lua_proto_library",
)
# copybara:strip_end # copybara:strip_end
licenses(["notice"]) # BSD (Google-authored w/ possible external contributions) licenses(["notice"]) # BSD (Google-authored w/ possible external contributions)
@ -29,23 +24,6 @@ exports_files([
"build_defs", "build_defs",
]) ])
CPPOPTS = [
# copybara:strip_for_google3_begin
"-Wextra",
# "-Wshorten-64-to-32", # not in GCC (and my Kokoro images doesn't have Clang)
"-Werror",
"-Wno-long-long",
# copybara:strip_end
]
COPTS = CPPOPTS + [
# copybara:strip_for_google3_begin
"-pedantic",
"-Werror=pedantic",
"-Wstrict-prototypes",
# copybara:strip_end
]
config_setting( config_setting(
name = "darwin", name = "darwin",
values = {"cpu": "darwin"}, values = {"cpu": "darwin"},
@ -57,11 +35,6 @@ config_setting(
constraint_values = ["@bazel_tools//platforms:windows"], constraint_values = ["@bazel_tools//platforms:windows"],
) )
config_setting(
name = "fuzz",
values = {"define": "fuzz=true"},
)
# Public C/C++ libraries ####################################################### # Public C/C++ libraries #######################################################
cc_library( cc_library(
@ -73,6 +46,7 @@ cc_library(
"upb/port_def.inc", "upb/port_def.inc",
"upb/port_undef.inc", "upb/port_undef.inc",
], ],
visibility = ["//tests:__pkg__"],
) )
cc_library( cc_library(
@ -93,10 +67,7 @@ cc_library(
"upb/upb.h", "upb/upb.h",
"upb/upb.hpp", "upb/upb.hpp",
], ],
copts = select({ copts = UPB_DEFAULT_COPTS,
":windows": [],
"//conditions:default": COPTS,
}),
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = [":port"], deps = [":port"],
) )
@ -114,10 +85,7 @@ cc_library(
"upb/port_def.inc", "upb/port_def.inc",
"upb/port_undef.inc", "upb/port_undef.inc",
], ],
copts = select({ copts = UPB_DEFAULT_COPTS,
":windows": [],
"//conditions:default": COPTS,
}),
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = [ deps = [
":table", ":table",
@ -149,10 +117,7 @@ cc_library(
"upb/def.hpp", "upb/def.hpp",
"upb/reflection.h", "upb/reflection.h",
], ],
copts = select({ copts = UPB_DEFAULT_COPTS,
":windows": [],
"//conditions:default": COPTS,
}),
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = [ deps = [
":descriptor_upb_proto", ":descriptor_upb_proto",
@ -170,10 +135,7 @@ cc_library(
hdrs = [ hdrs = [
"upb/text_encode.h", "upb/text_encode.h",
], ],
copts = select({ copts = UPB_DEFAULT_COPTS,
":windows": [],
"//conditions:default": COPTS,
}),
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = [ deps = [
":port", ":port",
@ -191,10 +153,8 @@ cc_library(
"upb/json_decode.h", "upb/json_decode.h",
"upb/json_encode.h", "upb/json_encode.h",
], ],
copts = select({ copts = UPB_DEFAULT_COPTS,
":windows": [], visibility = ["//tests:__pkg__"],
"//conditions:default": COPTS,
}),
deps = [ deps = [
":port", ":port",
":reflection", ":reflection",
@ -207,6 +167,7 @@ cc_library(
cc_library( cc_library(
name = "table", name = "table",
hdrs = ["upb/table.int.h"], hdrs = ["upb/table.int.h"],
visibility = ["//tests:__pkg__"],
deps = [ deps = [
":port", ":port",
":upb", ":upb",
@ -226,10 +187,8 @@ cc_library(
"upb/handlers.h", "upb/handlers.h",
"upb/sink.h", "upb/sink.h",
], ],
copts = select({ copts = UPB_DEFAULT_COPTS,
":windows": [], visibility = ["//tests:__pkg__"],
"//conditions:default": COPTS,
}),
deps = [ deps = [
":port", ":port",
":reflection", ":reflection",
@ -254,10 +213,8 @@ cc_library(
"upb/pb/encoder.h", "upb/pb/encoder.h",
"upb/pb/textprinter.h", "upb/pb/textprinter.h",
], ],
copts = select({ copts = UPB_DEFAULT_COPTS,
":windows": [], visibility = ["//tests:__pkg__"],
"//conditions:default": COPTS,
}),
deps = [ deps = [
":descriptor_upb_proto", ":descriptor_upb_proto",
":handlers", ":handlers",
@ -279,430 +236,22 @@ cc_library(
"upb/json/parser.h", "upb/json/parser.h",
"upb/json/printer.h", "upb/json/printer.h",
], ],
copts = select({ copts = UPB_DEFAULT_COPTS,
":windows": [], visibility = ["//tests:__pkg__"],
"//conditions:default": COPTS,
}),
deps = [
":upb",
":upb_pb",
],
)
# copybara:strip_end
cc_library(
name = "upb_cc_bindings",
hdrs = [
"upb/bindings/stdc++/string.h",
],
deps = [
":descriptor_upb_proto",
":handlers",
":port",
":upb",
],
)
# upb compiler #################################################################
cc_library(
name = "upbc_generator",
srcs = [
"upbc/generator.cc",
"upbc/message_layout.cc",
"upbc/message_layout.h",
],
hdrs = ["upbc/generator.h"],
copts = select({
":windows": [],
"//conditions:default": CPPOPTS,
}),
deps = [
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/strings",
"@com_google_protobuf//:protobuf",
"@com_google_protobuf//:protoc_lib",
],
)
cc_binary(
name = "protoc-gen-upb",
srcs = ["upbc/main.cc"],
copts = select({
":windows": [],
"//conditions:default": CPPOPTS,
}),
visibility = ["//visibility:public"],
deps = [
":upbc_generator",
"@com_google_protobuf//:protoc_lib",
],
)
# We strip the tests and remaining rules from google3 until the upb_proto_library()
# and upb_proto_reflection_library() rules are fixed.
# C/C++ tests ##################################################################
proto_library(
name = "benchmark_descriptor_proto",
srcs = ["tests/descriptor.proto"],
)
upb_proto_library(
name = "benchmark_descriptor_upb_proto",
deps = [":benchmark_descriptor_proto"],
)
upb_proto_reflection_library(
name = "benchmark_descriptor_upb_proto_reflection",
deps = [":benchmark_descriptor_proto"],
)
cc_proto_library(
name = "benchmark_descriptor_cc_proto",
deps = [":benchmark_descriptor_proto"],
)
proto_library(
name = "benchmark_descriptor_sv_proto",
srcs = ["tests/descriptor_sv.proto"],
)
cc_proto_library(
name = "benchmark_descriptor_sv_cc_proto",
deps = [":benchmark_descriptor_sv_proto"],
)
cc_binary(
name = "benchmark",
testonly = 1,
srcs = ["tests/benchmark.cc"],
deps = [
":benchmark_descriptor_cc_proto",
":benchmark_descriptor_sv_cc_proto",
":benchmark_descriptor_upb_proto",
":benchmark_descriptor_upb_proto_reflection",
":descriptor_upb_proto",
":reflection",
"@com_github_google_benchmark//:benchmark_main",
"@com_google_protobuf//:protobuf",
],
)
cc_library(
name = "upb_test",
testonly = 1,
srcs = [
"tests/testmain.cc",
],
hdrs = [
"tests/test_util.h",
"tests/upb_test.h",
],
copts = select({
":windows": [],
"//conditions:default": CPPOPTS,
}),
deps = [
":handlers",
":port",
":upb",
],
)
cc_test(
name = "test_varint",
srcs = [
"tests/pb/test_varint.c",
"upb/pb/varint.int.h",
],
copts = select({
":windows": [],
"//conditions:default": COPTS,
}),
deps = [
":port",
":upb",
":upb_pb",
":upb_test",
],
)
proto_library(
name = "test_proto",
testonly = 1,
srcs = ["tests/test.proto"],
)
upb_proto_library(
name = "test_upb_proto",
testonly = 1,
deps = [":test_proto"],
)
cc_test(
name = "test_generated_code",
srcs = ["tests/test_generated_code.c"],
deps = [
":test_messages_proto3_proto_upb",
":empty_upbdefs_proto",
":test_upb_proto",
":upb_test",
],
)
proto_library(
name = "empty_proto",
srcs = ["tests/empty.proto"],
)
upb_proto_reflection_library(
name = "empty_upbdefs_proto",
testonly = 1,
deps = [":empty_proto"],
)
upb_proto_library(
name = "test_messages_proto3_proto_upb",
testonly = 1,
deps = ["@com_google_protobuf//:test_messages_proto3_proto"],
)
proto_library(
name = "test_decoder_proto",
srcs = [
"tests/pb/test_decoder.proto",
],
)
upb_proto_reflection_library(
name = "test_decoder_upb_proto",
deps = [":test_decoder_proto"],
)
cc_test(
name = "test_decoder",
srcs = [
"tests/pb/test_decoder.cc",
"upb/pb/varint.int.h",
],
copts = select({
":windows": [],
"//conditions:default": CPPOPTS,
}),
deps = [
":handlers",
":port",
":test_decoder_upb_proto",
":upb",
":upb_pb",
":upb_test",
],
)
proto_library(
name = "test_cpp_proto",
srcs = [
"tests/test_cpp.proto",
],
)
upb_proto_reflection_library(
name = "test_cpp_upb_proto",
deps = ["test_cpp_proto"],
)
cc_test(
name = "test_cpp",
srcs = ["tests/test_cpp.cc"],
copts = select({
":windows": [],
"//conditions:default": CPPOPTS,
}),
deps = [
":handlers",
":port",
":reflection",
":test_cpp_upb_proto",
":upb",
":upb_pb",
":upb_test",
],
)
cc_test(
name = "test_table",
srcs = ["tests/test_table.cc"],
copts = select({
":windows": [],
"//conditions:default": CPPOPTS,
}),
deps = [
":port",
":table",
":upb",
":upb_test",
],
)
# OSS-Fuzz test
cc_binary(
name = "file_descriptor_parsenew_fuzzer",
testonly = 1,
srcs = ["tests/file_descriptor_parsenew_fuzzer.cc"],
copts = select({
":windows": [],
"//conditions:default": CPPOPTS,
}) + select({
"//conditions:default": [],
":fuzz": ["-fsanitize=fuzzer,address"],
}),
defines = select({
"//conditions:default": [],
":fuzz": ["HAVE_FUZZER"],
}),
deps = [ deps = [
":descriptor_upb_proto",
":upb", ":upb",
],
)
# copybara:strip_for_google3_begin
cc_test(
name = "test_encoder",
srcs = ["tests/pb/test_encoder.cc"],
copts = select({
":windows": [],
"//conditions:default": CPPOPTS,
}),
deps = [
":descriptor_upb_proto",
":descriptor_upb_proto_reflection",
":upb",
":upb_cc_bindings",
":upb_pb", ":upb_pb",
":upb_test",
],
)
proto_library(
name = "test_json_enum_from_separate",
srcs = ["tests/json/enum_from_separate_file.proto"],
deps = [":test_json_proto"],
)
proto_library(
name = "test_json_proto",
srcs = ["tests/json/test.proto"],
)
upb_proto_reflection_library(
name = "test_json_upb_proto_reflection",
deps = ["test_json_proto"],
)
upb_proto_library(
name = "test_json_enum_from_separate_upb_proto",
deps = [":test_json_enum_from_separate"],
)
upb_proto_library(
name = "test_json_upb_proto",
deps = [":test_json_proto"],
)
cc_test(
name = "test_json",
srcs = [
"tests/json/test_json.cc",
],
copts = select({
":windows": [],
"//conditions:default": CPPOPTS,
}),
deps = [
":test_json_upb_proto",
":test_json_upb_proto_reflection",
":upb_json",
":upb_test",
],
)
# copybara:strip_end
upb_proto_library(
name = "conformance_proto_upb",
testonly = 1,
deps = ["@com_google_protobuf//:conformance_proto"],
)
upb_proto_reflection_library(
name = "conformance_proto_upbdefs",
testonly = 1,
deps = ["@com_google_protobuf//:conformance_proto"],
)
upb_proto_reflection_library(
name = "test_messages_proto2_upbdefs",
testonly = 1,
deps = ["@com_google_protobuf//:test_messages_proto2_proto"],
)
upb_proto_reflection_library(
name = "test_messages_proto3_upbdefs",
testonly = 1,
deps = ["@com_google_protobuf//:test_messages_proto3_proto"],
)
cc_binary(
name = "conformance_upb",
testonly = 1,
srcs = [
"tests/conformance_upb.c",
],
data = [
"tests/conformance_upb_failures.txt",
],
copts = select({
":windows": [],
"//conditions:default": COPTS,
}) + ["-Ibazel-out/k8-fastbuild/bin"],
deps = [
":port",
":conformance_proto_upb",
":conformance_proto_upbdefs",
":json",
":reflection",
":test_messages_proto2_upbdefs",
":test_messages_proto3_upbdefs",
":textformat",
":upb",
], ],
) )
make_shell_script( genrule(
name = "gen_test_conformance_upb", name = "generate_json_ragel",
out = "test_conformance_upb.sh", srcs = ["//:upb/json/parser.rl"],
contents = "external/com_google_protobuf/conformance_test_runner " + outs = ["upb/json/parser.c"],
" --enforce_recommended " + cmd = "$(location @ragel//:ragelc) -C -o upb/json/parser.c $< && mv upb/json/parser.c $@",
" --failure_list ./tests/conformance_upb_failures.txt" + tools = ["@ragel//:ragelc"],
" ./conformance_upb",
)
sh_test(
name = "test_conformance_upb",
srcs = ["test_conformance_upb.sh"],
data = [
"tests/conformance_upb_failures.txt",
":conformance_upb",
"@com_google_protobuf//:conformance_test_runner",
],
deps = ["@bazel_tools//tools/bash/runfiles"],
) )
# copybara:strip_for_google3_begin
# Amalgamation ################################################################# # Amalgamation #################################################################
py_binary( py_binary(
@ -732,15 +281,11 @@ cc_library(
name = "amalgamation", name = "amalgamation",
srcs = ["upb.c"], srcs = ["upb.c"],
hdrs = ["upb.h"], hdrs = ["upb.h"],
copts = select({ copts = UPB_DEFAULT_COPTS,
":windows": [],
"//conditions:default": COPTS,
}),
) )
upb_amalgamation( upb_amalgamation(
name = "gen_php_amalgamation", name = "gen_php_amalgamation",
prefix = "php-",
outs = [ outs = [
"php-upb.c", "php-upb.c",
"php-upb.h", "php-upb.h",
@ -754,21 +299,18 @@ upb_amalgamation(
":port", ":port",
":json", ":json",
], ],
prefix = "php-",
) )
cc_library( cc_library(
name = "php_amalgamation", name = "php_amalgamation",
srcs = ["php-upb.c"], srcs = ["php-upb.c"],
hdrs = ["php-upb.h"], hdrs = ["php-upb.h"],
copts = select({ copts = UPB_DEFAULT_COPTS,
":windows": [],
"//conditions:default": COPTS,
}),
) )
upb_amalgamation( upb_amalgamation(
name = "gen_ruby_amalgamation", name = "gen_ruby_amalgamation",
prefix = "ruby-",
outs = [ outs = [
"ruby-upb.c", "ruby-upb.c",
"ruby-upb.h", "ruby-upb.h",
@ -781,102 +323,37 @@ upb_amalgamation(
":port", ":port",
":json", ":json",
], ],
prefix = "ruby-",
) )
cc_library( cc_library(
name = "ruby_amalgamation", name = "ruby_amalgamation",
srcs = ["ruby-upb.c"], srcs = ["ruby-upb.c"],
hdrs = ["ruby-upb.h"], hdrs = ["ruby-upb.h"],
copts = select({ copts = UPB_DEFAULT_COPTS,
":windows": [],
"//conditions:default": COPTS,
}),
) )
# Lua ########################################################################## exports_files(
[
cc_library( "upb/json/parser.rl",
name = "lupb", "BUILD",
srcs = [ "WORKSPACE",
"upb/bindings/lua/def.c",
"upb/bindings/lua/msg.c",
"upb/bindings/lua/upb.c",
],
hdrs = [
"upb/bindings/lua/upb.h",
],
deps = [
":reflection",
":textformat",
":upb",
"@lua//:liblua",
], ],
visibility = ["//cmake:__pkg__"],
) )
cc_test( exports_files(
name = "test_lua", [
srcs = ["tests/bindings/lua/main.c"],
data = [
"tests/bindings/lua/test_upb.lua",
"third_party/lunit/console.lua", "third_party/lunit/console.lua",
"third_party/lunit/lunit.lua", "third_party/lunit/lunit.lua",
"upb/bindings/lua/upb.lua",
":descriptor_proto_lua",
":test_messages_proto3_proto_lua",
":test_messages_proto2_proto_lua",
":test_proto_lua",
"@com_google_protobuf//:conformance_proto",
"@com_google_protobuf//:descriptor_proto",
],
linkstatic = 1,
deps = [
":lupb",
"@lua//:liblua",
],
)
cc_binary(
name = "protoc-gen-lua",
srcs = ["upb/bindings/lua/upbc.cc"],
copts = select({
":windows": [],
"//conditions:default": CPPOPTS,
}),
visibility = ["//visibility:public"],
deps = [
"@com_google_absl//absl/strings",
"@com_google_protobuf//:protoc_lib",
], ],
visibility = ["//tests/bindings/lua:__pkg__"],
) )
lua_proto_library(
name = "test_proto_lua",
testonly = 1,
deps = [":test_proto"],
)
lua_proto_library(
name = "descriptor_proto_lua",
deps = ["@com_google_protobuf//:descriptor_proto"],
)
lua_proto_library(
name = "test_messages_proto3_proto_lua",
testonly = 1,
deps = ["@com_google_protobuf//:test_messages_proto3_proto"],
)
lua_proto_library(
name = "test_messages_proto2_proto_lua",
testonly = 1,
deps = ["@com_google_protobuf//:test_messages_proto2_proto"],
)
# Test the CMake build #########################################################
filegroup( filegroup(
name = "cmake_files", name = "cmake_files",
srcs = glob([ srcs = glob([
"upb/json/parser.c",
"CMakeLists.txt", "CMakeLists.txt",
"generated_for_cmake/**/*", "generated_for_cmake/**/*",
"google/**/*", "google/**/*",
@ -884,82 +361,7 @@ filegroup(
"upb/**/*", "upb/**/*",
"tests/**/*", "tests/**/*",
]), ]),
) visibility = ["//cmake:__pkg__"],
make_shell_script(
name = "gen_run_cmake_build",
out = "run_cmake_build.sh",
contents = "find . && mkdir build && cd build && cmake .. && make -j8 && make test",
)
sh_test(
name = "cmake_build",
srcs = ["run_cmake_build.sh"],
data = [":cmake_files"],
deps = ["@bazel_tools//tools/bash/runfiles"],
)
# Generated files ##############################################################
exports_files(["tools/staleness_test.py"])
py_library(
name = "staleness_test_lib",
testonly = 1,
srcs = ["tools/staleness_test_lib.py"],
)
py_binary(
name = "make_cmakelists",
srcs = ["tools/make_cmakelists.py"],
)
genrule(
name = "gen_cmakelists",
srcs = [
"BUILD",
"WORKSPACE",
":cmake_files",
],
outs = ["generated-in/CMakeLists.txt"],
cmd = "$(location :make_cmakelists) $@",
tools = [":make_cmakelists"],
)
genrule(
name = "generate_json_ragel",
srcs = ["upb/json/parser.rl"],
outs = ["upb/json/parser.c"],
cmd = "$(location @ragel//:ragelc) -C -o upb/json/parser.c $< && mv upb/json/parser.c $@",
tools = ["@ragel//:ragelc"],
)
genrule(
name = "copy_json_ragel",
srcs = ["upb/json/parser.c"],
outs = ["generated-in/generated_for_cmake/upb/json/parser.c"],
cmd = "cp $< $@",
)
genrule(
name = "copy_protos",
srcs = [":descriptor_upb_proto"],
outs = [
"generated-in/generated_for_cmake/google/protobuf/descriptor.upb.c",
"generated-in/generated_for_cmake/google/protobuf/descriptor.upb.h",
],
cmd = "cp $(SRCS) $(@D)/generated-in/generated_for_cmake/google/protobuf",
)
generated_file_staleness_test(
name = "test_generated_files",
outs = [
"CMakeLists.txt",
"generated_for_cmake/google/protobuf/descriptor.upb.c",
"generated_for_cmake/google/protobuf/descriptor.upb.h",
"generated_for_cmake/upb/json/parser.c",
],
generated_pattern = "generated-in/%s",
) )
# copybara:strip_end # copybara:strip_end

71
bazel/build_defs.bzl
Unescape View File

@ -2,6 +2,29 @@
load(":upb_proto_library.bzl", "GeneratedSrcsInfo") load(":upb_proto_library.bzl", "GeneratedSrcsInfo")
UPB_DEFAULT_CPPOPTS = select({
"//:windows": [],
"//conditions:default": [
# copybara:strip_for_google3_begin
"-Wextra",
# "-Wshorten-64-to-32", # not in GCC (and my Kokoro images doesn't have Clang)
"-Werror",
"-Wno-long-long",
# copybara:strip_end
],
})
UPB_DEFAULT_COPTS = select({
"//:windows": [],
"//conditions:default": [
# copybara:strip_for_google3_begin
"-pedantic",
"-Werror=pedantic",
"-Wstrict-prototypes",
# copybara:strip_end
],
})
def _librule(name): def _librule(name):
return name + "_lib" return name + "_lib"
@ -58,50 +81,6 @@ def make_shell_script(name, contents, out):
cmd = "(cat <<'HEREDOC'\n%s\nHEREDOC\n) > $@" % contents, cmd = "(cat <<'HEREDOC'\n%s\nHEREDOC\n) > $@" % contents,
) )
def generated_file_staleness_test(name, outs, generated_pattern):
"""Tests that checked-in file(s) match the contents of generated file(s).
The resulting test will verify that all output files exist and have the
correct contents. If the test fails, it can be invoked with --fix to
bring the checked-in files up to date.
Args:
name: Name of the rule.
outs: the checked-in files that are copied from generated files.
generated_pattern: the pattern for transforming each "out" file into a
generated file. For example, if generated_pattern="generated/%s" then
a file foo.txt will look for generated file generated/foo.txt.
"""
script_name = name + ".py"
script_src = "//:tools/staleness_test.py"
# Filter out non-existing rules so Blaze doesn't error out before we even
# run the test.
existing_outs = native.glob(include = outs)
# The file list contains a few extra bits of information at the end.
# These get unpacked by the Config class in staleness_test_lib.py.
file_list = outs + [generated_pattern, native.package_name() or ".", name]
native.genrule(
name = name + "_makescript",
outs = [script_name],
srcs = [script_src],
testonly = 1,
cmd = "cat $(location " + script_src + ") > $@; " +
"sed -i.bak -e 's|INSERT_FILE_LIST_HERE|" + "\\\n ".join(file_list) + "|' $@",
)
native.py_test(
name = name,
srcs = [script_name],
data = existing_outs + [generated_pattern % file for file in outs],
deps = [
"//:staleness_test_lib",
],
)
# upb_amalgamation() rule, with file_list aspect. # upb_amalgamation() rule, with file_list aspect.
SrcList = provider( SrcList = provider(
@ -156,7 +135,3 @@ upb_amalgamation = rule(
}, },
implementation = _upb_amalgamation, implementation = _upb_amalgamation,
) )
def licenses(*args):
# No-op (for Google-internal usage).
pass

10
bazel/lua.BUILD
Unescape View File

@ -4,7 +4,6 @@ package(
cc_library( cc_library(
name = "liblua_headers", name = "liblua_headers",
defines = ["LUA_USE_LINUX"],
hdrs = [ hdrs = [
"src/lauxlib.h", "src/lauxlib.h",
"src/lua.h", "src/lua.h",
@ -12,6 +11,7 @@ cc_library(
"src/luaconf.h", "src/luaconf.h",
"src/lualib.h", "src/lualib.h",
], ],
defines = ["LUA_USE_LINUX"],
includes = ["src"], includes = ["src"],
) )
@ -72,7 +72,6 @@ cc_library(
"src/lzio.c", "src/lzio.c",
"src/lzio.h", "src/lzio.h",
], ],
defines = ["LUA_USE_LINUX"],
hdrs = [ hdrs = [
"src/lauxlib.h", "src/lauxlib.h",
"src/lua.h", "src/lua.h",
@ -80,6 +79,7 @@ cc_library(
"src/luaconf.h", "src/luaconf.h",
"src/lualib.h", "src/lualib.h",
], ],
defines = ["LUA_USE_LINUX"],
includes = ["src"], includes = ["src"],
linkopts = [ linkopts = [
"-lm", "-lm",
@ -92,11 +92,11 @@ cc_binary(
srcs = [ srcs = [
"src/lua.c", "src/lua.c",
], ],
deps = [
":liblua",
],
linkopts = [ linkopts = [
"-lreadline", "-lreadline",
"-rdynamic", "-rdynamic",
], ],
deps = [
":liblua",
],
) )

6
bazel/ragel.BUILD
Unescape View File

@ -1,4 +1,3 @@
package( package(
default_visibility = ["//visibility:public"], default_visibility = ["//visibility:public"],
) )
@ -158,7 +157,10 @@ cc_binary(
"aapl/avlimelkey.h", "aapl/avlimelkey.h",
"aapl/avltree.h", "aapl/avltree.h",
], ],
includes = ["ragel", "aapl"], includes = [
"aapl",
"ragel",
],
) )
config_h_contents = """ config_h_contents = """

4
bazel/upb_proto_library.bzl
Unescape View File

@ -225,7 +225,7 @@ _upb_proto_library_aspect = aspect(
"_upbc": attr.label( "_upbc": attr.label(
executable = True, executable = True,
cfg = "host", cfg = "host",
default = "//:protoc-gen-upb", default = "//upbc:protoc-gen-upb",
), ),
"_protoc": attr.label( "_protoc": attr.label(
executable = True, executable = True,
@ -270,7 +270,7 @@ _upb_proto_reflection_library_aspect = aspect(
"_upbc": attr.label( "_upbc": attr.label(
executable = True, executable = True,
cfg = "host", cfg = "host",
default = "//:protoc-gen-upb", default = "//upbc:protoc-gen-upb",
), ),
"_protoc": attr.label( "_protoc": attr.label(
executable = True, executable = True,

53
benchmarks/BUILD
Unescape View File

@ -0,0 +1,53 @@
load(
"//bazel:upb_proto_library.bzl",
"upb_proto_library",
"upb_proto_reflection_library",
)
licenses(["notice"])
proto_library(
name = "benchmark_descriptor_proto",
srcs = ["descriptor.proto"],
)
upb_proto_library(
name = "benchmark_descriptor_upb_proto",
deps = [":benchmark_descriptor_proto"],
)
upb_proto_reflection_library(
name = "benchmark_descriptor_upb_proto_reflection",
deps = [":benchmark_descriptor_proto"],
)
cc_proto_library(
name = "benchmark_descriptor_cc_proto",
deps = [":benchmark_descriptor_proto"],
)
proto_library(
name = "benchmark_descriptor_sv_proto",
srcs = ["descriptor_sv.proto"],
)
cc_proto_library(
name = "benchmark_descriptor_sv_cc_proto",
deps = [":benchmark_descriptor_sv_proto"],
)
cc_binary(
name = "benchmark",
testonly = 1,
srcs = ["benchmark.cc"],
deps = [
":benchmark_descriptor_cc_proto",
":benchmark_descriptor_sv_cc_proto",
":benchmark_descriptor_upb_proto",
":benchmark_descriptor_upb_proto_reflection",
"//:descriptor_upb_proto",
"//:reflection",
"@com_github_google_benchmark//:benchmark_main",
"@com_google_protobuf//:protobuf",
],
)

10
tests/benchmark.cc → benchmarks/benchmark.cc
Unescape View File

@ -3,10 +3,10 @@
#include <string.h> #include <string.h>
// For benchmarks of parsing speed. // For benchmarks of parsing speed.
#include "tests/descriptor.pb.h" #include "benchmarks/descriptor.pb.h"
#include "tests/descriptor.upb.h" #include "benchmarks/descriptor.upb.h"
#include "tests/descriptor.upbdefs.h" #include "benchmarks/descriptor.upbdefs.h"
#include "tests/descriptor_sv.pb.h" #include "benchmarks/descriptor_sv.pb.h"
// For for benchmarks of building descriptors. // For for benchmarks of building descriptors.
#include "google/protobuf/descriptor.upb.h" #include "google/protobuf/descriptor.upb.h"
@ -14,7 +14,7 @@
#include "upb/def.hpp" #include "upb/def.hpp"
upb_strview descriptor = tests_descriptor_proto_upbdefinit.descriptor; upb_strview descriptor = benchmarks_descriptor_proto_upbdefinit.descriptor;
namespace protobuf = ::google::protobuf; namespace protobuf = ::google::protobuf;
/* A buffer big enough to parse descriptor.proto without going to heap. */ /* A buffer big enough to parse descriptor.proto without going to heap. */

0
benchmark.py → benchmarks/compare.py
Unescape View File

0
tests/descriptor.proto → benchmarks/descriptor.proto
Unescape View File

0
tests/descriptor_sv.proto → benchmarks/descriptor_sv.proto
Unescape View File

89
cmake/BUILD
Unescape View File

@ -0,0 +1,89 @@
load(
":build_defs.bzl",
"generated_file_staleness_test",
)
load(
"//bazel:build_defs.bzl",
"make_shell_script",
)
licenses(["notice"])
exports_files(["staleness_test.py"])
py_library(
name = "staleness_test_lib",
testonly = 1,
srcs = ["staleness_test_lib.py"],
)
py_binary(
name = "make_cmakelists",
srcs = ["make_cmakelists.py"],
)
genrule(
name = "gen_cmakelists",
srcs = [
"//:BUILD",
"//:WORKSPACE",
"//:cmake_files",
":cmake_files",
],
outs = ["generated-in/CMakeLists.txt"],
cmd = "$(location :make_cmakelists) $@",
tools = [":make_cmakelists"],
)
genrule(
name = "copy_json_ragel",
srcs = ["upb/json/parser.c"],
outs = ["generated-in/upb/json/parser.c"],
cmd = "cp $< $@",
)
genrule(
name = "copy_protos",
srcs = ["//:descriptor_upb_proto"],
outs = [
"generated-in/google/protobuf/descriptor.upb.c",
"generated-in/google/protobuf/descriptor.upb.h",
],
cmd = "cp $(SRCS) $(@D)/generated-in/google/protobuf",
)
generated_file_staleness_test(
name = "test_generated_files",
outs = [
"CMakeLists.txt",
"google/protobuf/descriptor.upb.c",
"google/protobuf/descriptor.upb.h",
"upb/json/parser.c",
],
generated_pattern = "generated-in/%s",
)
# Test the CMake build #########################################################
filegroup(
name = "cmake_files",
srcs = glob([
"**/*",
]),
)
make_shell_script(
name = "gen_run_cmake_build",
out = "run_cmake_build.sh",
contents = "find . && mkdir build && cd build && cmake ../cmake && make -j8 && make test",
)
sh_test(
name = "cmake_build",
srcs = ["run_cmake_build.sh"],
data = [
":cmake_files",
"//:cmake_files",
],
deps = ["@bazel_tools//tools/bash/runfiles"],
)

106
CMakeLists.txt → cmake/CMakeLists.txt
Unescape View File

@ -48,8 +48,8 @@ if(UPB_ENABLE_UBSAN)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address")
endif() endif()
include_directories(.) include_directories(..)
include_directories(generated_for_cmake) include_directories(../cmake)
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
if(APPLE) if(APPLE)
@ -61,20 +61,20 @@ endif()
enable_testing() enable_testing()
add_library(port add_library(port
upb/port.c) ../upb/port.c)
add_library(upb add_library(upb
upb/decode.c ../upb/decode.c
upb/encode.c ../upb/encode.c
upb/msg.c ../upb/msg.c
upb/msg.h ../upb/msg.h
upb/table.c ../upb/table.c
upb/table.int.h ../upb/table.int.h
upb/upb.c ../upb/upb.c
upb/upb.int.h ../upb/upb.int.h
upb/decode.h ../upb/decode.h
upb/encode.h ../upb/encode.h
upb/upb.h ../upb/upb.h
upb/upb.hpp) ../upb/upb.hpp)
target_link_libraries(upb target_link_libraries(upb
port) port)
add_library(generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE) add_library(generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE)
@ -82,28 +82,28 @@ target_link_libraries(generated_code_support__only_for_generated_code_do_not_use
table table
upb) upb)
add_library(reflection add_library(reflection
upb/def.c ../upb/def.c
upb/msg.h ../upb/msg.h
upb/reflection.c ../upb/reflection.c
upb/def.h ../upb/def.h
upb/def.hpp ../upb/def.hpp
upb/reflection.h) ../upb/reflection.h)
target_link_libraries(reflection target_link_libraries(reflection
descriptor_upb_proto descriptor_upb_proto
port port
table table
upb) upb)
add_library(textformat add_library(textformat
upb/text_encode.c ../upb/text_encode.c
upb/text_encode.h) ../upb/text_encode.h)
target_link_libraries(textformat target_link_libraries(textformat
port port
reflection) reflection)
add_library(json add_library(json
upb/json_decode.c ../upb/json_decode.c
upb/json_encode.c ../upb/json_encode.c
upb/json_decode.h ../upb/json_decode.h
upb/json_encode.h) ../upb/json_encode.h)
target_link_libraries(json target_link_libraries(json
port port
reflection reflection
@ -113,27 +113,27 @@ target_link_libraries(table INTERFACE
port port
upb) upb)
add_library(handlers add_library(handlers
upb/handlers.c ../upb/handlers.c
upb/handlers-inl.h ../upb/handlers-inl.h
upb/sink.c ../upb/sink.c
upb/handlers.h ../upb/handlers.h
upb/sink.h) ../upb/sink.h)
target_link_libraries(handlers target_link_libraries(handlers
port port
reflection reflection
table table
upb) upb)
add_library(upb_pb add_library(upb_pb
upb/pb/compile_decoder.c ../upb/pb/compile_decoder.c
upb/pb/decoder.c ../upb/pb/decoder.c
upb/pb/decoder.int.h ../upb/pb/decoder.int.h
upb/pb/encoder.c ../upb/pb/encoder.c
upb/pb/textprinter.c ../upb/pb/textprinter.c
upb/pb/varint.c ../upb/pb/varint.c
upb/pb/varint.int.h ../upb/pb/varint.int.h
upb/pb/decoder.h ../upb/pb/decoder.h
upb/pb/encoder.h ../upb/pb/encoder.h
upb/pb/textprinter.h) ../upb/pb/textprinter.h)
target_link_libraries(upb_pb target_link_libraries(upb_pb
descriptor_upb_proto descriptor_upb_proto
handlers handlers
@ -142,26 +142,12 @@ target_link_libraries(upb_pb
table table
upb) upb)
add_library(upb_json add_library(upb_json
generated_for_cmake/upb/json/parser.c ../cmake/upb/json/parser.c
upb/json/printer.c ../upb/json/printer.c
upb/json/parser.h ../upb/json/parser.h
upb/json/printer.h) ../upb/json/printer.h)
target_link_libraries(upb_json target_link_libraries(upb_json
upb upb
upb_pb) upb_pb)
add_library(upb_cc_bindings INTERFACE)
target_link_libraries(upb_cc_bindings INTERFACE
descriptor_upb_proto
handlers
port
upb)
add_library(upb_test
tests/testmain.cc
tests/test_util.h
tests/upb_test.h)
target_link_libraries(upb_test
handlers
port
upb)

23
cmake/README.md
Unescape View File

@ -0,0 +1,23 @@
# upb CMake build (EXPERIMENTAL)
upb's CMake support is experimental. The core library builds successfully
under CMake, and this is verified by the Bazel tests in this directory.
However there is no support for building the upb compiler or for generating
.upb.c/upb.h files. This means upb's CMake support is incomplete at best,
unless your application is intended to be purely reflective.
If you find this CMake setup useful in its current state, please consider
filing an issue so we know. If you have suggestions for how it could be
more useful (and particularly if you can contribute some code for it)
please feel free to file an issue for that too. Do keep in mind that upb
does not currently provide any ABI stability, so we want to avoid providing
a shared library.
The CMakeLists.txt is generated from the Bazel BUILD files using the Python
scripts in this directory. We want to avoid having two separate sources of
truth that both need to be updated when a file is added or removed.
This directory also contains some generated files that would be created
on the fly during a Bazel build. These are automaticaly kept in sync by
the Bazel test `//cmake:test_generated_files`.

44
cmake/build_defs.bzl
Unescape View File

@ -0,0 +1,44 @@
def generated_file_staleness_test(name, outs, generated_pattern):
"""Tests that checked-in file(s) match the contents of generated file(s).
The resulting test will verify that all output files exist and have the
correct contents. If the test fails, it can be invoked with --fix to
bring the checked-in files up to date.
Args:
name: Name of the rule.
outs: the checked-in files that are copied from generated files.
generated_pattern: the pattern for transforming each "out" file into a
generated file. For example, if generated_pattern="generated/%s" then
a file foo.txt will look for generated file generated/foo.txt.
"""
script_name = name + ".py"
script_src = ":staleness_test.py"
# Filter out non-existing rules so Blaze doesn't error out before we even
# run the test.
existing_outs = native.glob(include = outs)
# The file list contains a few extra bits of information at the end.
# These get unpacked by the Config class in staleness_test_lib.py.
file_list = outs + [generated_pattern, native.package_name() or ".", name]
native.genrule(
name = name + "_makescript",
outs = [script_name],
srcs = [script_src],
testonly = 1,
cmd = "cat $(location " + script_src + ") > $@; " +
"sed -i.bak -e 's|INSERT_FILE_LIST_HERE|" + "\\\n ".join(file_list) + "|' $@",
)
native.py_test(
name = name,
srcs = [script_name],
data = existing_outs + [generated_pattern % file for file in outs],
deps = [
":staleness_test_lib",
],
)

0
generated_for_cmake/google/protobuf/descriptor.upb.c → cmake/google/protobuf/descriptor.upb.c
Unescape View File

0
generated_for_cmake/google/protobuf/descriptor.upb.h → cmake/google/protobuf/descriptor.upb.h
Unescape View File

11
tools/make_cmakelists.py → cmake/make_cmakelists.py
Unescape View File

@ -46,9 +46,9 @@ class BuildFileFunctions(object):
found_files = [] found_files = []
for file in files: for file in files:
if os.path.isfile(file): if os.path.isfile(file):
found_files.append(file) found_files.append("../" + file)
elif os.path.isfile("generated_for_cmake/" + file): elif os.path.isfile("cmake/" + file):
found_files.append("generated_for_cmake/" + file) found_files.append("../cmake/" + file)
else: else:
print("Warning: no such file: " + file) print("Warning: no such file: " + file)
@ -242,8 +242,8 @@ class Converter(object):
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address")
endif() endif()
include_directories(.) include_directories(..)
include_directories(generated_for_cmake) include_directories(../cmake)
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
if(APPLE) if(APPLE)
@ -263,6 +263,7 @@ converter = Converter()
def GetDict(obj): def GetDict(obj):
ret = {} ret = {}
ret["UPB_DEFAULT_COPTS"] = [] # HACK
for k in dir(obj): for k in dir(obj):
if not k.startswith("_"): if not k.startswith("_"):
ret[k] = getattr(obj, k); ret[k] = getattr(obj, k);

2
tools/staleness_test.py → cmake/staleness_test.py
Unescape View File

@ -6,7 +6,7 @@ with the actual list of files before we actually run the script.
from __future__ import absolute_import from __future__ import absolute_import
from tools import staleness_test_lib from cmake import staleness_test_lib
import unittest import unittest
import sys import sys

13
tools/staleness_test_lib.py → cmake/staleness_test_lib.py
Unescape View File

@ -7,6 +7,7 @@ generated_file_staleness_test() rules.
from __future__ import absolute_import from __future__ import absolute_import
from __future__ import print_function from __future__ import print_function
import sys
import os import os
from shutil import copyfile from shutil import copyfile
@ -47,13 +48,13 @@ def _GetFilePairs(config):
ret = [] ret = []
has_bazel_genfiles = os.path.exists("bazel-genfiles") has_bazel_genfiles = os.path.exists("bazel-bin")
for filename in config.file_list: for filename in config.file_list:
target = os.path.join(config.package_name, filename) target = os.path.join(config.package_name, filename)
generated = os.path.join(config.package_name, config.pattern % filename) generated = os.path.join(config.package_name, config.pattern % filename)
if has_bazel_genfiles: if has_bazel_genfiles:
generated = os.path.join("bazel-genfiles", generated) generated = os.path.join("bazel-bin", generated)
# Generated files should always exist. Blaze should guarantee this before # Generated files should always exist. Blaze should guarantee this before
# we are run. # we are run.
@ -61,6 +62,7 @@ def _GetFilePairs(config):
print("Generated file '%s' does not exist." % generated) print("Generated file '%s' does not exist." % generated)
print("Please run this command to generate it:") print("Please run this command to generate it:")
print(" bazel build %s:%s" % (config.package_name, config.target_name)) print(" bazel build %s:%s" % (config.package_name, config.target_name))
sys.exit(1)
ret.append(_FilePair(target, generated)) ret.append(_FilePair(target, generated))
return ret return ret
@ -87,10 +89,9 @@ def _GetMissingAndStaleFiles(file_pairs):
missing_files.append(pair) missing_files.append(pair)
continue continue
generated = open(pair.generated).read() with open(pair.generated) as g, open(pair.target) as t:
target = open(pair.target).read() if g.read() != t.read():
if generated != target: stale_files.append(pair)
stale_files.append(pair)
return missing_files, stale_files return missing_files, stale_files

0
generated_for_cmake/upb/json/parser.c → cmake/upb/json/parser.c
Unescape View File

2
examples/bazel/BUILD
Unescape View File

@ -1,6 +1,8 @@
load("@rules_proto//proto:defs.bzl", "proto_library") load("@rules_proto//proto:defs.bzl", "proto_library")
load("@upb//bazel:upb_proto_library.bzl", "upb_proto_library") load("@upb//bazel:upb_proto_library.bzl", "upb_proto_library")
licenses(["notice"])
proto_library( proto_library(
name = "foo_proto", name = "foo_proto",
srcs = ["foo.proto"], srcs = ["foo.proto"],

2
examples/bazel/test_binary.c
Unescape View File

@ -1,7 +1,7 @@
#include <time.h> #include <time.h>
#include "foo.upb.h" #include "examples/bazel/foo.upb.h"
int main() { int main() {
upb_arena *arena = upb_arena_new(); upb_arena *arena = upb_arena_new();

6
kokoro/ubuntu/build.sh
Unescape View File

@ -19,12 +19,12 @@ which bazel
bazel version bazel version
cd $(dirname $0)/../.. cd $(dirname $0)/../..
bazel test --test_output=errors :all bazel test --test_output=errors ...
if [[ $(uname) = "Linux" ]]; then if [[ $(uname) = "Linux" ]]; then
# Verify the ASAN build. Have to exclude test_conformance_upb as protobuf # Verify the ASAN build. Have to exclude test_conformance_upb as protobuf
# currently leaks memory in the conformance test runner. # currently leaks memory in the conformance test runner.
bazel test --copt=-fsanitize=address --linkopt=-fsanitize=address --test_output=errors :all bazel test --copt=-fsanitize=address --linkopt=-fsanitize=address --test_output=errors ...
# Verify the UBSan build. Have to exclude Lua as the version we are using # Verify the UBSan build. Have to exclude Lua as the version we are using
# fails some UBSan tests. # fails some UBSan tests.
@ -35,5 +35,5 @@ if [[ $(uname) = "Linux" ]]; then
fi fi
if which valgrind; then if which valgrind; then
bazel test --run_under='valgrind --leak-check=full --error-exitcode=1' :all -- -:test_conformance_upb -:cmake_build bazel test --run_under='valgrind --leak-check=full --error-exitcode=1' ... -- -tests:test_conformance_upb -cmake:cmake_build
fi fi

282
tests/BUILD
Unescape View File

@ -0,0 +1,282 @@
load(
"//bazel:build_defs.bzl",
"UPB_DEFAULT_COPTS",
"UPB_DEFAULT_CPPOPTS",
"make_shell_script",
)
load(
"//bazel:upb_proto_library.bzl",
"upb_proto_library",
"upb_proto_reflection_library",
)
licenses(["notice"])
config_setting(
name = "fuzz",
values = {"define": "fuzz=true"},
)
cc_library(
name = "upb_test",
testonly = 1,
srcs = [
"testmain.cc",
],
hdrs = [
"test_util.h",
"upb_test.h",
],
copts = UPB_DEFAULT_CPPOPTS,
deps = [
"//:handlers",
"//:port",
"//:upb",
],
)
proto_library(
name = "test_proto",
testonly = 1,
srcs = ["test.proto"],
)
upb_proto_library(
name = "test_upb_proto",
testonly = 1,
deps = [":test_proto"],
)
cc_test(
name = "test_generated_code",
srcs = ["test_generated_code.c"],
deps = [
":empty_upbdefs_proto",
":test_messages_proto3_proto_upb",
":test_upb_proto",
":upb_test",
],
)
proto_library(
name = "empty_proto",
srcs = ["empty.proto"],
)
upb_proto_reflection_library(
name = "empty_upbdefs_proto",
testonly = 1,
deps = [":empty_proto"],
)
upb_proto_library(
name = "test_messages_proto3_proto_upb",
testonly = 1,
deps = ["@com_google_protobuf//:test_messages_proto3_proto"],
)
proto_library(
name = "test_decoder_proto",
srcs = [
"pb/test_decoder.proto",
],
)
upb_proto_reflection_library(
name = "test_decoder_upb_proto",
deps = [":test_decoder_proto"],
)
cc_test(
name = "test_decoder",
srcs = ["pb/test_decoder.cc"],
copts = UPB_DEFAULT_CPPOPTS,
deps = [
":test_decoder_upb_proto",
":upb_test",
"//:handlers",
"//:port",
"//:upb",
"//:upb_pb",
],
)
proto_library(
name = "test_cpp_proto",
srcs = [
"test_cpp.proto",
],
)
upb_proto_reflection_library(
name = "test_cpp_upb_proto",
deps = ["test_cpp_proto"],
)
cc_test(
name = "test_cpp",
srcs = ["test_cpp.cc"],
copts = UPB_DEFAULT_CPPOPTS,
deps = [
":test_cpp_upb_proto",
":upb_test",
"//:handlers",
"//:port",
"//:reflection",
"//:upb",
"//:upb_pb",
],
)
cc_test(
name = "test_table",
srcs = ["test_table.cc"],
copts = UPB_DEFAULT_CPPOPTS,
deps = [
":upb_test",
"//:port",
"//:table",
"//:upb",
],
)
# OSS-Fuzz test
cc_binary(
name = "file_descriptor_parsenew_fuzzer",
testonly = 1,
srcs = ["file_descriptor_parsenew_fuzzer.cc"],
copts = UPB_DEFAULT_CPPOPTS + select({
"//conditions:default": [],
":fuzz": ["-fsanitize=fuzzer,address"],
}),
defines = select({
"//conditions:default": [],
":fuzz": ["HAVE_FUZZER"],
}),
deps = [
"//:descriptor_upb_proto",
"//:upb",
],
)
# copybara:strip_for_google3_begin
cc_test(
name = "test_encoder",
srcs = ["pb/test_encoder.cc"],
copts = UPB_DEFAULT_CPPOPTS,
deps = [
":upb_test",
"//:descriptor_upb_proto",
"//:descriptor_upb_proto_reflection",
"//:upb",
"//:upb_pb",
],
)
proto_library(
name = "test_json_enum_from_separate",
srcs = ["json/enum_from_separate_file.proto"],
deps = [":test_json_proto"],
)
proto_library(
name = "test_json_proto",
srcs = ["json/test.proto"],
)
upb_proto_reflection_library(
name = "test_json_upb_proto_reflection",
deps = ["test_json_proto"],
)
upb_proto_library(
name = "test_json_enum_from_separate_upb_proto",
deps = [":test_json_enum_from_separate"],
)
upb_proto_library(
name = "test_json_upb_proto",
deps = [":test_json_proto"],
)
cc_test(
name = "test_json",
srcs = [
"json/test_json.cc",
],
copts = UPB_DEFAULT_CPPOPTS,
deps = [
":test_json_upb_proto",
":test_json_upb_proto_reflection",
":upb_test",
"//:upb_json",
],
)
# copybara:strip_end
upb_proto_library(
name = "conformance_proto_upb",
testonly = 1,
deps = ["@com_google_protobuf//:conformance_proto"],
)
upb_proto_reflection_library(
name = "conformance_proto_upbdefs",
testonly = 1,
deps = ["@com_google_protobuf//:conformance_proto"],
)
upb_proto_reflection_library(
name = "test_messages_proto2_upbdefs",
testonly = 1,
deps = ["@com_google_protobuf//:test_messages_proto2_proto"],
)
upb_proto_reflection_library(
name = "test_messages_proto3_upbdefs",
testonly = 1,
deps = ["@com_google_protobuf//:test_messages_proto3_proto"],
)
cc_binary(
name = "conformance_upb",
testonly = 1,
srcs = [
"conformance_upb.c",
],
copts = UPB_DEFAULT_COPTS,
data = [
"conformance_upb_failures.txt",
],
deps = [
":conformance_proto_upb",
":conformance_proto_upbdefs",
":test_messages_proto2_upbdefs",
":test_messages_proto3_upbdefs",
"//:json",
"//:port",
"//:reflection",
"//:textformat",
"//:upb",
],
)
make_shell_script(
name = "gen_test_conformance_upb",
out = "test_conformance_upb.sh",
contents = "external/com_google_protobuf/conformance_test_runner " +
" --enforce_recommended " +
" --failure_list ./tests/conformance_upb_failures.txt" +
" ./tests/conformance_upb",
)
sh_test(
name = "test_conformance_upb",
srcs = ["test_conformance_upb.sh"],
data = [
"conformance_upb_failures.txt",
":conformance_upb",
"@com_google_protobuf//:conformance_test_runner",
],
deps = ["@bazel_tools//tools/bash/runfiles"],
)

57
tests/bindings/lua/BUILD
Unescape View File

@ -0,0 +1,57 @@
load(
"//upb/bindings/lua:lua_proto_library.bzl",
"lua_proto_library",
)
licenses(["notice"])
cc_test(
name = "test_lua",
srcs = ["main.c"],
data = [
"test_upb.lua",
":descriptor_proto_lua",
":test_messages_proto2_proto_lua",
":test_messages_proto3_proto_lua",
":test_proto_lua",
"//:third_party/lunit/console.lua",
"//:third_party/lunit/lunit.lua",
"//upb/bindings/lua:upb.lua",
"@com_google_protobuf//:conformance_proto",
"@com_google_protobuf//:descriptor_proto",
],
linkstatic = 1,
deps = [
"//upb/bindings/lua:lupb",
"@lua//:liblua",
],
)
proto_library(
name = "test_proto",
testonly = 1,
srcs = ["test.proto"],
)
lua_proto_library(
name = "test_proto_lua",
testonly = 1,
deps = [":test_proto"],
)
lua_proto_library(
name = "descriptor_proto_lua",
deps = ["@com_google_protobuf//:descriptor_proto"],
)
lua_proto_library(
name = "test_messages_proto3_proto_lua",
testonly = 1,
deps = ["@com_google_protobuf//:test_messages_proto3_proto"],
)
lua_proto_library(
name = "test_messages_proto2_proto_lua",
testonly = 1,
deps = ["@com_google_protobuf//:test_messages_proto2_proto"],
)

8
tests/bindings/lua/test.proto
Unescape View File

@ -0,0 +1,8 @@
syntax = "proto2";
package upb_test;
message MapTest {
map<string, double> map_string_double = 1;
}

2
tests/bindings/lua/test_upb.lua
Unescape View File

@ -1,7 +1,7 @@
local upb = require "lupb" local upb = require "lupb"
local lunit = require "lunit" local lunit = require "lunit"
local upb_test = require "tests.test_pb" local upb_test = require "tests.bindings.lua.test_pb"
local test_messages_proto3 = require "google.protobuf.test_messages_proto3_pb" local test_messages_proto3 = require "google.protobuf.test_messages_proto3_pb"
local test_messages_proto2 = require "google.protobuf.test_messages_proto2_pb" local test_messages_proto2 = require "google.protobuf.test_messages_proto2_pb"
local descriptor = require "google.protobuf.descriptor_pb" local descriptor = require "google.protobuf.descriptor_pb"

24
tests/pb/test_decoder.cc
Unescape View File

@ -43,7 +43,6 @@
#else // AMALGAMATED #else // AMALGAMATED
#include "upb/handlers.h" #include "upb/handlers.h"
#include "upb/pb/decoder.h" #include "upb/pb/decoder.h"
#include "upb/pb/varint.int.h"
#include "upb/upb.h" #include "upb/upb.h"
#endif // !AMALGAMATED #endif // !AMALGAMATED
@ -147,6 +146,29 @@ void PrintBinary(const string& str) {
} }
} }
#define UPB_PB_VARINT_MAX_LEN 10
static size_t upb_vencode64(uint64_t val, char *buf) {
size_t i;
if (val == 0) { buf[0] = 0; return 1; }
i = 0;
while (val) {
uint8_t byte = val & 0x7fU;
val >>= 7;
if (val) byte |= 0x80U;
buf[i++] = byte;
}
return i;
}
static uint32_t upb_zzenc_32(int32_t n) {
return ((uint32_t)n << 1) ^ (n >> 31);
}
static uint64_t upb_zzenc_64(int64_t n) {
return ((uint64_t)n << 1) ^ (n >> 63);
}
/* Routines for building arbitrary protos *************************************/ /* Routines for building arbitrary protos *************************************/
const string empty; const string empty;

57
tests/pb/test_encoder.cc
Unescape View File

@ -5,12 +5,65 @@
#include "google/protobuf/descriptor.upbdefs.h" #include "google/protobuf/descriptor.upbdefs.h"
#include "tests/test_util.h" #include "tests/test_util.h"
#include "tests/upb_test.h" #include "tests/upb_test.h"
#include "upb/bindings/stdc++/string.h"
#include "upb/pb/decoder.h" #include "upb/pb/decoder.h"
#include "upb/pb/encoder.h" #include "upb/pb/encoder.h"
#include "upb/port_def.inc" #include "upb/port_def.inc"
#include "upb/upb.hpp" #include "upb/upb.hpp"
template <class T>
class FillStringHandler {
public:
static void SetHandler(upb_byteshandler* handler) {
upb_byteshandler_setstartstr(handler, &FillStringHandler::StartString,
NULL);
upb_byteshandler_setstring(handler, &FillStringHandler::StringBuf, NULL);
}
private:
// TODO(haberman): add UpbBind/UpbMakeHandler support to BytesHandler so these
// can be prettier callbacks.
static void* StartString(void *c, const void *hd, size_t size) {
UPB_UNUSED(hd);
UPB_UNUSED(size);
T* str = static_cast<T*>(c);
str->clear();
return c;
}
static size_t StringBuf(void* c, const void* hd, const char* buf, size_t n,
const upb_bufhandle* h) {
UPB_UNUSED(hd);
UPB_UNUSED(h);
T* str = static_cast<T*>(c);
try {
str->append(buf, n);
return n;
} catch (const std::exception&) {
return 0;
}
}
};
class StringSink {
public:
template <class T>
explicit StringSink(T* target) {
// TODO(haberman): we need to avoid rebuilding a new handler every time,
// but with class globals disallowed for google3 C++ this is tricky.
upb_byteshandler_init(&handler_);
FillStringHandler<T>::SetHandler(&handler_);
input_.Reset(&handler_, target);
}
upb::BytesSink input() { return input_; }
private:
upb_byteshandler handler_;
upb::BytesSink input_;
};
void test_pb_roundtrip() { void test_pb_roundtrip() {
std::string input( std::string input(
google_protobuf_descriptor_proto_upbdefinit.descriptor.data, google_protobuf_descriptor_proto_upbdefinit.descriptor.data,
@ -29,7 +82,7 @@ void test_pb_roundtrip() {
const upb::pb::DecoderMethodPtr method = decoder_cache.Get(md); const upb::pb::DecoderMethodPtr method = decoder_cache.Get(md);
std::string output; std::string output;
upb::StringSink string_sink(&output); StringSink string_sink(&output);
upb::pb::EncoderPtr encoder = upb::pb::EncoderPtr encoder =
upb::pb::EncoderPtr::Create(&arena, encoder_handlers, string_sink.input()); upb::pb::EncoderPtr::Create(&arena, encoder_handlers, string_sink.input());
upb::pb::DecoderPtr decoder = upb::pb::DecoderPtr decoder =

126
tests/pb/test_varint.c
Unescape View File

@ -1,126 +0,0 @@
#include <stdio.h>
#include "upb/pb/varint.int.h"
#include "tests/upb_test.h"
#include "upb/port_def.inc"
/* Test that we can round-trip from int->varint->int. */
static void test_varint_for_num(upb_decoderet (*decoder)(const char*),
uint64_t num) {
char buf[16];
size_t bytes;
upb_decoderet r;
memset(buf, 0xff, sizeof(buf));
bytes = upb_vencode64(num, buf);
if (num <= UINT32_MAX) {
uint64_t encoded = upb_vencode32((uint32_t)num);
char buf2[16];
upb_decoderet r;
memset(buf2, 0, sizeof(buf2));
memcpy(&buf2, &encoded, 8);
#ifdef UPB_BIG_ENDIAN
char swap[8];
swap[0] = buf2[7];
swap[1] = buf2[6];
swap[2] = buf2[5];
swap[3] = buf2[4];
swap[4] = buf2[3];
swap[5] = buf2[2];
swap[6] = buf2[1];
swap[7] = buf2[0];
buf2[0] = swap[0];
buf2[1] = swap[1];
buf2[2] = swap[2];
buf2[3] = swap[3];
buf2[4] = swap[4];
buf2[5] = swap[5];
buf2[6] = swap[6];
buf2[7] = swap[7];
#endif
r = decoder(buf2);
ASSERT(r.val == num);
ASSERT(r.p == buf2 + upb_value_size(encoded));
ASSERT(upb_zzenc_32(upb_zzdec_32((uint32_t)num)) == num);
}
r = decoder(buf);
ASSERT(r.val == num);
ASSERT(r.p == buf + bytes);
ASSERT(upb_zzenc_64(upb_zzdec_64(num)) == num);
}
/* Making up for the lack of 64-bit constants in C89. */
static uint64_t make_u64(uint32_t high, uint32_t low) {
uint64_t ret = high;
ret = (ret << 32) | low;
return ret;
}
static void test_varint_decoder(upb_decoderet (*decoder)(const char*)) {
#define TEST(bytes, expected_val) {\
size_t n = sizeof(bytes) - 1; /* for NULL */ \
char buf[UPB_PB_VARINT_MAX_LEN]; \
upb_decoderet r; \
memset(buf, 0xff, sizeof(buf)); \
memcpy(buf, bytes, n); \
r = decoder(buf); \
ASSERT(r.val == expected_val); \
ASSERT(r.p == buf + n); \
}
uint64_t num;
char twelvebyte[16] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 1};
const char *twelvebyte_buf = twelvebyte;
/* A varint that terminates before hitting the end of the provided buffer,
* but in too many bytes (11 instead of 10). */
upb_decoderet r = decoder(twelvebyte_buf);
ASSERT(r.p == NULL);
TEST("\x00", 0UL);
TEST("\x01", 1UL);
TEST("\x81\x14", 0xa01UL);
TEST("\x81\x03", 0x181UL);
TEST("\x81\x83\x07", 0x1c181UL);
TEST("\x81\x83\x87\x0f", 0x1e1c181UL);
TEST("\x81\x83\x87\x8f\x1f", make_u64(0x1, 0xf1e1c181UL));
TEST("\x81\x83\x87\x8f\x9f\x3f", make_u64(0x1f9, 0xf1e1c181UL));
TEST("\x81\x83\x87\x8f\x9f\xbf\x7f", make_u64(0x1fdf9, 0xf1e1c181UL));
TEST("\x81\x83\x87\x8f\x9f\xbf\xff\x01", make_u64(0x3fdf9, 0xf1e1c181UL));
TEST("\x81\x83\x87\x8f\x9f\xbf\xff\x81\x03",
make_u64(0x303fdf9, 0xf1e1c181UL));
TEST("\x81\x83\x87\x8f\x9f\xbf\xff\x81\x83\x07",
make_u64(0x8303fdf9, 0xf1e1c181UL));
#undef TEST
for (num = 5; num * 1.5 < UINT64_MAX; num *= 1.5) {
test_varint_for_num(decoder, num);
}
test_varint_for_num(decoder, 0);
}
#define TEST_VARINT_DECODER(decoder) \
/* Create non-inline versions for convenient inspection of assembly language \
* output. */ \
upb_decoderet _upb_vdecode_ ## decoder(const char *p) { \
return upb_vdecode_ ## decoder(p); \
} \
void test_ ## decoder(void) { \
test_varint_decoder(&_upb_vdecode_ ## decoder); \
} \
TEST_VARINT_DECODER(check2_branch32)
TEST_VARINT_DECODER(check2_branch64)
int run_tests(int argc, char *argv[]) {
UPB_UNUSED(argc);
UPB_UNUSED(argv);
test_check2_branch32();
test_check2_branch64();
return 0;
}

40
upb/bindings/lua/BUILD
Unescape View File

@ -0,0 +1,40 @@
load(
"//bazel:build_defs.bzl",
"UPB_DEFAULT_COPTS",
"UPB_DEFAULT_CPPOPTS",
)
licenses(["notice"])
cc_library(
name = "lupb",
srcs = [
"def.c",
"msg.c",
"upb.c",
],
hdrs = [
"upb.h",
],
copts = UPB_DEFAULT_COPTS,
visibility = ["//visibility:public"],
deps = [
"//:reflection",
"//:textformat",
"//:upb",
"@lua//:liblua",
],
)
cc_binary(
name = "protoc-gen-lua",
srcs = ["upbc.cc"],
copts = UPB_DEFAULT_CPPOPTS,
visibility = ["//visibility:public"],
deps = [
"@com_google_absl//absl/strings",
"@com_google_protobuf//:protoc_lib",
],
)
exports_files(["upb.lua"])

12
upb/bindings/lua/def.c
Unescape View File

@ -56,8 +56,8 @@ static void lupb_wrapper_pushwrapper(lua_State *L, int narg, const void *def,
* wrapper for field |f| of this msgdef. * wrapper for field |f| of this msgdef.
*/ */
void lupb_msgdef_pushsubmsgdef(lua_State *L, const upb_fielddef *f) { void lupb_msgdef_pushsubmsgdef(lua_State *L, const upb_fielddef *f) {
assert(luaL_testudata(L, -1, LUPB_MSGDEF));
const upb_msgdef *m = upb_fielddef_msgsubdef(f); const upb_msgdef *m = upb_fielddef_msgsubdef(f);
assert(m);
assert(upb_fielddef_containingtype(f) == lupb_msgdef_check(L, -1)); assert(upb_fielddef_containingtype(f) == lupb_msgdef_check(L, -1));
lupb_wrapper_pushwrapper(L, -1, m, LUPB_MSGDEF); lupb_wrapper_pushwrapper(L, -1, m, LUPB_MSGDEF);
lua_replace(L, -2); /* Replace msgdef with submsgdef. */ lua_replace(L, -2); /* Replace msgdef with submsgdef. */
@ -251,8 +251,8 @@ static int lupb_oneofiter_next(lua_State *L) {
} }
static int lupb_oneofdef_fields(lua_State *L) { static int lupb_oneofdef_fields(lua_State *L) {
lupb_oneofdef_check(L, 1);
int *index = lua_newuserdata(L, sizeof(int)); int *index = lua_newuserdata(L, sizeof(int));
lupb_oneofdef_check(L, 1);
*index = 0; *index = 0;
/* Closure upvalues are: oneofdef, index. */ /* Closure upvalues are: oneofdef, index. */
@ -408,8 +408,8 @@ static int lupb_msgfielditer_next(lua_State *L) {
} }
static int lupb_msgdef_fields(lua_State *L) { static int lupb_msgdef_fields(lua_State *L) {
lupb_msgdef_check(L, 1);
int *index = lua_newuserdata(L, sizeof(int)); int *index = lua_newuserdata(L, sizeof(int));
lupb_msgdef_check(L, 1);
*index = 0; *index = 0;
/* Closure upvalues are: msgdef, index. */ /* Closure upvalues are: msgdef, index. */
@ -441,8 +441,8 @@ static int lupb_msgoneofiter_next(lua_State *L) {
} }
static int lupb_msgdef_oneofs(lua_State *L) { static int lupb_msgdef_oneofs(lua_State *L) {
lupb_msgdef_check(L, 1);
int *index = lua_newuserdata(L, sizeof(int)); int *index = lua_newuserdata(L, sizeof(int));
lupb_msgdef_check(L, 1);
*index = 0; *index = 0;
/* Closure upvalues are: msgdef, index. */ /* Closure upvalues are: msgdef, index. */
@ -750,7 +750,7 @@ static int lupb_symtab_addfile(lua_State *L) {
size_t len; size_t len;
upb_symtab *s = lupb_symtab_check(L, 1); upb_symtab *s = lupb_symtab_check(L, 1);
const char *str = luaL_checklstring(L, 2, &len); const char *str = luaL_checklstring(L, 2, &len);
upb_arena *arena = lupb_arena_pushnew(L);; upb_arena *arena = lupb_arena_pushnew(L);
const google_protobuf_FileDescriptorProto *file; const google_protobuf_FileDescriptorProto *file;
const upb_filedef *file_def; const upb_filedef *file_def;
upb_status status; upb_status status;
@ -776,7 +776,7 @@ static int lupb_symtab_addset(lua_State *L) {
google_protobuf_FileDescriptorSet *set; google_protobuf_FileDescriptorSet *set;
upb_symtab *s = lupb_symtab_check(L, 1); upb_symtab *s = lupb_symtab_check(L, 1);
const char *str = luaL_checklstring(L, 2, &len); const char *str = luaL_checklstring(L, 2, &len);
upb_arena *arena = lupb_arena_pushnew(L);; upb_arena *arena = lupb_arena_pushnew(L);
upb_status status; upb_status status;
upb_status_clear(&status); upb_status_clear(&status);

2
upb/bindings/lua/lua_proto_library.bzl
Unescape View File

@ -82,7 +82,7 @@ _lua_proto_library_aspect = aspect(
"_upbc": attr.label( "_upbc": attr.label(
executable = True, executable = True,
cfg = "host", cfg = "host",
default = "//:protoc-gen-lua", default = "//upb/bindings/lua:protoc-gen-lua",
), ),
"_protoc": attr.label( "_protoc": attr.label(
executable = True, executable = True,

2
upb/bindings/lua/msg.c
Unescape View File

@ -564,8 +564,8 @@ static int lupb_mapiter_next(lua_State *L) {
* pairs(map) * pairs(map)
*/ */
static int lupb_map_pairs(lua_State *L) { static int lupb_map_pairs(lua_State *L) {
lupb_map_check(L, 1);
size_t *iter = lua_newuserdata(L, sizeof(*iter)); size_t *iter = lua_newuserdata(L, sizeof(*iter));
lupb_map_check(L, 1);
*iter = UPB_MAP_BEGIN; *iter = UPB_MAP_BEGIN;
lua_pushvalue(L, 1); lua_pushvalue(L, 1);

69
upb/bindings/stdc++/string.h
Unescape View File

@ -1,69 +0,0 @@
#ifndef UPB_STDCPP_H_
#define UPB_STDCPP_H_
#include "upb/sink.h"
#include "upb/port_def.inc"
namespace upb {
template <class T>
class FillStringHandler {
public:
static void SetHandler(upb_byteshandler* handler) {
upb_byteshandler_setstartstr(handler, &FillStringHandler::StartString,
NULL);
upb_byteshandler_setstring(handler, &FillStringHandler::StringBuf, NULL);
}
private:
// TODO(haberman): add UpbBind/UpbMakeHandler support to BytesHandler so these
// can be prettier callbacks.
static void* StartString(void *c, const void *hd, size_t size) {
UPB_UNUSED(hd);
UPB_UNUSED(size);
T* str = static_cast<T*>(c);
str->clear();
return c;
}
static size_t StringBuf(void* c, const void* hd, const char* buf, size_t n,
const upb_bufhandle* h) {
UPB_UNUSED(hd);
UPB_UNUSED(h);
T* str = static_cast<T*>(c);
try {
str->append(buf, n);
return n;
} catch (const std::exception&) {
return 0;
}
}
};
class StringSink {
public:
template <class T>
explicit StringSink(T* target) {
// TODO(haberman): we need to avoid rebuilding a new handler every time,
// but with class globals disallowed for google3 C++ this is tricky.
upb_byteshandler_init(&handler_);
FillStringHandler<T>::SetHandler(&handler_);
input_.Reset(&handler_, target);
}
BytesSink input() { return input_; }
private:
upb_byteshandler handler_;
BytesSink input_;
};
} // namespace upb
#include "upb/port_undef.inc"
#endif // UPB_STDCPP_H_

3
upb/json_decode.c
Unescape View File

@ -1096,6 +1096,7 @@ static void jsondec_duration(jsondec *d, upb_msg *msg, const upb_msgdef *m) {
upb_strview str = jsondec_string(d); upb_strview str = jsondec_string(d);
const char *ptr = str.data; const char *ptr = str.data;
const char *end = ptr + str.size; const char *end = ptr + str.size;
const int64_t max = (uint64_t)3652500 * 86400;
/* "3.000000001s", "3s", etc. */ /* "3.000000001s", "3s", etc. */
ptr = jsondec_buftoint64(d, ptr, end, &seconds.int64_val); ptr = jsondec_buftoint64(d, ptr, end, &seconds.int64_val);
@ -1105,7 +1106,7 @@ static void jsondec_duration(jsondec *d, upb_msg *msg, const upb_msgdef *m) {
jsondec_err(d, "Malformed duration"); jsondec_err(d, "Malformed duration");
} }
if (seconds.int64_val < -315576000000LL || seconds.int64_val > 315576000000LL) { if (seconds.int64_val < -max || seconds.int64_val > max) {
jsondec_err(d, "Duration out of range"); jsondec_err(d, "Duration out of range");
} }

8
upb/upb.h
Unescape View File

@ -301,7 +301,7 @@ UPB_INLINE uint32_t _upb_be_swap32(uint32_t val) {
return val; return val;
} else { } else {
return ((val & 0xff) << 24) | ((val & 0xff00) << 8) | return ((val & 0xff) << 24) | ((val & 0xff00) << 8) |
((val & 0xff0000ULL) >> 8) | ((val & 0xff000000ULL) >> 24); ((val & 0xff0000) >> 8) | ((val & 0xff000000) >> 24);
} }
} }
@ -309,11 +309,7 @@ UPB_INLINE uint64_t _upb_be_swap64(uint64_t val) {
if (_upb_isle()) { if (_upb_isle()) {
return val; return val;
} else { } else {
return ((val & 0xff) << 56) | ((val & 0xff00) << 40) | return ((uint64_t)_upb_be_swap32(val) << 32) | _upb_be_swap32(val >> 32);
((val & 0xff0000) << 24) | ((val & 0xff000000) << 8) |
((val & 0xff00000000ULL) >> 8) | ((val & 0xff0000000000ULL) >> 24) |
((val & 0xff000000000000ULL) >> 40) |
((val & 0xff00000000000000ULL) >> 56);
} }
} }

35
upbc/BUILD
Unescape View File

@ -0,0 +1,35 @@
load(
"//bazel:build_defs.bzl",
"UPB_DEFAULT_CPPOPTS",
)
licenses(["notice"])
cc_library(
name = "upbc_generator",
srcs = [
"generator.cc",
"message_layout.cc",
"message_layout.h",
],
hdrs = ["generator.h"],
copts = UPB_DEFAULT_CPPOPTS,
deps = [
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/strings",
"@com_google_protobuf//:protobuf",
"@com_google_protobuf//:protoc_lib",
],
)
cc_binary(
name = "protoc-gen-upb",
srcs = ["main.cc"],
copts = UPB_DEFAULT_CPPOPTS,
visibility = ["//visibility:public"],
deps = [
":upbc_generator",
"@com_google_protobuf//:protoc_lib",
],
)
Write Preview
Loading…
Cancel
Save