| Index: third_party/protobuf/src/google/protobuf/source_context.pb.cc
|
| diff --git a/third_party/protobuf/src/google/protobuf/source_context.pb.cc b/third_party/protobuf/src/google/protobuf/source_context.pb.cc
|
| index c67cd102fbc3e03fd01c2e72e12e14e28d0bb9f0..b9e5a73b52f8b37cf557e089b57a4807075189bd 100644
|
| --- a/third_party/protobuf/src/google/protobuf/source_context.pb.cc
|
| +++ b/third_party/protobuf/src/google/protobuf/source_context.pb.cc
|
| @@ -19,79 +19,98 @@
|
|
|
| namespace google {
|
| namespace protobuf {
|
| +class SourceContextDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<SourceContext> {};
|
| +SourceContextDefaultTypeInternal _SourceContext_default_instance_;
|
|
|
| namespace {
|
|
|
| -const ::google::protobuf::Descriptor* SourceContext_descriptor_ = NULL;
|
| -const ::google::protobuf::internal::GeneratedMessageReflection*
|
| - SourceContext_reflection_ = NULL;
|
| +::google::protobuf::Metadata file_level_metadata[1];
|
|
|
| } // namespace
|
|
|
|
|
| -void protobuf_AssignDesc_google_2fprotobuf_2fsource_5fcontext_2eproto() {
|
| - protobuf_AddDesc_google_2fprotobuf_2fsource_5fcontext_2eproto();
|
| - const ::google::protobuf::FileDescriptor* file =
|
| - ::google::protobuf::DescriptorPool::generated_pool()->FindFileByName(
|
| - "google/protobuf/source_context.proto");
|
| - GOOGLE_CHECK(file != NULL);
|
| - SourceContext_descriptor_ = file->message_type(0);
|
| - static const int SourceContext_offsets_[1] = {
|
| +const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fsource_5fcontext_2eproto() GOOGLE_ATTRIBUTE_COLD;
|
| +const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fsource_5fcontext_2eproto() {
|
| + static const ::google::protobuf::uint32 offsets[] = {
|
| + ~0u, // no _has_bits_
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceContext, _internal_metadata_),
|
| + ~0u, // no _extensions_
|
| + ~0u, // no _oneof_case_
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceContext, file_name_),
|
| };
|
| - SourceContext_reflection_ =
|
| - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| - SourceContext_descriptor_,
|
| - SourceContext::default_instance_,
|
| - SourceContext_offsets_,
|
| - -1,
|
| - -1,
|
| - -1,
|
| - sizeof(SourceContext),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceContext, _internal_metadata_),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceContext, _is_default_instance_));
|
| + return offsets;
|
| }
|
|
|
| +static const ::google::protobuf::internal::MigrationSchema schemas[] = {
|
| + { 0, -1, sizeof(SourceContext)},
|
| +};
|
| +
|
| +static const ::google::protobuf::internal::DefaultInstanceData file_default_instances[] = {
|
| + {reinterpret_cast<const ::google::protobuf::Message*>(&_SourceContext_default_instance_), NULL},
|
| +};
|
| +
|
| namespace {
|
|
|
| -GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_);
|
| -inline void protobuf_AssignDescriptorsOnce() {
|
| - ::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_,
|
| - &protobuf_AssignDesc_google_2fprotobuf_2fsource_5fcontext_2eproto);
|
| +void protobuf_AssignDescriptors() {
|
| + protobuf_AddDesc_google_2fprotobuf_2fsource_5fcontext_2eproto();
|
| + ::google::protobuf::MessageFactory* factory = NULL;
|
| + AssignDescriptors(
|
| + "google/protobuf/source_context.proto", schemas, file_default_instances, protobuf_Offsets_google_2fprotobuf_2fsource_5fcontext_2eproto(), factory,
|
| + file_level_metadata, NULL, NULL);
|
| }
|
|
|
| +void protobuf_AssignDescriptorsOnce() {
|
| + static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
|
| + ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
|
| +}
|
| +
|
| +void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
|
| void protobuf_RegisterTypes(const ::std::string&) {
|
| protobuf_AssignDescriptorsOnce();
|
| - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| - SourceContext_descriptor_, &SourceContext::default_instance());
|
| + ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1);
|
| }
|
|
|
| } // namespace
|
|
|
| void protobuf_ShutdownFile_google_2fprotobuf_2fsource_5fcontext_2eproto() {
|
| - delete SourceContext::default_instance_;
|
| - delete SourceContext_reflection_;
|
| + _SourceContext_default_instance_.Shutdown();
|
| + delete file_level_metadata[0].reflection;
|
| }
|
|
|
| -void protobuf_AddDesc_google_2fprotobuf_2fsource_5fcontext_2eproto() {
|
| - static bool already_here = false;
|
| - if (already_here) return;
|
| - already_here = true;
|
| +void protobuf_InitDefaults_google_2fprotobuf_2fsource_5fcontext_2eproto_impl() {
|
| GOOGLE_PROTOBUF_VERIFY_VERSION;
|
|
|
| + ::google::protobuf::internal::InitProtobufDefaults();
|
| + _SourceContext_default_instance_.DefaultConstruct();
|
| +}
|
| +
|
| +void protobuf_InitDefaults_google_2fprotobuf_2fsource_5fcontext_2eproto() {
|
| + static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
|
| + ::google::protobuf::GoogleOnceInit(&once, &protobuf_InitDefaults_google_2fprotobuf_2fsource_5fcontext_2eproto_impl);
|
| +}
|
| +void protobuf_AddDesc_google_2fprotobuf_2fsource_5fcontext_2eproto_impl() {
|
| + protobuf_InitDefaults_google_2fprotobuf_2fsource_5fcontext_2eproto();
|
| + static const char descriptor[] = {
|
| + "\n$google/protobuf/source_context.proto\022\017"
|
| + "google.protobuf\"\"\n\rSourceContext\022\021\n\tfile"
|
| + "_name\030\001 \001(\tB\225\001\n\023com.google.protobufB\022Sou"
|
| + "rceContextProtoP\001ZAgoogle.golang.org/gen"
|
| + "proto/protobuf/source_context;source_con"
|
| + "text\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTy"
|
| + "pesb\006proto3"
|
| + };
|
| ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
|
| - "\n$google/protobuf/source_context.proto\022\017"
|
| - "google.protobuf\"\"\n\rSourceContext\022\021\n\tfile"
|
| - "_name\030\001 \001(\tBU\n\023com.google.protobufB\022Sour"
|
| - "ceContextProtoP\001\240\001\001\242\002\003GPB\252\002\036Google.Proto"
|
| - "buf.WellKnownTypesb\006proto3", 186);
|
| + descriptor, 251);
|
| ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
|
| "google/protobuf/source_context.proto", &protobuf_RegisterTypes);
|
| - SourceContext::default_instance_ = new SourceContext();
|
| - SourceContext::default_instance_->InitAsDefaultInstance();
|
| ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_google_2fprotobuf_2fsource_5fcontext_2eproto);
|
| }
|
|
|
| +GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AddDesc_google_2fprotobuf_2fsource_5fcontext_2eproto_once_);
|
| +void protobuf_AddDesc_google_2fprotobuf_2fsource_5fcontext_2eproto() {
|
| + ::google::protobuf::GoogleOnceInit(&protobuf_AddDesc_google_2fprotobuf_2fsource_5fcontext_2eproto_once_,
|
| + &protobuf_AddDesc_google_2fprotobuf_2fsource_5fcontext_2eproto_impl);
|
| +}
|
| // Force AddDescriptors() to be called at static initialization time.
|
| struct StaticDescriptorInitializer_google_2fprotobuf_2fsource_5fcontext_2eproto {
|
| StaticDescriptorInitializer_google_2fprotobuf_2fsource_5fcontext_2eproto() {
|
| @@ -99,16 +118,6 @@ struct StaticDescriptorInitializer_google_2fprotobuf_2fsource_5fcontext_2eproto
|
| }
|
| } static_descriptor_initializer_google_2fprotobuf_2fsource_5fcontext_2eproto_;
|
|
|
| -namespace {
|
| -
|
| -static void MergeFromFail(int line) GOOGLE_ATTRIBUTE_COLD;
|
| -static void MergeFromFail(int line) {
|
| - GOOGLE_CHECK(false) << __FILE__ << ":" << line;
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| -
|
| // ===================================================================
|
|
|
| #if !defined(_MSC_VER) || _MSC_VER >= 1900
|
| @@ -117,27 +126,27 @@ const int SourceContext::kFileNameFieldNumber;
|
|
|
| SourceContext::SourceContext()
|
| : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
|
| + protobuf_InitDefaults_google_2fprotobuf_2fsource_5fcontext_2eproto();
|
| + }
|
| SharedCtor();
|
| // @@protoc_insertion_point(constructor:google.protobuf.SourceContext)
|
| }
|
| -
|
| -void SourceContext::InitAsDefaultInstance() {
|
| - _is_default_instance_ = true;
|
| -}
|
| -
|
| SourceContext::SourceContext(const SourceContext& from)
|
| : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL) {
|
| - SharedCtor();
|
| - MergeFrom(from);
|
| + _internal_metadata_(NULL),
|
| + _cached_size_(0) {
|
| + _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| + file_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (from.file_name().size() > 0) {
|
| + file_name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.file_name_);
|
| + }
|
| // @@protoc_insertion_point(copy_constructor:google.protobuf.SourceContext)
|
| }
|
|
|
| void SourceContext::SharedCtor() {
|
| - _is_default_instance_ = false;
|
| - ::google::protobuf::internal::GetEmptyString();
|
| - _cached_size_ = 0;
|
| file_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + _cached_size_ = 0;
|
| }
|
|
|
| SourceContext::~SourceContext() {
|
| @@ -147,8 +156,6 @@ SourceContext::~SourceContext() {
|
|
|
| void SourceContext::SharedDtor() {
|
| file_name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - if (this != default_instance_) {
|
| - }
|
| }
|
|
|
| void SourceContext::SetCachedSize(int size) const {
|
| @@ -158,16 +165,14 @@ void SourceContext::SetCachedSize(int size) const {
|
| }
|
| const ::google::protobuf::Descriptor* SourceContext::descriptor() {
|
| protobuf_AssignDescriptorsOnce();
|
| - return SourceContext_descriptor_;
|
| + return file_level_metadata[0].descriptor;
|
| }
|
|
|
| const SourceContext& SourceContext::default_instance() {
|
| - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fsource_5fcontext_2eproto();
|
| - return *default_instance_;
|
| + protobuf_InitDefaults_google_2fprotobuf_2fsource_5fcontext_2eproto();
|
| + return *internal_default_instance();
|
| }
|
|
|
| -SourceContext* SourceContext::default_instance_ = NULL;
|
| -
|
| SourceContext* SourceContext::New(::google::protobuf::Arena* arena) const {
|
| SourceContext* n = new SourceContext;
|
| if (arena != NULL) {
|
| @@ -187,13 +192,13 @@ bool SourceContext::MergePartialFromCodedStream(
|
| ::google::protobuf::uint32 tag;
|
| // @@protoc_insertion_point(parse_start:google.protobuf.SourceContext)
|
| for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
|
| tag = p.first;
|
| if (!p.second) goto handle_unusual;
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| - // optional string file_name = 1;
|
| + // string file_name = 1;
|
| case 1: {
|
| - if (tag == 10) {
|
| + if (tag == 10u) {
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_file_name()));
|
| DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| @@ -203,7 +208,6 @@ bool SourceContext::MergePartialFromCodedStream(
|
| } else {
|
| goto handle_unusual;
|
| }
|
| - if (input->ExpectAtEnd()) goto success;
|
| break;
|
| }
|
|
|
| @@ -231,7 +235,7 @@ failure:
|
| void SourceContext::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| // @@protoc_insertion_point(serialize_start:google.protobuf.SourceContext)
|
| - // optional string file_name = 1;
|
| + // string file_name = 1;
|
| if (this->file_name().size() > 0) {
|
| ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| this->file_name().data(), this->file_name().length(),
|
| @@ -244,10 +248,11 @@ void SourceContext::SerializeWithCachedSizes(
|
| // @@protoc_insertion_point(serialize_end:google.protobuf.SourceContext)
|
| }
|
|
|
| -::google::protobuf::uint8* SourceContext::SerializeWithCachedSizesToArray(
|
| - ::google::protobuf::uint8* target) const {
|
| +::google::protobuf::uint8* SourceContext::InternalSerializeWithCachedSizesToArray(
|
| + bool deterministic, ::google::protobuf::uint8* target) const {
|
| + (void)deterministic; // Unused
|
| // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.SourceContext)
|
| - // optional string file_name = 1;
|
| + // string file_name = 1;
|
| if (this->file_name().size() > 0) {
|
| ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| this->file_name().data(), this->file_name().length(),
|
| @@ -262,27 +267,28 @@ void SourceContext::SerializeWithCachedSizes(
|
| return target;
|
| }
|
|
|
| -int SourceContext::ByteSize() const {
|
| +size_t SourceContext::ByteSizeLong() const {
|
| // @@protoc_insertion_point(message_byte_size_start:google.protobuf.SourceContext)
|
| - int total_size = 0;
|
| + size_t total_size = 0;
|
|
|
| - // optional string file_name = 1;
|
| + // string file_name = 1;
|
| if (this->file_name().size() > 0) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->file_name());
|
| }
|
|
|
| + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
|
| GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
|
| - _cached_size_ = total_size;
|
| + _cached_size_ = cached_size;
|
| GOOGLE_SAFE_CONCURRENT_WRITES_END();
|
| return total_size;
|
| }
|
|
|
| void SourceContext::MergeFrom(const ::google::protobuf::Message& from) {
|
| // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.SourceContext)
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const SourceContext* source =
|
| + GOOGLE_DCHECK_NE(&from, this);
|
| + const SourceContext* source =
|
| ::google::protobuf::internal::DynamicCastToGenerated<const SourceContext>(
|
| &from);
|
| if (source == NULL) {
|
| @@ -296,7 +302,8 @@ void SourceContext::MergeFrom(const ::google::protobuf::Message& from) {
|
|
|
| void SourceContext::MergeFrom(const SourceContext& from) {
|
| // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.SourceContext)
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + GOOGLE_DCHECK_NE(&from, this);
|
| + _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| if (from.file_name().size() > 0) {
|
|
|
| file_name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.file_name_);
|
| @@ -318,7 +325,6 @@ void SourceContext::CopyFrom(const SourceContext& from) {
|
| }
|
|
|
| bool SourceContext::IsInitialized() const {
|
| -
|
| return true;
|
| }
|
|
|
| @@ -328,56 +334,52 @@ void SourceContext::Swap(SourceContext* other) {
|
| }
|
| void SourceContext::InternalSwap(SourceContext* other) {
|
| file_name_.Swap(&other->file_name_);
|
| - _internal_metadata_.Swap(&other->_internal_metadata_);
|
| std::swap(_cached_size_, other->_cached_size_);
|
| }
|
|
|
| ::google::protobuf::Metadata SourceContext::GetMetadata() const {
|
| protobuf_AssignDescriptorsOnce();
|
| - ::google::protobuf::Metadata metadata;
|
| - metadata.descriptor = SourceContext_descriptor_;
|
| - metadata.reflection = SourceContext_reflection_;
|
| - return metadata;
|
| + return file_level_metadata[0];
|
| }
|
|
|
| #if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| // SourceContext
|
|
|
| -// optional string file_name = 1;
|
| +// string file_name = 1;
|
| void SourceContext::clear_file_name() {
|
| file_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - const ::std::string& SourceContext::file_name() const {
|
| +const ::std::string& SourceContext::file_name() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.SourceContext.file_name)
|
| - return file_name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + return file_name_.GetNoArena();
|
| }
|
| - void SourceContext::set_file_name(const ::std::string& value) {
|
| +void SourceContext::set_file_name(const ::std::string& value) {
|
|
|
| file_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| // @@protoc_insertion_point(field_set:google.protobuf.SourceContext.file_name)
|
| }
|
| - void SourceContext::set_file_name(const char* value) {
|
| +void SourceContext::set_file_name(const char* value) {
|
|
|
| file_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| // @@protoc_insertion_point(field_set_char:google.protobuf.SourceContext.file_name)
|
| }
|
| - void SourceContext::set_file_name(const char* value, size_t size) {
|
| +void SourceContext::set_file_name(const char* value, size_t size) {
|
|
|
| file_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| ::std::string(reinterpret_cast<const char*>(value), size));
|
| // @@protoc_insertion_point(field_set_pointer:google.protobuf.SourceContext.file_name)
|
| }
|
| - ::std::string* SourceContext::mutable_file_name() {
|
| +::std::string* SourceContext::mutable_file_name() {
|
|
|
| // @@protoc_insertion_point(field_mutable:google.protobuf.SourceContext.file_name)
|
| return file_name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - ::std::string* SourceContext::release_file_name() {
|
| +::std::string* SourceContext::release_file_name() {
|
| // @@protoc_insertion_point(field_release:google.protobuf.SourceContext.file_name)
|
|
|
| return file_name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - void SourceContext::set_allocated_file_name(::std::string* file_name) {
|
| +void SourceContext::set_allocated_file_name(::std::string* file_name) {
|
| if (file_name != NULL) {
|
|
|
| } else {
|
|
|