Down-integrate from internal branch

1 files changed, 41 insertions, 38 deletions

diff --git a/src/google/protobuf/compiler/plugin.pb.cc b/src/google/protobuf/compiler/plugin.pb.cc
index 05ff2f04..bc0c1f17 100644
--- a/src/google/protobuf/compiler/plugin.pb.cc
+++ b/src/google/protobuf/compiler/plugin.pb.cc
@@ -1,4 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/protobuf/compiler/plugin.proto
 
 #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
 #include "google/protobuf/compiler/plugin.pb.h"
@@ -9,6 +10,7 @@
 #include <google/protobuf/io/coded_stream.h>
 #include <google/protobuf/wire_format_lite_inl.h>
 #include <google/protobuf/descriptor.h>
+#include <google/protobuf/generated_message_reflection.h>
 #include <google/protobuf/reflection_ops.h>
 #include <google/protobuf/wire_format.h>
 // @@protoc_insertion_point(includes)
@@ -124,6 +126,7 @@ void protobuf_AddDesc_google_2fprotobuf_2fcompiler_2fplugin_2eproto() {
   if (already_here) return;
   already_here = true;
   GOOGLE_PROTOBUF_VERIFY_VERSION;
+
   ::google::protobuf::protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
     "\n%google/protobuf/compiler/plugin.proto\022"
@@ -253,7 +256,7 @@ bool CodeGeneratorRequest::MergePartialFromCodedStream(
         if (input->ExpectTag(18)) goto parse_parameter;
         break;
       }
-      
+
       // optional string parameter = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -270,7 +273,7 @@ bool CodeGeneratorRequest::MergePartialFromCodedStream(
         if (input->ExpectTag(122)) goto parse_proto_file;
         break;
       }
-      
+
       // repeated .google.protobuf.FileDescriptorProto proto_file = 15;
       case 15: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -285,7 +288,7 @@ bool CodeGeneratorRequest::MergePartialFromCodedStream(
         if (input->ExpectAtEnd()) return true;
         break;
       }
-      
+
       default: {
       handle_uninterpreted:
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -312,7 +315,7 @@ void CodeGeneratorRequest::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteString(
       1, this->file_to_generate(i), output);
   }
-  
+
   // optional string parameter = 2;
   if (has_parameter()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
@@ -321,13 +324,13 @@ void CodeGeneratorRequest::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteString(
       2, this->parameter(), output);
   }
-  
+
   // repeated .google.protobuf.FileDescriptorProto proto_file = 15;
   for (int i = 0; i < this->proto_file_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       15, this->proto_file(i), output);
   }
-  
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -344,7 +347,7 @@ void CodeGeneratorRequest::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::
       WriteStringToArray(1, this->file_to_generate(i), target);
   }
-  
+
   // optional string parameter = 2;
   if (has_parameter()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
@@ -354,14 +357,14 @@ void CodeGeneratorRequest::SerializeWithCachedSizes(
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         2, this->parameter(), target);
   }
-  
+
   // repeated .google.protobuf.FileDescriptorProto proto_file = 15;
   for (int i = 0; i < this->proto_file_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         15, this->proto_file(i), target);
   }
-  
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -371,7 +374,7 @@ void CodeGeneratorRequest::SerializeWithCachedSizes(
 
 int CodeGeneratorRequest::ByteSize() const {
   int total_size = 0;
-  
+
   if (_has_bits_[1 / 32] & (0xffu << (1 % 32))) {
     // optional string parameter = 2;
     if (has_parameter()) {
@@ -379,7 +382,7 @@ int CodeGeneratorRequest::ByteSize() const {
         ::google::protobuf::internal::WireFormatLite::StringSize(
           this->parameter());
     }
-    
+
   }
   // repeated string file_to_generate = 1;
   total_size += 1 * this->file_to_generate_size();
@@ -387,7 +390,7 @@ int CodeGeneratorRequest::ByteSize() const {
     total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
       this->file_to_generate(i));
   }
-  
+
   // repeated .google.protobuf.FileDescriptorProto proto_file = 15;
   total_size += 1 * this->proto_file_size();
   for (int i = 0; i < this->proto_file_size(); i++) {
@@ -395,7 +398,7 @@ int CodeGeneratorRequest::ByteSize() const {
       ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
         this->proto_file(i));
   }
-  
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -444,7 +447,7 @@ void CodeGeneratorRequest::CopyFrom(const CodeGeneratorRequest& from) {
 }
 
 bool CodeGeneratorRequest::IsInitialized() const {
-  
+
   for (int i = 0; i < proto_file_size(); i++) {
     if (!this->proto_file(i).IsInitialized()) return false;
   }
@@ -583,7 +586,7 @@ bool CodeGeneratorResponse_File::MergePartialFromCodedStream(
         if (input->ExpectTag(18)) goto parse_insertion_point;
         break;
       }
-      
+
       // optional string insertion_point = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -600,7 +603,7 @@ bool CodeGeneratorResponse_File::MergePartialFromCodedStream(
         if (input->ExpectTag(122)) goto parse_content;
         break;
       }
-      
+
       // optional string content = 15;
       case 15: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -617,7 +620,7 @@ bool CodeGeneratorResponse_File::MergePartialFromCodedStream(
         if (input->ExpectAtEnd()) return true;
         break;
       }
-      
+
       default: {
       handle_uninterpreted:
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -644,7 +647,7 @@ void CodeGeneratorResponse_File::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteString(
       1, this->name(), output);
   }
-  
+
   // optional string insertion_point = 2;
   if (has_insertion_point()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
@@ -653,7 +656,7 @@ void CodeGeneratorResponse_File::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteString(
       2, this->insertion_point(), output);
   }
-  
+
   // optional string content = 15;
   if (has_content()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
@@ -662,7 +665,7 @@ void CodeGeneratorResponse_File::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteString(
       15, this->content(), output);
   }
-  
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -680,7 +683,7 @@ void CodeGeneratorResponse_File::SerializeWithCachedSizes(
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         1, this->name(), target);
   }
-  
+
   // optional string insertion_point = 2;
   if (has_insertion_point()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
@@ -690,7 +693,7 @@ void CodeGeneratorResponse_File::SerializeWithCachedSizes(
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         2, this->insertion_point(), target);
   }
-  
+
   // optional string content = 15;
   if (has_content()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
@@ -700,7 +703,7 @@ void CodeGeneratorResponse_File::SerializeWithCachedSizes(
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         15, this->content(), target);
   }
-  
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -710,7 +713,7 @@ void CodeGeneratorResponse_File::SerializeWithCachedSizes(
 
 int CodeGeneratorResponse_File::ByteSize() const {
   int total_size = 0;
-  
+
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     // optional string name = 1;
     if (has_name()) {
@@ -718,21 +721,21 @@ int CodeGeneratorResponse_File::ByteSize() const {
         ::google::protobuf::internal::WireFormatLite::StringSize(
           this->name());
     }
-    
+
     // optional string insertion_point = 2;
     if (has_insertion_point()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::StringSize(
           this->insertion_point());
     }
-    
+
     // optional string content = 15;
     if (has_content()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::StringSize(
           this->content());
     }
-    
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -786,7 +789,7 @@ void CodeGeneratorResponse_File::CopyFrom(const CodeGeneratorResponse_File& from
 }
 
 bool CodeGeneratorResponse_File::IsInitialized() const {
-  
+
   return true;
 }
 
@@ -904,7 +907,7 @@ bool CodeGeneratorResponse::MergePartialFromCodedStream(
         if (input->ExpectTag(122)) goto parse_file;
         break;
       }
-      
+
       // repeated .google.protobuf.compiler.CodeGeneratorResponse.File file = 15;
       case 15: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -919,7 +922,7 @@ bool CodeGeneratorResponse::MergePartialFromCodedStream(
         if (input->ExpectAtEnd()) return true;
         break;
       }
-      
+
       default: {
       handle_uninterpreted:
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -946,13 +949,13 @@ void CodeGeneratorResponse::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteString(
       1, this->error(), output);
   }
-  
+
   // repeated .google.protobuf.compiler.CodeGeneratorResponse.File file = 15;
   for (int i = 0; i < this->file_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       15, this->file(i), output);
   }
-  
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -970,14 +973,14 @@ void CodeGeneratorResponse::SerializeWithCachedSizes(
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         1, this->error(), target);
   }
-  
+
   // repeated .google.protobuf.compiler.CodeGeneratorResponse.File file = 15;
   for (int i = 0; i < this->file_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         15, this->file(i), target);
   }
-  
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -987,7 +990,7 @@ void CodeGeneratorResponse::SerializeWithCachedSizes(
 
 int CodeGeneratorResponse::ByteSize() const {
   int total_size = 0;
-  
+
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     // optional string error = 1;
     if (has_error()) {
@@ -995,7 +998,7 @@ int CodeGeneratorResponse::ByteSize() const {
         ::google::protobuf::internal::WireFormatLite::StringSize(
           this->error());
     }
-    
+
   }
   // repeated .google.protobuf.compiler.CodeGeneratorResponse.File file = 15;
   total_size += 1 * this->file_size();
@@ -1004,7 +1007,7 @@ int CodeGeneratorResponse::ByteSize() const {
       ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
         this->file(i));
   }
-  
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -1052,7 +1055,7 @@ void CodeGeneratorResponse::CopyFrom(const CodeGeneratorResponse& from) {
 }
 
 bool CodeGeneratorResponse::IsInitialized() const {
-  
+
   return true;
 }