|
|
|
|
# Copyright (c) 2009-2021, Google LLC
|
|
|
|
|
# All rights reserved.
|
|
|
|
|
#
|
|
|
|
|
# Use of this source code is governed by a BSD-style
|
|
|
|
|
# license that can be found in the LICENSE file or at
|
|
|
|
|
# https://developers.google.com/open-source/licenses/bsd
|
|
|
|
|
|
|
|
|
|
load(
|
|
|
|
|
"//upb/bazel:build_defs.bzl",
|
|
|
|
|
"UPB_DEFAULT_CPPOPTS",
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
package(default_applicable_licenses = ["//:license"])
|
|
|
|
|
|
|
|
|
|
licenses(["notice"])
|
|
|
|
|
|
|
|
|
|
cc_binary(
|
|
|
|
|
name = "protoc-gen-upb-protos",
|
|
|
|
|
srcs = [
|
|
|
|
|
"protoc-gen-upb-protos.cc",
|
|
|
|
|
],
|
|
|
|
|
copts = UPB_DEFAULT_CPPOPTS,
|
|
|
|
|
visibility = ["//visibility:public"],
|
|
|
|
|
deps = [
|
|
|
|
|
":gen_utils",
|
|
|
|
|
":generator",
|
|
|
|
|
":names",
|
|
|
|
|
":output",
|
|
|
|
|
"//:protobuf",
|
|
|
|
|
"//src/google/protobuf",
|
|
|
|
|
"//src/google/protobuf/compiler:code_generator",
|
|
|
|
|
"//src/google/protobuf/compiler:plugin",
|
|
|
|
|
"//upb_generator:file_layout",
|
|
|
|
|
],
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
cc_library(
|
|
|
|
|
name = "generator",
|
|
|
|
|
srcs = [
|
|
|
|
|
"gen_accessors.cc",
|
|
|
|
|
"gen_enums.cc",
|
|
|
|
|
"gen_extensions.cc",
|
|
|
|
|
"gen_messages.cc",
|
|
|
|
|
"gen_repeated_fields.cc",
|
|
|
|
|
],
|
|
|
|
|
hdrs = [
|
|
|
|
|
"gen_accessors.h",
|
|
|
|
|
"gen_enums.h",
|
|
|
|
|
"gen_extensions.h",
|
|
|
|
|
"gen_messages.h",
|
|
|
|
|
"gen_repeated_fields.h",
|
|
|
|
|
],
|
|
|
|
|
visibility = ["//visibility:private"],
|
|
|
|
|
deps = [
|
|
|
|
|
":gen_utils",
|
|
|
|
|
":names",
|
|
|
|
|
":output",
|
|
|
|
|
"//:protobuf",
|
|
|
|
|
"//src/google/protobuf",
|
|
|
|
|
"//upb_generator:common",
|
|
|
|
|
"//upb_generator:file_layout",
|
|
|
|
|
"//upb_generator:keywords",
|
Created proper `names.h` headers for all upb generators.
The goal of the `names.h` convention is to have a single canonical place where a code generator can define the set of symbols it exports to other code generators, and a canonical place where the name mangling logic is implemented.
Each upb code generator now has its own `names.h` file defining the symbols that it owns & exports:
* `third_party/upb/upb_generator/c/names.h` (for `foo.upb.h` files)
* `third_party/upb/upb_generator/minitable/names.h` (for `foo.upb_minitable.h` files)
* `third_party/upb/upb_generator/reflection/names.h` (for `foo.upbdefs.h` files)
This is a significant improvement over the previous situation where the name mangling functions were co-mingled in `common.h`/`mangle.h`, or sprinkled throughout the generators, with no clear structure for which code generator owns which symbols.
With this structure in place, the visibility lists for the various `names.h` files provide a clear dependency graph for how different generators depend on each other. In general, we want to keep dependencies on the "C" code generator to a minimum, since it is the largest and most complicated of upb's generated APIs, and is also the most prone to symbol name clashes.
Note that upb's `names.h` headers are somewhat unusual, in that we do not want them to depend on C++'s reflection or upb's reflection. Most `names.h` headers in protobuf would use types like `proto2::Descriptor`, but we don't want upb to depend on C++ reflection, especially during its bootstrapping process. We also don't want to force users to build upb defs just to use these name mangling functions. So we use only plain string types like `absl::string_view` and `std::string`.
PiperOrigin-RevId: 672397247
3 months ago
|
|
|
"//upb_generator/c:names",
|
|
|
|
|
"//upb_generator/minitable:names",
|
|
|
|
|
"@com_google_absl//absl/container:flat_hash_set",
|
|
|
|
|
"@com_google_absl//absl/strings",
|
|
|
|
|
],
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
cc_library(
|
|
|
|
|
name = "output",
|
|
|
|
|
srcs = ["output.cc"],
|
|
|
|
|
hdrs = ["output.h"],
|
|
|
|
|
visibility = ["//visibility:private"],
|
|
|
|
|
deps = [
|
|
|
|
|
"//:protobuf",
|
Breaking change: make protobuf comply with the C++ layering check
This check enforces that each C++ build target has the correct dependencies for
all headers that it includes. We have many targets that were not correct with
respect to this check, so I fixed them up.
I also cleaned up the C++ targets related to the well-known types. I created a
cc_proto_library() target for each one and removed the :wkt_cc_protos target,
since this was necessary to satisfy the layering check. I deleted the
//src/google/protobuf:protobuf_nowkt target and deprecated :protobuf_nowkt,
because the distinction between the :protobuf and :protobuf_nowkt targets was
not really correct. Neither one exposed the headers for the well-known types in
a way that was valid with respect to the layering check, and the idea of
bundling all the well-known types together is not idiomatic in Bazel anyway.
This is a breaking change, because the //:protobuf target no longer bundles the
well-known types. From now on they should be accessed through the new
//:*_cc_proto aliases in our top-level package.
I renamed the :port_def target to :port, which simplifies things a bit by
matching our internal name.
The original motivation for this change was that to move utf8_range onto our CI
infrastructure, we needed to make its dependency rules_fuzzing compatible with
Bazel 6. The rules_fuzzing project builds with the layering check, and I found
that the process of upgrading it to Bazel 6 made it take a dependency on
protobuf, which caused it to break due to layering violations. I was able to
work around this, but it would still be nice to comply with the layering check
so that we don't have to worry about this kind of thing in the future.
PiperOrigin-RevId: 595516736
11 months ago
|
|
|
"//src/google/protobuf/io",
|
Created proper `names.h` headers for all upb generators.
The goal of the `names.h` convention is to have a single canonical place where a code generator can define the set of symbols it exports to other code generators, and a canonical place where the name mangling logic is implemented.
Each upb code generator now has its own `names.h` file defining the symbols that it owns & exports:
* `third_party/upb/upb_generator/c/names.h` (for `foo.upb.h` files)
* `third_party/upb/upb_generator/minitable/names.h` (for `foo.upb_minitable.h` files)
* `third_party/upb/upb_generator/reflection/names.h` (for `foo.upbdefs.h` files)
This is a significant improvement over the previous situation where the name mangling functions were co-mingled in `common.h`/`mangle.h`, or sprinkled throughout the generators, with no clear structure for which code generator owns which symbols.
With this structure in place, the visibility lists for the various `names.h` files provide a clear dependency graph for how different generators depend on each other. In general, we want to keep dependencies on the "C" code generator to a minimum, since it is the largest and most complicated of upb's generated APIs, and is also the most prone to symbol name clashes.
Note that upb's `names.h` headers are somewhat unusual, in that we do not want them to depend on C++'s reflection or upb's reflection. Most `names.h` headers in protobuf would use types like `proto2::Descriptor`, but we don't want upb to depend on C++ reflection, especially during its bootstrapping process. We also don't want to force users to build upb defs just to use these name mangling functions. So we use only plain string types like `absl::string_view` and `std::string`.
PiperOrigin-RevId: 672397247
3 months ago
|
|
|
"//upb_generator/c:names",
|
|
|
|
|
"//upb_generator/minitable:names",
|
|
|
|
|
"@com_google_absl//absl/log:absl_log",
|
|
|
|
|
"@com_google_absl//absl/strings",
|
|
|
|
|
],
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
cc_library(
|
|
|
|
|
name = "gen_utils",
|
|
|
|
|
srcs = ["gen_utils.cc"],
|
|
|
|
|
hdrs = ["gen_utils.h"],
|
|
|
|
|
visibility = ["//visibility:public"],
|
|
|
|
|
deps = [
|
|
|
|
|
"//:protobuf",
|
|
|
|
|
"//src/google/protobuf",
|
|
|
|
|
"//src/google/protobuf/compiler:code_generator",
|
|
|
|
|
"@com_google_absl//absl/strings",
|
|
|
|
|
],
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
cc_library(
|
|
|
|
|
name = "names",
|
|
|
|
|
srcs = ["names.cc"],
|
|
|
|
|
hdrs = ["names.h"],
|
|
|
|
|
visibility = ["//visibility:private"],
|
|
|
|
|
deps = [
|
|
|
|
|
":output",
|
Breaking change: make protobuf comply with the C++ layering check
This check enforces that each C++ build target has the correct dependencies for
all headers that it includes. We have many targets that were not correct with
respect to this check, so I fixed them up.
I also cleaned up the C++ targets related to the well-known types. I created a
cc_proto_library() target for each one and removed the :wkt_cc_protos target,
since this was necessary to satisfy the layering check. I deleted the
//src/google/protobuf:protobuf_nowkt target and deprecated :protobuf_nowkt,
because the distinction between the :protobuf and :protobuf_nowkt targets was
not really correct. Neither one exposed the headers for the well-known types in
a way that was valid with respect to the layering check, and the idea of
bundling all the well-known types together is not idiomatic in Bazel anyway.
This is a breaking change, because the //:protobuf target no longer bundles the
well-known types. From now on they should be accessed through the new
//:*_cc_proto aliases in our top-level package.
I renamed the :port_def target to :port, which simplifies things a bit by
matching our internal name.
The original motivation for this change was that to move utf8_range onto our CI
infrastructure, we needed to make its dependency rules_fuzzing compatible with
Bazel 6. The rules_fuzzing project builds with the layering check, and I found
that the process of upgrading it to Bazel 6 made it take a dependency on
protobuf, which caused it to break due to layering violations. I was able to
work around this, but it would still be nice to comply with the layering check
so that we don't have to worry about this kind of thing in the future.
PiperOrigin-RevId: 595516736
11 months ago
|
|
|
"//src/google/protobuf",
|
Created proper `names.h` headers for all upb generators.
The goal of the `names.h` convention is to have a single canonical place where a code generator can define the set of symbols it exports to other code generators, and a canonical place where the name mangling logic is implemented.
Each upb code generator now has its own `names.h` file defining the symbols that it owns & exports:
* `third_party/upb/upb_generator/c/names.h` (for `foo.upb.h` files)
* `third_party/upb/upb_generator/minitable/names.h` (for `foo.upb_minitable.h` files)
* `third_party/upb/upb_generator/reflection/names.h` (for `foo.upbdefs.h` files)
This is a significant improvement over the previous situation where the name mangling functions were co-mingled in `common.h`/`mangle.h`, or sprinkled throughout the generators, with no clear structure for which code generator owns which symbols.
With this structure in place, the visibility lists for the various `names.h` files provide a clear dependency graph for how different generators depend on each other. In general, we want to keep dependencies on the "C" code generator to a minimum, since it is the largest and most complicated of upb's generated APIs, and is also the most prone to symbol name clashes.
Note that upb's `names.h` headers are somewhat unusual, in that we do not want them to depend on C++'s reflection or upb's reflection. Most `names.h` headers in protobuf would use types like `proto2::Descriptor`, but we don't want upb to depend on C++ reflection, especially during its bootstrapping process. We also don't want to force users to build upb defs just to use these name mangling functions. So we use only plain string types like `absl::string_view` and `std::string`.
PiperOrigin-RevId: 672397247
3 months ago
|
|
|
"//src/google/protobuf/compiler:code_generator",
|
|
|
|
|
"//upb_generator:keywords",
|
|
|
|
|
"@com_google_absl//absl/strings:string_view",
|
|
|
|
|
],
|
|
|
|
|
)
|
