Upgrade linux protobuf
This commit is contained in:
1 parent
79f2f356d5
commit
0f3130fb47
689 files changed
+141922
-132057
No files matched your search
@@ -106,6 +106,8 @@ class FieldGroup {
|
||||
// STRING is grouped next, as our Clear/SharedCtor/SharedDtor walks it and
|
||||
// calls ArenaStringPtr::Destroy on each.
|
||||
//
|
||||
// LAZY_MESSAGE is grouped next, as it interferes with the ability to memset
|
||||
// non-repeated fields otherwise.
|
||||
//
|
||||
// MESSAGE is grouped next, as our Clear/SharedDtor code walks it and calls
|
||||
// delete on each. We initialize these fields with a NULL pointer (see
|
||||
@@ -116,12 +118,16 @@ class FieldGroup {
|
||||
//
|
||||
// OTHER these fields are initialized one-by-one.
|
||||
void PaddingOptimizer::OptimizeLayout(
|
||||
std::vector<const FieldDescriptor*>* fields, const Options& options) {
|
||||
std::vector<const FieldDescriptor*>* fields, const Options& options,
|
||||
MessageSCCAnalyzer* scc_analyzer) {
|
||||
// The sorted numeric order of Family determines the declaration order in the
|
||||
// memory layout.
|
||||
enum Family {
|
||||
REPEATED = 0,
|
||||
STRING = 1,
|
||||
// Laying out LAZY_MESSAGE before MESSAGE allows a single memset to zero
|
||||
// MESSAGE and ZERO_INITIALIZABLE fields together.
|
||||
LAZY_MESSAGE = 2,
|
||||
MESSAGE = 3,
|
||||
ZERO_INITIALIZABLE = 4,
|
||||
OTHER = 5,
|
||||
@@ -142,7 +148,9 @@ void PaddingOptimizer::OptimizeLayout(
|
||||
f = STRING;
|
||||
} else if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
|
||||
f = MESSAGE;
|
||||
|
||||
if (IsLazy(field, options, scc_analyzer)) {
|
||||
f = LAZY_MESSAGE;
|
||||
}
|
||||
} else if (CanInitializeByZeroing(field)) {
|
||||
f = ZERO_INITIALIZABLE;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user