|
|
|
// Protocol Buffers - Google's data interchange format
|
|
|
|
// Copyright 2023 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
|
|
|
|
|
|
|
|
#include "google/protobuf/compiler/hpb/gen_accessors.h"
|
|
|
|
|
|
|
|
#include <string>
|
|
|
|
|
|
|
|
#include "absl/container/flat_hash_set.h"
|
|
|
|
#include "absl/strings/ascii.h"
|
|
|
|
#include "absl/strings/match.h"
|
|
|
|
#include "absl/strings/str_cat.h"
|
|
|
|
#include "absl/strings/string_view.h"
|
|
|
|
#include "google/protobuf/compiler/hpb/context.h"
|
|
|
|
#include "google/protobuf/compiler/hpb/gen_repeated_fields.h"
|
|
|
|
#include "google/protobuf/compiler/hpb/gen_utils.h"
|
|
|
|
#include "google/protobuf/compiler/hpb/keywords.h"
|
|
|
|
#include "google/protobuf/compiler/hpb/names.h"
|
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
|
|
|
#include "google/protobuf/descriptor.h"
|
|
|
|
#include "upb_generator/c/names.h"
|
|
|
|
#include "upb_generator/minitable/names.h"
|
|
|
|
|
|
|
|
namespace google::protobuf::hpb_generator {
|
|
|
|
|
|
|
|
namespace protobuf = ::proto2;
|
|
|
|
|
|
|
|
using NameToFieldDescriptorMap =
|
|
|
|
absl::flat_hash_map<absl::string_view, const protobuf::FieldDescriptor*>;
|
|
|
|
|
|
|
|
void WriteFieldAccessorHazzer(const protobuf::Descriptor* desc,
|
|
|
|
const protobuf::FieldDescriptor* field,
|
|
|
|
absl::string_view resolved_field_name,
|
|
|
|
absl::string_view resolved_upbc_name,
|
|
|
|
Context& ctx);
|
|
|
|
void WriteFieldAccessorClear(const protobuf::Descriptor* desc,
|
|
|
|
const protobuf::FieldDescriptor* field,
|
|
|
|
absl::string_view resolved_field_name,
|
|
|
|
absl::string_view resolved_upbc_name,
|
|
|
|
Context& ctx);
|
|
|
|
void WriteMapFieldAccessors(const protobuf::Descriptor* desc,
|
|
|
|
const protobuf::FieldDescriptor* field,
|
|
|
|
absl::string_view resolved_field_name,
|
|
|
|
absl::string_view resolved_upbc_name, Context& ctx);
|
|
|
|
|
|
|
|
void WriteMapAccessorDefinitions(const protobuf::Descriptor* message,
|
|
|
|
const protobuf::FieldDescriptor* field,
|
|
|
|
absl::string_view resolved_field_name,
|
|
|
|
absl::string_view class_name, Context& ctx);
|
|
|
|
|
|
|
|
// Returns C++ class member name by resolving naming conflicts across
|
|
|
|
// proto field names (such as clear_ prefixes) and keyword collisions.
|
|
|
|
//
|
|
|
|
// The Upb C generator prefixes all accessors with package and class names
|
|
|
|
// avoiding collisions. Therefore we need to use raw field names when calling
|
|
|
|
// into C accessors but need to fully resolve conflicts for C++ class members.
|
|
|
|
std::string ResolveFieldName(const protobuf::FieldDescriptor* field,
|
|
|
|
const NameToFieldDescriptorMap& field_names);
|
|
|
|
|
|
|
|
upb::generator::NameMangler CreateNameMangler(
|
|
|
|
const protobuf::Descriptor* message) {
|
|
|
|
return upb::generator::NameMangler(upb::generator::GetCppFields(message));
|
|
|
|
}
|
|
|
|
|
|
|
|
NameToFieldDescriptorMap CreateFieldNameMap(
|
|
|
|
const protobuf::Descriptor* message) {
|
|
|
|
NameToFieldDescriptorMap field_names;
|
|
|
|
for (int i = 0; i < message->field_count(); i++) {
|
|
|
|
const protobuf::FieldDescriptor* field = message->field(i);
|
|
|
|
field_names.emplace(field->name(), field);
|
|
|
|
}
|
|
|
|
return field_names;
|
|
|
|
}
|
|
|
|
|
|
|
|
void WriteFieldAccessorsInHeader(const protobuf::Descriptor* desc,
|
|
|
|
Context& ctx) {
|
|
|
|
// Generate const methods.
|
|
|
|
auto field_names = CreateFieldNameMap(desc);
|
|
|
|
auto mangler = CreateNameMangler(desc);
|
|
|
|
|
|
|
|
auto indent = ctx.printer().WithIndent();
|
|
|
|
|
upb is self-hosting!
This CL changes the upb compiler to no longer depend on C++ protobuf libraries. upb now uses its own reflection libraries to implement its code generator.
# Key Benefits
1. upb can now use its own reflection libraries throughout the compiler. This makes upb more consistent and principled, and gives us more chances to dogfood our own C++ reflection API. This highlighted several parts of the C++ reflection API that were incomplete.
2. This CL removes code duplication that previously existed in the compiler. The upb reflection library has code to build MiniDescriptors and MiniTables out of descriptors, but prior to this CL the upb compiler could not use it. The upb compiler had a separate copy of this logic, and the compiler's copy of this logic was especially tricky and hard to maintain. This CL removes the separate copy of that logic.
3. This CL (mostly) removes upb's dependency on the C++ protobuf library. We still depend on `protoc` (the binary), but the runtime and compiler no longer link against C++'s libraries. This opens up the possibility of speeding up some builds significantly if we can use a prebuilt `protoc` binary.
# Bootstrap Stages
To bootstrap, we check in a copy of our generated code for `descriptor.proto` and `plugin.proto`. This allows the compiler to depend on the generated code for these two protos without creating a circular dependency. This code is checked in to the `stage0` directory.
The bootstrapping process is divided into a few stages. All `cc_library()`, `upb_proto_library()`, and `cc_binary()` targets that would otherwise be circular participate in this staging process. That currently includes:
* `//third_party/upb:descriptor_upb_proto`
* `//third_party/upb:plugin_upb_proto`
* `//third_party/upb:reflection`
* `//third_party/upb:reflection_internal`
* `//third_party/upbc:common`
* `//third_party/upbc:file_layout`
* `//third_party/upbc:plugin`
* `//third_party/upbc:protoc-gen-upb`
For each of these targets, we produce a rule for each stage (the logic for this is nicely encapsulated in Blaze/Bazel macros like `bootstrap_cc_library()` and `bootstrap_upb_proto_library()`, so the `BUILD` file remains readable). For example:
* `//third_party/upb:descriptor_upb_proto_stage0`
* `//third_party/upb:descriptor_upb_proto_stage1`
* `//third_party/upb:descriptor_upb_proto`
The stages are:
1. `stage0`: This uses the checked-in version of the generated code. The stage0 compiler is correct and outputs the same code as all other compilers, but it is unnecessarily slow because its protos were compiled in bootstrap mode. The stage0 compiler is used to generate protos for stage1.
2. `stage1`: The stage1 compiler is correct and fast, and therefore we use it in almost all cases (eg. `upb_proto_library()`). However its own protos were not generated using `upb_proto_library()`, so its `cc_library()` targets cannot be safely mixed with `upb_proto_library()`, as this would lead to duplicate symbols.
3. final (no stage): The final compiler is identical to the `stage1` compiler. The only difference is that its protos were built with `upb_proto_library()`. This doesn't matter very much for the compiler binary, but for the `cc_library()` targets like `//third_party/upb:reflection`, only the final targets can be safely linked in by other applications.
# "Bootstrap Mode" Protos
The checked-in generated code is generated in a special "bootstrap" mode that is a bit different than normal generated code. Bootstrap mode avoids depending on the internal representation of MiniTables or the messages, at the cost of slower runtime performance.
Bootstrap mode only interacts with MiniTables and messages using public APIs such as `upb_MiniTable_Build()`, `upb_Message_GetInt32()`, etc. This is very important as it allows us to change the internal representation without needing to regenerate our bootstrap protos. This will make it far easier to write CLs that change the internal representation, because it avoids the awkward dance of trying to regenerate the bootstrap protos when the compiler itself is broken due to bootstrap protos being out of date.
The bootstrap generated code does have two downsides:
1. The accessors are less efficient, because they look up MiniTable fields by number instead of hard-coding the MiniTableField into the generated code.
2. It requires runtime initialization of the MiniTables, which costs CPU cycles at startup, and also allocates memory which is never freed. Per google3 rules this is not really a leak, since this memory is still reachable via static variables, but it is undesirable in many contexts. We could fix this part by introducing the equivalent of `google::protobuf::ShutdownProtobufLibrary()`).
These downsides are fine for the bootstrapping process, but they are reason enough not to enable bootstrap mode in general for all protos.
# Bootstrapping Always Uses OSS Protos
To enable smooth syncing between Google3 and OSS, we always use an OSS version of the checked in generated code for `stage0`, even in google3.
This requires that the google3 code can be switched to reference the OSS proto names using a preprocessor define. We introduce the `UPB_DESC(xyz)` macro for this, which will expand into either `proto2_xyz` or `google_protobuf_xyz`. Any libraries used in `stage0` must use `UPB_DESC(xyz)` rather than refer to the symbol names directly.
PiperOrigin-RevId: 501458451
2 years ago
|
|
|
for (const auto* field : FieldNumberOrder(desc)) {
|
|
|
|
std::string resolved_field_name = ResolveFieldName(field, field_names);
|
|
|
|
std::string resolved_upbc_name = mangler.ResolveFieldName(field->name());
|
|
|
|
WriteFieldAccessorHazzer(desc, field, resolved_field_name,
|
|
|
|
resolved_upbc_name, ctx);
|
|
|
|
WriteFieldAccessorClear(desc, field, resolved_field_name,
|
|
|
|
resolved_upbc_name, ctx);
|
|
|
|
|
|
|
|
if (field->is_map()) {
|
|
|
|
WriteMapFieldAccessors(desc, field, resolved_field_name,
|
|
|
|
resolved_upbc_name, ctx);
|
|
|
|
} else if (desc->options().map_entry()) {
|
|
|
|
// TODO Implement map entry
|
|
|
|
} else if (field->is_repeated()) {
|
|
|
|
WriteRepeatedFieldsInMessageHeader(desc, field, resolved_field_name,
|
|
|
|
resolved_upbc_name, ctx);
|
|
|
|
} else {
|
|
|
|
// non-repeated.
|
|
|
|
if (field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_STRING) {
|
|
|
|
ctx.EmitLegacy(R"cc(
|
|
|
|
$0 $1() const;
|
|
|
|
void set_$1($0 value);
|
|
|
|
)cc",
|
|
|
|
CppConstType(field), resolved_field_name);
|
|
|
|
} else if (field->cpp_type() ==
|
|
|
|
protobuf::FieldDescriptor::CPPTYPE_MESSAGE) {
|
|
|
|
ctx.EmitLegacy(R"cc(
|
|
|
|
$1 $2() const;
|
|
|
|
$0 mutable_$2();
|
|
|
|
/**
|
|
|
|
* Re-points submessage to the given target.
|
|
|
|
*
|
|
|
|
* REQUIRES:
|
|
|
|
* - both messages must be in the same arena.
|
|
|
|
*/
|
|
|
|
void set_alias_$2($0 target);
|
|
|
|
)cc",
|
|
|
|
MessagePtrConstType(field, /* const */ false),
|
|
|
|
MessagePtrConstType(field, /* const */ true),
|
|
|
|
resolved_field_name);
|
|
|
|
} else {
|
|
|
|
ctx.EmitLegacy(
|
|
|
|
R"cc(
|
|
|
|
inline $0 $1() const { return $2_$3(msg_); }
|
|
|
|
inline void set_$1($0 value) { return $2_set_$3(msg_, value); }
|
|
|
|
)cc",
|
|
|
|
CppConstType(field), resolved_field_name,
|
|
|
|
upb::generator::CApiMessageType(desc->full_name()),
|
|
|
|
resolved_upbc_name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void WriteFieldAccessorHazzer(const protobuf::Descriptor* desc,
|
|
|
|
const protobuf::FieldDescriptor* field,
|
|
|
|
const absl::string_view resolved_field_name,
|
|
|
|
const absl::string_view resolved_upbc_name,
|
|
|
|
Context& ctx) {
|
|
|
|
// Generate hazzer (if any).
|
upb is self-hosting!
This CL changes the upb compiler to no longer depend on C++ protobuf libraries. upb now uses its own reflection libraries to implement its code generator.
# Key Benefits
1. upb can now use its own reflection libraries throughout the compiler. This makes upb more consistent and principled, and gives us more chances to dogfood our own C++ reflection API. This highlighted several parts of the C++ reflection API that were incomplete.
2. This CL removes code duplication that previously existed in the compiler. The upb reflection library has code to build MiniDescriptors and MiniTables out of descriptors, but prior to this CL the upb compiler could not use it. The upb compiler had a separate copy of this logic, and the compiler's copy of this logic was especially tricky and hard to maintain. This CL removes the separate copy of that logic.
3. This CL (mostly) removes upb's dependency on the C++ protobuf library. We still depend on `protoc` (the binary), but the runtime and compiler no longer link against C++'s libraries. This opens up the possibility of speeding up some builds significantly if we can use a prebuilt `protoc` binary.
# Bootstrap Stages
To bootstrap, we check in a copy of our generated code for `descriptor.proto` and `plugin.proto`. This allows the compiler to depend on the generated code for these two protos without creating a circular dependency. This code is checked in to the `stage0` directory.
The bootstrapping process is divided into a few stages. All `cc_library()`, `upb_proto_library()`, and `cc_binary()` targets that would otherwise be circular participate in this staging process. That currently includes:
* `//third_party/upb:descriptor_upb_proto`
* `//third_party/upb:plugin_upb_proto`
* `//third_party/upb:reflection`
* `//third_party/upb:reflection_internal`
* `//third_party/upbc:common`
* `//third_party/upbc:file_layout`
* `//third_party/upbc:plugin`
* `//third_party/upbc:protoc-gen-upb`
For each of these targets, we produce a rule for each stage (the logic for this is nicely encapsulated in Blaze/Bazel macros like `bootstrap_cc_library()` and `bootstrap_upb_proto_library()`, so the `BUILD` file remains readable). For example:
* `//third_party/upb:descriptor_upb_proto_stage0`
* `//third_party/upb:descriptor_upb_proto_stage1`
* `//third_party/upb:descriptor_upb_proto`
The stages are:
1. `stage0`: This uses the checked-in version of the generated code. The stage0 compiler is correct and outputs the same code as all other compilers, but it is unnecessarily slow because its protos were compiled in bootstrap mode. The stage0 compiler is used to generate protos for stage1.
2. `stage1`: The stage1 compiler is correct and fast, and therefore we use it in almost all cases (eg. `upb_proto_library()`). However its own protos were not generated using `upb_proto_library()`, so its `cc_library()` targets cannot be safely mixed with `upb_proto_library()`, as this would lead to duplicate symbols.
3. final (no stage): The final compiler is identical to the `stage1` compiler. The only difference is that its protos were built with `upb_proto_library()`. This doesn't matter very much for the compiler binary, but for the `cc_library()` targets like `//third_party/upb:reflection`, only the final targets can be safely linked in by other applications.
# "Bootstrap Mode" Protos
The checked-in generated code is generated in a special "bootstrap" mode that is a bit different than normal generated code. Bootstrap mode avoids depending on the internal representation of MiniTables or the messages, at the cost of slower runtime performance.
Bootstrap mode only interacts with MiniTables and messages using public APIs such as `upb_MiniTable_Build()`, `upb_Message_GetInt32()`, etc. This is very important as it allows us to change the internal representation without needing to regenerate our bootstrap protos. This will make it far easier to write CLs that change the internal representation, because it avoids the awkward dance of trying to regenerate the bootstrap protos when the compiler itself is broken due to bootstrap protos being out of date.
The bootstrap generated code does have two downsides:
1. The accessors are less efficient, because they look up MiniTable fields by number instead of hard-coding the MiniTableField into the generated code.
2. It requires runtime initialization of the MiniTables, which costs CPU cycles at startup, and also allocates memory which is never freed. Per google3 rules this is not really a leak, since this memory is still reachable via static variables, but it is undesirable in many contexts. We could fix this part by introducing the equivalent of `google::protobuf::ShutdownProtobufLibrary()`).
These downsides are fine for the bootstrapping process, but they are reason enough not to enable bootstrap mode in general for all protos.
# Bootstrapping Always Uses OSS Protos
To enable smooth syncing between Google3 and OSS, we always use an OSS version of the checked in generated code for `stage0`, even in google3.
This requires that the google3 code can be switched to reference the OSS proto names using a preprocessor define. We introduce the `UPB_DESC(xyz)` macro for this, which will expand into either `proto2_xyz` or `google_protobuf_xyz`. Any libraries used in `stage0` must use `UPB_DESC(xyz)` rather than refer to the symbol names directly.
PiperOrigin-RevId: 501458451
2 years ago
|
|
|
if (field->has_presence()) {
|
|
|
|
// Has presence.
|
|
|
|
ctx.EmitLegacy("inline bool has_$0() const { return $1_has_$2(msg_); }\n",
|
|
|
|
resolved_field_name,
|
|
|
|
upb::generator::CApiMessageType(desc->full_name()),
|
|
|
|
resolved_upbc_name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void WriteFieldAccessorClear(const protobuf::Descriptor* desc,
|
|
|
|
const protobuf::FieldDescriptor* field,
|
|
|
|
const absl::string_view resolved_field_name,
|
|
|
|
const absl::string_view resolved_upbc_name,
|
|
|
|
Context& ctx) {
|
upb is self-hosting!
This CL changes the upb compiler to no longer depend on C++ protobuf libraries. upb now uses its own reflection libraries to implement its code generator.
# Key Benefits
1. upb can now use its own reflection libraries throughout the compiler. This makes upb more consistent and principled, and gives us more chances to dogfood our own C++ reflection API. This highlighted several parts of the C++ reflection API that were incomplete.
2. This CL removes code duplication that previously existed in the compiler. The upb reflection library has code to build MiniDescriptors and MiniTables out of descriptors, but prior to this CL the upb compiler could not use it. The upb compiler had a separate copy of this logic, and the compiler's copy of this logic was especially tricky and hard to maintain. This CL removes the separate copy of that logic.
3. This CL (mostly) removes upb's dependency on the C++ protobuf library. We still depend on `protoc` (the binary), but the runtime and compiler no longer link against C++'s libraries. This opens up the possibility of speeding up some builds significantly if we can use a prebuilt `protoc` binary.
# Bootstrap Stages
To bootstrap, we check in a copy of our generated code for `descriptor.proto` and `plugin.proto`. This allows the compiler to depend on the generated code for these two protos without creating a circular dependency. This code is checked in to the `stage0` directory.
The bootstrapping process is divided into a few stages. All `cc_library()`, `upb_proto_library()`, and `cc_binary()` targets that would otherwise be circular participate in this staging process. That currently includes:
* `//third_party/upb:descriptor_upb_proto`
* `//third_party/upb:plugin_upb_proto`
* `//third_party/upb:reflection`
* `//third_party/upb:reflection_internal`
* `//third_party/upbc:common`
* `//third_party/upbc:file_layout`
* `//third_party/upbc:plugin`
* `//third_party/upbc:protoc-gen-upb`
For each of these targets, we produce a rule for each stage (the logic for this is nicely encapsulated in Blaze/Bazel macros like `bootstrap_cc_library()` and `bootstrap_upb_proto_library()`, so the `BUILD` file remains readable). For example:
* `//third_party/upb:descriptor_upb_proto_stage0`
* `//third_party/upb:descriptor_upb_proto_stage1`
* `//third_party/upb:descriptor_upb_proto`
The stages are:
1. `stage0`: This uses the checked-in version of the generated code. The stage0 compiler is correct and outputs the same code as all other compilers, but it is unnecessarily slow because its protos were compiled in bootstrap mode. The stage0 compiler is used to generate protos for stage1.
2. `stage1`: The stage1 compiler is correct and fast, and therefore we use it in almost all cases (eg. `upb_proto_library()`). However its own protos were not generated using `upb_proto_library()`, so its `cc_library()` targets cannot be safely mixed with `upb_proto_library()`, as this would lead to duplicate symbols.
3. final (no stage): The final compiler is identical to the `stage1` compiler. The only difference is that its protos were built with `upb_proto_library()`. This doesn't matter very much for the compiler binary, but for the `cc_library()` targets like `//third_party/upb:reflection`, only the final targets can be safely linked in by other applications.
# "Bootstrap Mode" Protos
The checked-in generated code is generated in a special "bootstrap" mode that is a bit different than normal generated code. Bootstrap mode avoids depending on the internal representation of MiniTables or the messages, at the cost of slower runtime performance.
Bootstrap mode only interacts with MiniTables and messages using public APIs such as `upb_MiniTable_Build()`, `upb_Message_GetInt32()`, etc. This is very important as it allows us to change the internal representation without needing to regenerate our bootstrap protos. This will make it far easier to write CLs that change the internal representation, because it avoids the awkward dance of trying to regenerate the bootstrap protos when the compiler itself is broken due to bootstrap protos being out of date.
The bootstrap generated code does have two downsides:
1. The accessors are less efficient, because they look up MiniTable fields by number instead of hard-coding the MiniTableField into the generated code.
2. It requires runtime initialization of the MiniTables, which costs CPU cycles at startup, and also allocates memory which is never freed. Per google3 rules this is not really a leak, since this memory is still reachable via static variables, but it is undesirable in many contexts. We could fix this part by introducing the equivalent of `google::protobuf::ShutdownProtobufLibrary()`).
These downsides are fine for the bootstrapping process, but they are reason enough not to enable bootstrap mode in general for all protos.
# Bootstrapping Always Uses OSS Protos
To enable smooth syncing between Google3 and OSS, we always use an OSS version of the checked in generated code for `stage0`, even in google3.
This requires that the google3 code can be switched to reference the OSS proto names using a preprocessor define. We introduce the `UPB_DESC(xyz)` macro for this, which will expand into either `proto2_xyz` or `google_protobuf_xyz`. Any libraries used in `stage0` must use `UPB_DESC(xyz)` rather than refer to the symbol names directly.
PiperOrigin-RevId: 501458451
2 years ago
|
|
|
if (field->has_presence()) {
|
|
|
|
ctx.EmitLegacy("void clear_$0() { $2_clear_$1(msg_); }\n",
|
|
|
|
resolved_field_name, resolved_upbc_name,
|
|
|
|
upb::generator::CApiMessageType(desc->full_name()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void WriteMapFieldAccessors(const protobuf::Descriptor* desc,
|
|
|
|
const protobuf::FieldDescriptor* field,
|
|
|
|
const absl::string_view resolved_field_name,
|
|
|
|
const absl::string_view resolved_upbc_name,
|
|
|
|
Context& ctx) {
|
|
|
|
const protobuf::Descriptor* entry = field->message_type();
|
|
|
|
const protobuf::FieldDescriptor* key = entry->FindFieldByNumber(1);
|
|
|
|
const protobuf::FieldDescriptor* val = entry->FindFieldByNumber(2);
|
|
|
|
ctx.EmitLegacy(
|
|
|
|
R"cc(
|
|
|
|
inline size_t $0_size() const { return $1_$3_size(msg_); }
|
|
|
|
inline void clear_$0() { $1_clear_$3(msg_); }
|
|
|
|
void delete_$0($2 key);
|
|
|
|
)cc",
|
|
|
|
resolved_field_name, upb::generator::CApiMessageType(desc->full_name()),
|
|
|
|
CppConstType(key), resolved_upbc_name);
|
|
|
|
|
|
|
|
if (val->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE) {
|
|
|
|
ctx.Emit({{"field_name", resolved_field_name},
|
|
|
|
{"const_key", CppConstType(key)},
|
|
|
|
{"const_val", CppConstType(val)},
|
|
|
|
{"ConstPtr", MessagePtrConstType(val, true)},
|
|
|
|
{"MutPtr", MessagePtrConstType(val, false)}},
|
|
|
|
R"cc(
|
|
|
|
bool set_$field_name$($const_key$ key, $ConstPtr$ value);
|
|
|
|
bool set_$field_name$($const_key$ key, $MutPtr$ value);
|
|
|
|
bool set_alias_$field_name$($const_key$ key, $ConstPtr$ value);
|
|
|
|
bool set_alias_$field_name$($const_key$ key, $MutPtr$ value);
|
|
|
|
absl::StatusOr<$ConstPtr$> get_$field_name$($const_key$ key);
|
|
|
|
absl::StatusOr<$MutPtr$> get_mutable_$field_name$($const_key$ key);
|
|
|
|
)cc");
|
|
|
|
} else {
|
|
|
|
ctx.EmitLegacy(
|
|
|
|
R"cc(
|
|
|
|
bool set_$0($1 key, $2 value);
|
|
|
|
absl::StatusOr<$2> get_$0($1 key);
|
|
|
|
)cc",
|
|
|
|
resolved_field_name, CppConstType(key), CppConstType(val));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void WriteAccessorsInSource(const protobuf::Descriptor* desc, Context& ctx) {
|
|
|
|
std::string class_name = ClassName(desc);
|
|
|
|
absl::StrAppend(&class_name, "Access");
|
|
|
|
ctx.Emit("namespace internal {\n");
|
|
|
|
const char arena_expression[] = "arena_";
|
|
|
|
auto field_names = CreateFieldNameMap(desc);
|
|
|
|
auto mangler = CreateNameMangler(desc);
|
|
|
|
|
|
|
|
// Generate const methods.
|
|
|
|
auto indent = ctx.printer().WithIndent();
|
upb is self-hosting!
This CL changes the upb compiler to no longer depend on C++ protobuf libraries. upb now uses its own reflection libraries to implement its code generator.
# Key Benefits
1. upb can now use its own reflection libraries throughout the compiler. This makes upb more consistent and principled, and gives us more chances to dogfood our own C++ reflection API. This highlighted several parts of the C++ reflection API that were incomplete.
2. This CL removes code duplication that previously existed in the compiler. The upb reflection library has code to build MiniDescriptors and MiniTables out of descriptors, but prior to this CL the upb compiler could not use it. The upb compiler had a separate copy of this logic, and the compiler's copy of this logic was especially tricky and hard to maintain. This CL removes the separate copy of that logic.
3. This CL (mostly) removes upb's dependency on the C++ protobuf library. We still depend on `protoc` (the binary), but the runtime and compiler no longer link against C++'s libraries. This opens up the possibility of speeding up some builds significantly if we can use a prebuilt `protoc` binary.
# Bootstrap Stages
To bootstrap, we check in a copy of our generated code for `descriptor.proto` and `plugin.proto`. This allows the compiler to depend on the generated code for these two protos without creating a circular dependency. This code is checked in to the `stage0` directory.
The bootstrapping process is divided into a few stages. All `cc_library()`, `upb_proto_library()`, and `cc_binary()` targets that would otherwise be circular participate in this staging process. That currently includes:
* `//third_party/upb:descriptor_upb_proto`
* `//third_party/upb:plugin_upb_proto`
* `//third_party/upb:reflection`
* `//third_party/upb:reflection_internal`
* `//third_party/upbc:common`
* `//third_party/upbc:file_layout`
* `//third_party/upbc:plugin`
* `//third_party/upbc:protoc-gen-upb`
For each of these targets, we produce a rule for each stage (the logic for this is nicely encapsulated in Blaze/Bazel macros like `bootstrap_cc_library()` and `bootstrap_upb_proto_library()`, so the `BUILD` file remains readable). For example:
* `//third_party/upb:descriptor_upb_proto_stage0`
* `//third_party/upb:descriptor_upb_proto_stage1`
* `//third_party/upb:descriptor_upb_proto`
The stages are:
1. `stage0`: This uses the checked-in version of the generated code. The stage0 compiler is correct and outputs the same code as all other compilers, but it is unnecessarily slow because its protos were compiled in bootstrap mode. The stage0 compiler is used to generate protos for stage1.
2. `stage1`: The stage1 compiler is correct and fast, and therefore we use it in almost all cases (eg. `upb_proto_library()`). However its own protos were not generated using `upb_proto_library()`, so its `cc_library()` targets cannot be safely mixed with `upb_proto_library()`, as this would lead to duplicate symbols.
3. final (no stage): The final compiler is identical to the `stage1` compiler. The only difference is that its protos were built with `upb_proto_library()`. This doesn't matter very much for the compiler binary, but for the `cc_library()` targets like `//third_party/upb:reflection`, only the final targets can be safely linked in by other applications.
# "Bootstrap Mode" Protos
The checked-in generated code is generated in a special "bootstrap" mode that is a bit different than normal generated code. Bootstrap mode avoids depending on the internal representation of MiniTables or the messages, at the cost of slower runtime performance.
Bootstrap mode only interacts with MiniTables and messages using public APIs such as `upb_MiniTable_Build()`, `upb_Message_GetInt32()`, etc. This is very important as it allows us to change the internal representation without needing to regenerate our bootstrap protos. This will make it far easier to write CLs that change the internal representation, because it avoids the awkward dance of trying to regenerate the bootstrap protos when the compiler itself is broken due to bootstrap protos being out of date.
The bootstrap generated code does have two downsides:
1. The accessors are less efficient, because they look up MiniTable fields by number instead of hard-coding the MiniTableField into the generated code.
2. It requires runtime initialization of the MiniTables, which costs CPU cycles at startup, and also allocates memory which is never freed. Per google3 rules this is not really a leak, since this memory is still reachable via static variables, but it is undesirable in many contexts. We could fix this part by introducing the equivalent of `google::protobuf::ShutdownProtobufLibrary()`).
These downsides are fine for the bootstrapping process, but they are reason enough not to enable bootstrap mode in general for all protos.
# Bootstrapping Always Uses OSS Protos
To enable smooth syncing between Google3 and OSS, we always use an OSS version of the checked in generated code for `stage0`, even in google3.
This requires that the google3 code can be switched to reference the OSS proto names using a preprocessor define. We introduce the `UPB_DESC(xyz)` macro for this, which will expand into either `proto2_xyz` or `google_protobuf_xyz`. Any libraries used in `stage0` must use `UPB_DESC(xyz)` rather than refer to the symbol names directly.
PiperOrigin-RevId: 501458451
2 years ago
|
|
|
for (const auto* field : FieldNumberOrder(desc)) {
|
|
|
|
std::string resolved_field_name = ResolveFieldName(field, field_names);
|
|
|
|
std::string resolved_upbc_name = mangler.ResolveFieldName(field->name());
|
|
|
|
if (field->is_map()) {
|
|
|
|
WriteMapAccessorDefinitions(desc, field, resolved_field_name, class_name,
|
|
|
|
ctx);
|
|
|
|
} else if (desc->options().map_entry()) {
|
|
|
|
// TODO Implement map entry
|
|
|
|
} else if (field->is_repeated()) {
|
|
|
|
if (field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE) {
|
|
|
|
WriteRepeatedMessageAccessor(desc, field, resolved_field_name,
|
|
|
|
class_name, ctx);
|
|
|
|
} else if (field->cpp_type() ==
|
|
|
|
protobuf::FieldDescriptor::CPPTYPE_STRING) {
|
|
|
|
WriteRepeatedStringAccessor(desc, field, resolved_field_name,
|
|
|
|
class_name, ctx);
|
|
|
|
} else {
|
|
|
|
WriteRepeatedScalarAccessor(desc, field, resolved_field_name,
|
|
|
|
class_name, ctx);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// non-repeated field.
|
|
|
|
if (field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_STRING) {
|
|
|
|
ctx.EmitLegacy(
|
|
|
|
R"cc(
|
|
|
|
$1 $0::$2() const {
|
|
|
|
return hpb::interop::upb::FromUpbStringView($3_$4(msg_));
|
|
|
|
}
|
|
|
|
)cc",
|
|
|
|
class_name, CppConstType(field), resolved_field_name,
|
|
|
|
upb::generator::CApiMessageType(desc->full_name()),
|
|
|
|
resolved_upbc_name);
|
|
|
|
// Set string.
|
|
|
|
ctx.EmitLegacy(
|
|
|
|
R"cc(
|
|
|
|
void $0::set_$2($1 value) {
|
|
|
|
$4_set_$3(msg_, hpb::interop::upb::CopyToUpbStringView(value, $5));
|
|
|
|
}
|
|
|
|
)cc",
|
|
|
|
class_name, CppConstType(field), resolved_field_name,
|
|
|
|
resolved_upbc_name,
|
|
|
|
upb::generator::CApiMessageType(desc->full_name()),
|
|
|
|
arena_expression);
|
|
|
|
} else if (field->cpp_type() ==
|
|
|
|
protobuf::FieldDescriptor::CPPTYPE_MESSAGE) {
|
|
|
|
ctx.EmitLegacy(
|
|
|
|
R"cc(
|
|
|
|
$1 $0::$2() const {
|
|
|
|
if (!has_$2()) {
|
|
|
|
return $4::default_instance();
|
|
|
|
}
|
|
|
|
return ::hpb::interop::upb::MakeCHandle<$4>(
|
|
|
|
(upb_Message*)($3_$5(msg_)), arena_);
|
|
|
|
}
|
|
|
|
)cc",
|
|
|
|
class_name, MessagePtrConstType(field, /* is_const */ true),
|
|
|
|
resolved_field_name,
|
|
|
|
upb::generator::CApiMessageType(desc->full_name()),
|
|
|
|
MessageBaseType(field, /* maybe_const */ false),
|
|
|
|
resolved_upbc_name);
|
|
|
|
|
|
|
|
ctx.EmitLegacy(
|
|
|
|
R"cc(
|
|
|
|
$1 $0::mutable_$2() {
|
|
|
|
return hpb::interop::upb::MakeHandle<$4>(
|
|
|
|
(upb_Message*)($3_mutable_$5(msg_, $6)), $6);
|
|
|
|
}
|
|
|
|
void $0::set_alias_$2($1 target) {
|
|
|
|
ABSL_CHECK_EQ(arena_, hpb::interop::upb::GetArena(target));
|
|
|
|
upb_Message_SetBaseFieldMessage(
|
|
|
|
UPB_UPCAST(msg_),
|
|
|
|
upb_MiniTable_FindFieldByNumber($7::minitable(), $8),
|
|
|
|
hpb::interop::upb::GetMessage(target));
|
|
|
|
}
|
|
|
|
)cc",
|
|
|
|
class_name, MessagePtrConstType(field, /* is_const */ false),
|
|
|
|
resolved_field_name,
|
|
|
|
upb::generator::CApiMessageType(desc->full_name()),
|
|
|
|
MessageBaseType(field, /* maybe_const */ false), resolved_upbc_name,
|
|
|
|
arena_expression, ClassName(desc), field->number());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ctx.Emit("\n");
|
|
|
|
ctx.Emit("} // namespace internal\n\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
void WriteMapAccessorDefinitions(const protobuf::Descriptor* desc,
|
|
|
|
const protobuf::FieldDescriptor* field,
|
|
|
|
const absl::string_view resolved_field_name,
|
|
|
|
const absl::string_view class_name,
|
|
|
|
Context& ctx) {
|
|
|
|
const protobuf::Descriptor* entry = field->message_type();
|
|
|
|
const protobuf::FieldDescriptor* key = entry->FindFieldByNumber(1);
|
|
|
|
const protobuf::FieldDescriptor* val = entry->FindFieldByNumber(2);
|
|
|
|
absl::string_view upbc_name = field->name();
|
|
|
|
absl::string_view converted_key_name = "key";
|
|
|
|
absl::string_view optional_conversion_code = "";
|
|
|
|
|
|
|
|
if (key->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_STRING) {
|
|
|
|
// Insert conversion from absl::string_view to upb_StringView.
|
|
|
|
// Creates upb_StringView on stack to prevent allocation.
|
|
|
|
converted_key_name = "upb_key";
|
|
|
|
optional_conversion_code =
|
|
|
|
"upb_StringView upb_key = {key.data(), key.size()};\n";
|
|
|
|
}
|
|
|
|
if (val->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE) {
|
|
|
|
ctx.EmitLegacy(
|
|
|
|
R"cc(
|
|
|
|
bool $0::set_$1($2 key, $3 value) {
|
|
|
|
upb_Message* clone = upb_Message_DeepClone(
|
|
|
|
::hpb::internal::PrivateAccess::GetInternalMsg(value), &$9,
|
|
|
|
arena_);
|
|
|
|
$6return $4_$8_set(msg_, $7, ($5*)clone, arena_);
|
|
|
|
}
|
|
|
|
)cc",
|
|
|
|
class_name, resolved_field_name, CppConstType(key),
|
|
|
|
MessagePtrConstType(val, /* is_const */ true),
|
|
|
|
upb::generator::CApiMessageType(desc->full_name()),
|
|
|
|
upb::generator::CApiMessageType(val->message_type()->full_name()),
|
|
|
|
optional_conversion_code, converted_key_name, upbc_name,
|
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::MiniTableMessageVarName(
|
|
|
|
val->message_type()->full_name()));
|
|
|
|
ctx.EmitLegacy(
|
|
|
|
R"cc(
|
|
|
|
bool $0::set_$1($2 key, $3 value) {
|
|
|
|
upb_Message* clone = upb_Message_DeepClone(
|
|
|
|
::hpb::internal::PrivateAccess::GetInternalMsg(value), &$9,
|
|
|
|
arena_);
|
|
|
|
$6return $4_$8_set(msg_, $7, ($5*)clone, arena_);
|
|
|
|
}
|
|
|
|
)cc",
|
|
|
|
class_name, resolved_field_name, CppConstType(key),
|
|
|
|
MessagePtrConstType(val, /* is_const */ false),
|
|
|
|
upb::generator::CApiMessageType(desc->full_name()),
|
|
|
|
upb::generator::CApiMessageType(val->message_type()->full_name()),
|
|
|
|
optional_conversion_code, converted_key_name, upbc_name,
|
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::MiniTableMessageVarName(
|
|
|
|
val->message_type()->full_name()));
|
|
|
|
ctx.EmitLegacy(
|
|
|
|
R"cc(
|
|
|
|
bool $0::set_alias_$1($2 key, $3 value) {
|
|
|
|
$6return $4_$8_set(
|
|
|
|
msg_, $7, ($5*)hpb::interop::upb::GetMessage(value), arena_);
|
|
|
|
}
|
|
|
|
)cc",
|
|
|
|
class_name, resolved_field_name, CppConstType(key),
|
|
|
|
MessagePtrConstType(val, /* is_const */ true),
|
|
|
|
upb::generator::CApiMessageType(desc->full_name()),
|
|
|
|
upb::generator::CApiMessageType(val->message_type()->full_name()),
|
|
|
|
optional_conversion_code, converted_key_name, upbc_name);
|
|
|
|
ctx.EmitLegacy(
|
|
|
|
R"cc(
|
|
|
|
bool $0::set_alias_$1($2 key, $3 value) {
|
|
|
|
$6return $4_$8_set(
|
|
|
|
msg_, $7, ($5*)hpb::interop::upb::GetMessage(value), arena_);
|
|
|
|
}
|
|
|
|
)cc",
|
|
|
|
class_name, resolved_field_name, CppConstType(key),
|
|
|
|
MessagePtrConstType(val, /* is_const */ false),
|
|
|
|
upb::generator::CApiMessageType(desc->full_name()),
|
|
|
|
upb::generator::CApiMessageType(val->message_type()->full_name()),
|
|
|
|
optional_conversion_code, converted_key_name, upbc_name);
|
|
|
|
ctx.EmitLegacy(
|
|
|
|
R"cc(
|
|
|
|
absl::StatusOr<$3> $0::get_$1($2 key) {
|
|
|
|
$5* msg_value;
|
|
|
|
$7bool success = $4_$9_get(msg_, $8, &msg_value);
|
|
|
|
if (success) {
|
|
|
|
return ::hpb::interop::upb::MakeCHandle<$6>(UPB_UPCAST(msg_value), arena_);
|
|
|
|
}
|
|
|
|
return absl::NotFoundError("");
|
|
|
|
}
|
|
|
|
)cc",
|
|
|
|
class_name, resolved_field_name, CppConstType(key),
|
|
|
|
MessagePtrConstType(val, /* is_const */ true),
|
|
|
|
upb::generator::CApiMessageType(desc->full_name()),
|
|
|
|
upb::generator::CApiMessageType(val->message_type()->full_name()),
|
|
|
|
QualifiedClassName(val->message_type()), optional_conversion_code,
|
|
|
|
converted_key_name, upbc_name);
|
|
|
|
ctx.Emit(
|
|
|
|
{{"class_name", class_name},
|
|
|
|
{"hpb_field_name", resolved_field_name},
|
|
|
|
{"const_key", CppConstType(key)},
|
|
|
|
{"PtrMut", MessagePtrConstType(val, false)},
|
|
|
|
{"upb_msg_name", upb::generator::CApiMessageType(desc->full_name())},
|
|
|
|
{"return_type",
|
|
|
|
upb::generator::CApiMessageType(val->message_type()->full_name())},
|
|
|
|
{"proto_class", QualifiedClassName(val->message_type())},
|
|
|
|
{"optional_conversion_code", optional_conversion_code},
|
|
|
|
{"converted_key_name", converted_key_name},
|
|
|
|
{"upb_field_name", upbc_name}},
|
|
|
|
R"cc(
|
|
|
|
absl::StatusOr<$PtrMut$> $class_name$::get_mutable_$hpb_field_name$(
|
|
|
|
$const_key$ key) {
|
|
|
|
$return_type$* msg_value;
|
|
|
|
$optional_conversion_code$bool success =
|
|
|
|
$upb_msg_name$_$upb_field_name$_get(msg_, $converted_key_name$,
|
|
|
|
&msg_value);
|
|
|
|
if (success) {
|
|
|
|
return ::hpb::interop::upb::MakeHandle<$proto_class$>(
|
|
|
|
UPB_UPCAST(msg_value), arena_);
|
|
|
|
}
|
|
|
|
return absl::NotFoundError("");
|
|
|
|
}
|
|
|
|
)cc");
|
|
|
|
ctx.EmitLegacy(
|
|
|
|
R"cc(
|
|
|
|
void $0::delete_$1($2 key) { $6$4_$8_delete(msg_, $7); }
|
|
|
|
)cc",
|
|
|
|
class_name, resolved_field_name, CppConstType(key),
|
|
|
|
MessagePtrConstType(val, /* is_const */ false),
|
|
|
|
upb::generator::CApiMessageType(desc->full_name()),
|
|
|
|
upb::generator::CApiMessageType(val->message_type()->full_name()),
|
|
|
|
optional_conversion_code, converted_key_name, upbc_name);
|
|
|
|
} else if (val->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_STRING) {
|
|
|
|
ctx.EmitLegacy(
|
|
|
|
R"cc(
|
|
|
|
bool $0::set_$1($2 key, $3 value) {
|
|
|
|
$5return $4_$7_set(
|
|
|
|
msg_, $6, hpb::interop::upb::CopyToUpbStringView(value, arena_),
|
|
|
|
arena_);
|
|
|
|
}
|
|
|
|
)cc",
|
|
|
|
class_name, resolved_field_name, CppConstType(key), CppConstType(val),
|
|
|
|
upb::generator::CApiMessageType(desc->full_name()),
|
|
|
|
optional_conversion_code, converted_key_name, upbc_name);
|
|
|
|
ctx.EmitLegacy(
|
|
|
|
R"cc(
|
|
|
|
absl::StatusOr<$3> $0::get_$1($2 key) {
|
|
|
|
upb_StringView value;
|
|
|
|
$5bool success = $4_$7_get(msg_, $6, &value);
|
|
|
|
if (success) {
|
|
|
|
return absl::string_view(value.data, value.size);
|
|
|
|
}
|
|
|
|
return absl::NotFoundError("");
|
|
|
|
}
|
|
|
|
)cc",
|
|
|
|
class_name, resolved_field_name, CppConstType(key), CppConstType(val),
|
|
|
|
upb::generator::CApiMessageType(desc->full_name()),
|
|
|
|
optional_conversion_code, converted_key_name, upbc_name);
|
|
|
|
ctx.EmitLegacy(
|
|
|
|
R"cc(
|
|
|
|
void $0::delete_$1($2 key) { $5$4_$7_delete(msg_, $6); }
|
|
|
|
)cc",
|
|
|
|
class_name, resolved_field_name, CppConstType(key), CppConstType(val),
|
|
|
|
upb::generator::CApiMessageType(desc->full_name()),
|
|
|
|
optional_conversion_code, converted_key_name, upbc_name);
|
|
|
|
} else {
|
|
|
|
ctx.EmitLegacy(
|
|
|
|
R"cc(
|
|
|
|
bool $0::set_$1($2 key, $3 value) {
|
|
|
|
$5return $4_$7_set(msg_, $6, value, arena_);
|
|
|
|
}
|
|
|
|
)cc",
|
|
|
|
class_name, resolved_field_name, CppConstType(key), CppConstType(val),
|
|
|
|
upb::generator::CApiMessageType(desc->full_name()),
|
|
|
|
optional_conversion_code, converted_key_name, upbc_name);
|
|
|
|
ctx.EmitLegacy(
|
|
|
|
R"cc(
|
|
|
|
absl::StatusOr<$3> $0::get_$1($2 key) {
|
|
|
|
$3 value;
|
|
|
|
$5bool success = $4_$7_get(msg_, $6, &value);
|
|
|
|
if (success) {
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
return absl::NotFoundError("");
|
|
|
|
}
|
|
|
|
)cc",
|
|
|
|
class_name, resolved_field_name, CppConstType(key), CppConstType(val),
|
|
|
|
upb::generator::CApiMessageType(desc->full_name()),
|
|
|
|
optional_conversion_code, converted_key_name, upbc_name);
|
|
|
|
ctx.EmitLegacy(
|
|
|
|
R"cc(
|
|
|
|
void $0::delete_$1($2 key) { $5$4_$7_delete(msg_, $6); }
|
|
|
|
)cc",
|
|
|
|
class_name, resolved_field_name, CppConstType(key), CppConstType(val),
|
|
|
|
upb::generator::CApiMessageType(desc->full_name()),
|
|
|
|
optional_conversion_code, converted_key_name, upbc_name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void WriteUsingAccessorsInHeader(const protobuf::Descriptor* desc,
|
|
|
|
MessageClassType handle_type, Context& ctx) {
|
|
|
|
bool read_only = handle_type == MessageClassType::kMessageCProxy;
|
|
|
|
|
|
|
|
// Generate const methods.
|
|
|
|
auto indent = ctx.printer().WithIndent();
|
|
|
|
std::string class_name = ClassName(desc);
|
|
|
|
auto field_names = CreateFieldNameMap(desc);
|
|
|
|
|
upb is self-hosting!
This CL changes the upb compiler to no longer depend on C++ protobuf libraries. upb now uses its own reflection libraries to implement its code generator.
# Key Benefits
1. upb can now use its own reflection libraries throughout the compiler. This makes upb more consistent and principled, and gives us more chances to dogfood our own C++ reflection API. This highlighted several parts of the C++ reflection API that were incomplete.
2. This CL removes code duplication that previously existed in the compiler. The upb reflection library has code to build MiniDescriptors and MiniTables out of descriptors, but prior to this CL the upb compiler could not use it. The upb compiler had a separate copy of this logic, and the compiler's copy of this logic was especially tricky and hard to maintain. This CL removes the separate copy of that logic.
3. This CL (mostly) removes upb's dependency on the C++ protobuf library. We still depend on `protoc` (the binary), but the runtime and compiler no longer link against C++'s libraries. This opens up the possibility of speeding up some builds significantly if we can use a prebuilt `protoc` binary.
# Bootstrap Stages
To bootstrap, we check in a copy of our generated code for `descriptor.proto` and `plugin.proto`. This allows the compiler to depend on the generated code for these two protos without creating a circular dependency. This code is checked in to the `stage0` directory.
The bootstrapping process is divided into a few stages. All `cc_library()`, `upb_proto_library()`, and `cc_binary()` targets that would otherwise be circular participate in this staging process. That currently includes:
* `//third_party/upb:descriptor_upb_proto`
* `//third_party/upb:plugin_upb_proto`
* `//third_party/upb:reflection`
* `//third_party/upb:reflection_internal`
* `//third_party/upbc:common`
* `//third_party/upbc:file_layout`
* `//third_party/upbc:plugin`
* `//third_party/upbc:protoc-gen-upb`
For each of these targets, we produce a rule for each stage (the logic for this is nicely encapsulated in Blaze/Bazel macros like `bootstrap_cc_library()` and `bootstrap_upb_proto_library()`, so the `BUILD` file remains readable). For example:
* `//third_party/upb:descriptor_upb_proto_stage0`
* `//third_party/upb:descriptor_upb_proto_stage1`
* `//third_party/upb:descriptor_upb_proto`
The stages are:
1. `stage0`: This uses the checked-in version of the generated code. The stage0 compiler is correct and outputs the same code as all other compilers, but it is unnecessarily slow because its protos were compiled in bootstrap mode. The stage0 compiler is used to generate protos for stage1.
2. `stage1`: The stage1 compiler is correct and fast, and therefore we use it in almost all cases (eg. `upb_proto_library()`). However its own protos were not generated using `upb_proto_library()`, so its `cc_library()` targets cannot be safely mixed with `upb_proto_library()`, as this would lead to duplicate symbols.
3. final (no stage): The final compiler is identical to the `stage1` compiler. The only difference is that its protos were built with `upb_proto_library()`. This doesn't matter very much for the compiler binary, but for the `cc_library()` targets like `//third_party/upb:reflection`, only the final targets can be safely linked in by other applications.
# "Bootstrap Mode" Protos
The checked-in generated code is generated in a special "bootstrap" mode that is a bit different than normal generated code. Bootstrap mode avoids depending on the internal representation of MiniTables or the messages, at the cost of slower runtime performance.
Bootstrap mode only interacts with MiniTables and messages using public APIs such as `upb_MiniTable_Build()`, `upb_Message_GetInt32()`, etc. This is very important as it allows us to change the internal representation without needing to regenerate our bootstrap protos. This will make it far easier to write CLs that change the internal representation, because it avoids the awkward dance of trying to regenerate the bootstrap protos when the compiler itself is broken due to bootstrap protos being out of date.
The bootstrap generated code does have two downsides:
1. The accessors are less efficient, because they look up MiniTable fields by number instead of hard-coding the MiniTableField into the generated code.
2. It requires runtime initialization of the MiniTables, which costs CPU cycles at startup, and also allocates memory which is never freed. Per google3 rules this is not really a leak, since this memory is still reachable via static variables, but it is undesirable in many contexts. We could fix this part by introducing the equivalent of `google::protobuf::ShutdownProtobufLibrary()`).
These downsides are fine for the bootstrapping process, but they are reason enough not to enable bootstrap mode in general for all protos.
# Bootstrapping Always Uses OSS Protos
To enable smooth syncing between Google3 and OSS, we always use an OSS version of the checked in generated code for `stage0`, even in google3.
This requires that the google3 code can be switched to reference the OSS proto names using a preprocessor define. We introduce the `UPB_DESC(xyz)` macro for this, which will expand into either `proto2_xyz` or `google_protobuf_xyz`. Any libraries used in `stage0` must use `UPB_DESC(xyz)` rather than refer to the symbol names directly.
PiperOrigin-RevId: 501458451
2 years ago
|
|
|
for (const auto* field : FieldNumberOrder(desc)) {
|
|
|
|
std::string resolved_field_name = ResolveFieldName(field, field_names);
|
|
|
|
// Generate hazzer (if any).
|
upb is self-hosting!
This CL changes the upb compiler to no longer depend on C++ protobuf libraries. upb now uses its own reflection libraries to implement its code generator.
# Key Benefits
1. upb can now use its own reflection libraries throughout the compiler. This makes upb more consistent and principled, and gives us more chances to dogfood our own C++ reflection API. This highlighted several parts of the C++ reflection API that were incomplete.
2. This CL removes code duplication that previously existed in the compiler. The upb reflection library has code to build MiniDescriptors and MiniTables out of descriptors, but prior to this CL the upb compiler could not use it. The upb compiler had a separate copy of this logic, and the compiler's copy of this logic was especially tricky and hard to maintain. This CL removes the separate copy of that logic.
3. This CL (mostly) removes upb's dependency on the C++ protobuf library. We still depend on `protoc` (the binary), but the runtime and compiler no longer link against C++'s libraries. This opens up the possibility of speeding up some builds significantly if we can use a prebuilt `protoc` binary.
# Bootstrap Stages
To bootstrap, we check in a copy of our generated code for `descriptor.proto` and `plugin.proto`. This allows the compiler to depend on the generated code for these two protos without creating a circular dependency. This code is checked in to the `stage0` directory.
The bootstrapping process is divided into a few stages. All `cc_library()`, `upb_proto_library()`, and `cc_binary()` targets that would otherwise be circular participate in this staging process. That currently includes:
* `//third_party/upb:descriptor_upb_proto`
* `//third_party/upb:plugin_upb_proto`
* `//third_party/upb:reflection`
* `//third_party/upb:reflection_internal`
* `//third_party/upbc:common`
* `//third_party/upbc:file_layout`
* `//third_party/upbc:plugin`
* `//third_party/upbc:protoc-gen-upb`
For each of these targets, we produce a rule for each stage (the logic for this is nicely encapsulated in Blaze/Bazel macros like `bootstrap_cc_library()` and `bootstrap_upb_proto_library()`, so the `BUILD` file remains readable). For example:
* `//third_party/upb:descriptor_upb_proto_stage0`
* `//third_party/upb:descriptor_upb_proto_stage1`
* `//third_party/upb:descriptor_upb_proto`
The stages are:
1. `stage0`: This uses the checked-in version of the generated code. The stage0 compiler is correct and outputs the same code as all other compilers, but it is unnecessarily slow because its protos were compiled in bootstrap mode. The stage0 compiler is used to generate protos for stage1.
2. `stage1`: The stage1 compiler is correct and fast, and therefore we use it in almost all cases (eg. `upb_proto_library()`). However its own protos were not generated using `upb_proto_library()`, so its `cc_library()` targets cannot be safely mixed with `upb_proto_library()`, as this would lead to duplicate symbols.
3. final (no stage): The final compiler is identical to the `stage1` compiler. The only difference is that its protos were built with `upb_proto_library()`. This doesn't matter very much for the compiler binary, but for the `cc_library()` targets like `//third_party/upb:reflection`, only the final targets can be safely linked in by other applications.
# "Bootstrap Mode" Protos
The checked-in generated code is generated in a special "bootstrap" mode that is a bit different than normal generated code. Bootstrap mode avoids depending on the internal representation of MiniTables or the messages, at the cost of slower runtime performance.
Bootstrap mode only interacts with MiniTables and messages using public APIs such as `upb_MiniTable_Build()`, `upb_Message_GetInt32()`, etc. This is very important as it allows us to change the internal representation without needing to regenerate our bootstrap protos. This will make it far easier to write CLs that change the internal representation, because it avoids the awkward dance of trying to regenerate the bootstrap protos when the compiler itself is broken due to bootstrap protos being out of date.
The bootstrap generated code does have two downsides:
1. The accessors are less efficient, because they look up MiniTable fields by number instead of hard-coding the MiniTableField into the generated code.
2. It requires runtime initialization of the MiniTables, which costs CPU cycles at startup, and also allocates memory which is never freed. Per google3 rules this is not really a leak, since this memory is still reachable via static variables, but it is undesirable in many contexts. We could fix this part by introducing the equivalent of `google::protobuf::ShutdownProtobufLibrary()`).
These downsides are fine for the bootstrapping process, but they are reason enough not to enable bootstrap mode in general for all protos.
# Bootstrapping Always Uses OSS Protos
To enable smooth syncing between Google3 and OSS, we always use an OSS version of the checked in generated code for `stage0`, even in google3.
This requires that the google3 code can be switched to reference the OSS proto names using a preprocessor define. We introduce the `UPB_DESC(xyz)` macro for this, which will expand into either `proto2_xyz` or `google_protobuf_xyz`. Any libraries used in `stage0` must use `UPB_DESC(xyz)` rather than refer to the symbol names directly.
PiperOrigin-RevId: 501458451
2 years ago
|
|
|
if (field->has_presence()) {
|
|
|
|
ctx.EmitLegacy("using $0Access::has_$1;\n", class_name,
|
|
|
|
resolved_field_name);
|
|
|
|
if (!read_only) {
|
|
|
|
ctx.EmitLegacy("using $0Access::clear_$1;\n", class_name,
|
|
|
|
resolved_field_name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (field->is_map()) {
|
|
|
|
ctx.EmitLegacy(
|
|
|
|
R"cc(
|
|
|
|
using $0Access::$1_size;
|
|
|
|
using $0Access::get_$1;
|
|
|
|
)cc",
|
|
|
|
class_name, resolved_field_name);
|
|
|
|
if (!read_only) {
|
|
|
|
ctx.EmitLegacy(
|
|
|
|
R"cc(
|
|
|
|
using $0Access::clear_$1;
|
|
|
|
using $0Access::delete_$1;
|
|
|
|
using $0Access::set_$1;
|
|
|
|
)cc",
|
|
|
|
class_name, resolved_field_name);
|
|
|
|
// only emit set_alias and get_mutable for maps when value is a message
|
|
|
|
if (field->message_type()->FindFieldByNumber(2)->cpp_type() ==
|
|
|
|
protobuf::FieldDescriptor::CPPTYPE_MESSAGE) {
|
|
|
|
ctx.Emit(
|
|
|
|
{{"class_name", class_name}, {"field_name", resolved_field_name}},
|
|
|
|
R"cc(
|
|
|
|
using $class_name$Access::get_mutable_$field_name$;
|
|
|
|
using $class_name$Access::set_alias_$field_name$;
|
|
|
|
)cc");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if (desc->options().map_entry()) {
|
|
|
|
// TODO Implement map entry
|
|
|
|
} else if (field->is_repeated()) {
|
|
|
|
WriteRepeatedFieldUsingAccessors(field, class_name, resolved_field_name,
|
|
|
|
ctx, read_only);
|
|
|
|
} else {
|
|
|
|
if (field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE) {
|
|
|
|
ctx.EmitLegacy("using $0Access::$1;\n", ClassName(desc),
|
|
|
|
resolved_field_name);
|
|
|
|
if (!read_only) {
|
|
|
|
ctx.EmitLegacy("using $0Access::mutable_$1;\n", class_name,
|
|
|
|
resolved_field_name);
|
|
|
|
ctx.EmitLegacy("using $0Access::set_alias_$1;\n", class_name,
|
|
|
|
resolved_field_name);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
ctx.EmitLegacy("using $0Access::$1;\n", class_name,
|
|
|
|
resolved_field_name);
|
|
|
|
if (!read_only) {
|
|
|
|
ctx.EmitLegacy("using $0Access::set_$1;\n", class_name,
|
|
|
|
resolved_field_name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for (int i = 0; i < desc->real_oneof_decl_count(); ++i) {
|
|
|
|
const protobuf::OneofDescriptor* oneof = desc->oneof_decl(i);
|
|
|
|
ctx.EmitLegacy("using $0Access::$1_case;\n", class_name, oneof->name());
|
|
|
|
ctx.EmitLegacy("using $0Access::$1Case;\n", class_name,
|
|
|
|
ToCamelCase(oneof->name(), /*lower_first=*/false));
|
|
|
|
for (int j = 0; j < oneof->field_count(); ++j) {
|
|
|
|
const protobuf::FieldDescriptor* field = oneof->field(j);
|
|
|
|
ctx.EmitLegacy("using $0Access::k$1;\n", class_name,
|
|
|
|
ToCamelCase(field->name(), /*lower_first=*/false),
|
|
|
|
field->number());
|
|
|
|
}
|
|
|
|
ctx.EmitLegacy("using $0Access::$1_NOT_SET;\n", class_name,
|
|
|
|
absl::AsciiStrToUpper(oneof->name()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void WriteOneofAccessorsInHeader(const protobuf::Descriptor* desc,
|
|
|
|
Context& ctx) {
|
|
|
|
// Generate const methods.
|
|
|
|
auto indent = ctx.printer().WithIndent();
|
|
|
|
std::string class_name = ClassName(desc);
|
|
|
|
auto field_names = CreateFieldNameMap(desc);
|
|
|
|
for (int i = 0; i < desc->real_oneof_decl_count(); ++i) {
|
|
|
|
const protobuf::OneofDescriptor* oneof = desc->oneof_decl(i);
|
|
|
|
ctx.EmitLegacy("enum $0Case {\n",
|
|
|
|
ToCamelCase(oneof->name(), /*lower_first=*/false));
|
|
|
|
for (int j = 0; j < oneof->field_count(); ++j) {
|
|
|
|
const protobuf::FieldDescriptor* field = oneof->field(j);
|
|
|
|
ctx.EmitLegacy(" k$0 = $1,\n",
|
|
|
|
ToCamelCase(field->name(), /*lower_first=*/false),
|
|
|
|
field->number());
|
|
|
|
}
|
|
|
|
ctx.EmitLegacy(" $0_NOT_SET = 0,\n", absl::AsciiStrToUpper(oneof->name()));
|
|
|
|
ctx.Emit("};\n\n");
|
|
|
|
ctx.EmitLegacy("$0Case $1_case() const {\n",
|
|
|
|
ToCamelCase(oneof->name(), /*lower_first=*/false),
|
|
|
|
oneof->name());
|
|
|
|
for (int j = 0; j < oneof->field_count(); ++j) {
|
|
|
|
const protobuf::FieldDescriptor* field = oneof->field(j);
|
|
|
|
std::string resolved_field_name = ResolveFieldName(field, field_names);
|
|
|
|
ctx.EmitLegacy(" if (has_$0()) { return k$1; }\n", resolved_field_name,
|
|
|
|
ToCamelCase(field->name(), /*lower_first=*/false));
|
|
|
|
}
|
|
|
|
ctx.EmitLegacy(" return $0_NOT_SET;\n",
|
|
|
|
absl::AsciiStrToUpper(oneof->name()));
|
|
|
|
ctx.Emit("}\n;");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
std::string ResolveFieldName(const protobuf::FieldDescriptor* field,
|
|
|
|
const NameToFieldDescriptorMap& field_names) {
|
|
|
|
// C++ implementation specific reserved names.
|
|
|
|
static const auto& kReservedNames =
|
|
|
|
*new absl::flat_hash_set<absl::string_view>({
|
|
|
|
"msg",
|
|
|
|
"msg_",
|
|
|
|
"arena",
|
|
|
|
"arena_",
|
|
|
|
});
|
|
|
|
|
|
|
|
// C++ specific prefixes used by code generator for field access.
|
|
|
|
static constexpr absl::string_view kClearMethodPrefix = "clear_";
|
|
|
|
static constexpr absl::string_view kSetMethodPrefix = "set_";
|
|
|
|
static constexpr absl::string_view kHasMethodPrefix = "has_";
|
|
|
|
static constexpr absl::string_view kDeleteMethodPrefix = "delete_";
|
|
|
|
static constexpr absl::string_view kAddToRepeatedMethodPrefix = "add_";
|
|
|
|
static constexpr absl::string_view kResizeArrayMethodPrefix = "resize_";
|
|
|
|
|
|
|
|
// List of generated accessor prefixes to check against.
|
|
|
|
// Example:
|
|
|
|
// optional repeated string phase = 236;
|
|
|
|
// optional bool clear_phase = 237;
|
|
|
|
static constexpr absl::string_view kAccessorPrefixes[] = {
|
|
|
|
kClearMethodPrefix, kDeleteMethodPrefix, kAddToRepeatedMethodPrefix,
|
|
|
|
kResizeArrayMethodPrefix, kSetMethodPrefix, kHasMethodPrefix};
|
|
|
|
|
|
|
|
absl::string_view field_name = field->name();
|
|
|
|
if (kReservedNames.count(field_name) > 0) {
|
|
|
|
if (absl::EndsWith(field_name, "_")) {
|
|
|
|
return absl::StrCat(field_name, "_");
|
|
|
|
} else {
|
|
|
|
return absl::StrCat(field_name, "__");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for (const auto prefix : kAccessorPrefixes) {
|
|
|
|
// If field name starts with a prefix such as clear_ and the proto
|
|
|
|
// contains a field name with trailing end, depending on type of field
|
|
|
|
// (repeated, map, message) we have a conflict to resolve.
|
|
|
|
if (absl::StartsWith(field_name, prefix)) {
|
|
|
|
auto match = field_names.find(field_name.substr(prefix.size()));
|
|
|
|
if (match != field_names.end()) {
|
|
|
|
const auto* candidate = match->second;
|
|
|
|
if (candidate->is_repeated() || candidate->is_map() ||
|
|
|
|
(candidate->cpp_type() ==
|
|
|
|
protobuf::FieldDescriptor::CPPTYPE_STRING &&
|
|
|
|
prefix == kClearMethodPrefix) ||
|
|
|
|
prefix == kSetMethodPrefix || prefix == kHasMethodPrefix) {
|
|
|
|
return absl::StrCat(field_name, "_");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ResolveKeywordConflict(field_name);
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace protobuf
|
|
|
|
} // namespace google::hpb_generator
|