Regenerated code with changes

1 files changed, 125 insertions, 101 deletions

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestXmlSerializerTestProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestXmlSerializerTestProtoFile.cs
index c0e53348..e87fb1c2 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestXmlSerializerTestProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestXmlSerializerTestProtoFile.cs
@@ -138,7 +138,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestXmlChild : pb::GeneratedMessage<TestXmlChild, TestXmlChild.Builder> {

-    private static readonly TestXmlChild defaultInstance = new Builder().BuildPartial();

+    private static readonly TestXmlChild defaultInstance = new TestXmlChild().MakeReadOnly();

     private static readonly string[] _testXmlChildFieldNames = new string[] { "binary", "options" };

     private static readonly uint[] _testXmlChildFieldTags = new uint[] { 34, 24 };

     public static TestXmlChild DefaultInstance {

@@ -146,7 +146,7 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     public override TestXmlChild DefaultInstanceForType {

-      get { return defaultInstance; }

+      get { return DefaultInstance; }

     }

     

     protected override TestXmlChild ThisMessage {

@@ -257,6 +257,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     public static TestXmlChild ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {

       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();

     }

+    private TestXmlChild MakeReadOnly() {

+      options_.MakeReadOnly();

+      return this;

+    }

+    

     public static Builder CreateBuilder() { return new Builder(); }

     public override Builder ToBuilder() { return CreateBuilder(this); }

     public override Builder CreateBuilderForType() { return new Builder(); }

@@ -272,22 +277,22 @@ namespace Google.ProtocolBuffers.TestProtos {
         get { return this; }

       }

       public Builder() {

-        result = DefaultInstance ?? new TestXmlChild();

-        builderIsReadOnly = result == DefaultInstance;

+        result = DefaultInstance;

+        resultIsReadOnly = true;

       }

       internal Builder(TestXmlChild cloneFrom) {

         result = cloneFrom;

-        builderIsReadOnly = true;

+        resultIsReadOnly = true;

       }

       

-      bool builderIsReadOnly;

-      TestXmlChild result;

+      private bool resultIsReadOnly;

+      private TestXmlChild result;

       

       private TestXmlChild PrepareBuilder() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           TestXmlChild original = result;

           result = new TestXmlChild();

-          builderIsReadOnly = false;

+          resultIsReadOnly = false;

           MergeFrom(original);

         }

         return result;

@@ -302,13 +307,13 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       public override Builder Clear() {

-        result = DefaultInstance ?? new TestXmlChild();

-        builderIsReadOnly = true;

+        result = DefaultInstance;

+        resultIsReadOnly = true;

         return this;

       }

       

       public override Builder Clone() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           return new Builder(result);

         } else {

           return new Builder().MergeFrom(result);

@@ -324,12 +329,11 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       public override TestXmlChild BuildPartial() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           return result;

         }

-        result.options_.MakeReadOnly();

-        builderIsReadOnly = true;

-        return result;

+        resultIsReadOnly = true;

+        return result.MakeReadOnly();

       }

       

       public override Builder MergeFrom(pb::IMessage other) {

@@ -481,7 +485,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestXmlNoFields : pb::GeneratedMessage<TestXmlNoFields, TestXmlNoFields.Builder> {

-    private static readonly TestXmlNoFields defaultInstance = new Builder().BuildPartial();

+    private static readonly TestXmlNoFields defaultInstance = new TestXmlNoFields().MakeReadOnly();

     private static readonly string[] _testXmlNoFieldsFieldNames = new string[] {  };

     private static readonly uint[] _testXmlNoFieldsFieldTags = new uint[] {  };

     public static TestXmlNoFields DefaultInstance {

@@ -489,7 +493,7 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     public override TestXmlNoFields DefaultInstanceForType {

-      get { return defaultInstance; }

+      get { return DefaultInstance; }

     }

     

     protected override TestXmlNoFields ThisMessage {

@@ -559,6 +563,10 @@ namespace Google.ProtocolBuffers.TestProtos {
     public static TestXmlNoFields ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {

       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();

     }

+    private TestXmlNoFields MakeReadOnly() {

+      return this;

+    }

+    

     public static Builder CreateBuilder() { return new Builder(); }

     public override Builder ToBuilder() { return CreateBuilder(this); }

     public override Builder CreateBuilderForType() { return new Builder(); }

@@ -574,22 +582,22 @@ namespace Google.ProtocolBuffers.TestProtos {
         get { return this; }

       }

       public Builder() {

-        result = DefaultInstance ?? new TestXmlNoFields();

-        builderIsReadOnly = result == DefaultInstance;

+        result = DefaultInstance;

+        resultIsReadOnly = true;

       }

       internal Builder(TestXmlNoFields cloneFrom) {

         result = cloneFrom;

-        builderIsReadOnly = true;

+        resultIsReadOnly = true;

       }

       

-      bool builderIsReadOnly;

-      TestXmlNoFields result;

+      private bool resultIsReadOnly;

+      private TestXmlNoFields result;

       

       private TestXmlNoFields PrepareBuilder() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           TestXmlNoFields original = result;

           result = new TestXmlNoFields();

-          builderIsReadOnly = false;

+          resultIsReadOnly = false;

           MergeFrom(original);

         }

         return result;

@@ -604,13 +612,13 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       public override Builder Clear() {

-        result = DefaultInstance ?? new TestXmlNoFields();

-        builderIsReadOnly = true;

+        result = DefaultInstance;

+        resultIsReadOnly = true;

         return this;

       }

       

       public override Builder Clone() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           return new Builder(result);

         } else {

           return new Builder().MergeFrom(result);

@@ -626,11 +634,11 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       public override TestXmlNoFields BuildPartial() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           return result;

         }

-        builderIsReadOnly = true;

-        return result;

+        resultIsReadOnly = true;

+        return result.MakeReadOnly();

       }

       

       public override Builder MergeFrom(pb::IMessage other) {

@@ -707,7 +715,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestXmlRescursive : pb::GeneratedMessage<TestXmlRescursive, TestXmlRescursive.Builder> {

-    private static readonly TestXmlRescursive defaultInstance = new Builder().BuildPartial();

+    private static readonly TestXmlRescursive defaultInstance = new TestXmlRescursive().MakeReadOnly();

     private static readonly string[] _testXmlRescursiveFieldNames = new string[] { "child" };

     private static readonly uint[] _testXmlRescursiveFieldTags = new uint[] { 10 };

     public static TestXmlRescursive DefaultInstance {

@@ -715,7 +723,7 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     public override TestXmlRescursive DefaultInstanceForType {

-      get { return defaultInstance; }

+      get { return DefaultInstance; }

     }

     

     protected override TestXmlRescursive ThisMessage {

@@ -732,12 +740,12 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     public const int ChildFieldNumber = 1;

     private bool hasChild;

-    private global::Google.ProtocolBuffers.TestProtos.TestXmlRescursive child_ = global::Google.ProtocolBuffers.TestProtos.TestXmlRescursive.DefaultInstance;

+    private global::Google.ProtocolBuffers.TestProtos.TestXmlRescursive child_;

     public bool HasChild {

       get { return hasChild; }

     }

     public global::Google.ProtocolBuffers.TestProtos.TestXmlRescursive Child {

-      get { return child_; }

+      get { return child_ ?? global::Google.ProtocolBuffers.TestProtos.TestXmlRescursive.DefaultInstance; }

     }

     

     public override bool IsInitialized {

@@ -801,6 +809,10 @@ namespace Google.ProtocolBuffers.TestProtos {
     public static TestXmlRescursive ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {

       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();

     }

+    private TestXmlRescursive MakeReadOnly() {

+      return this;

+    }

+    

     public static Builder CreateBuilder() { return new Builder(); }

     public override Builder ToBuilder() { return CreateBuilder(this); }

     public override Builder CreateBuilderForType() { return new Builder(); }

@@ -816,22 +828,22 @@ namespace Google.ProtocolBuffers.TestProtos {
         get { return this; }

       }

       public Builder() {

-        result = DefaultInstance ?? new TestXmlRescursive();

-        builderIsReadOnly = result == DefaultInstance;

+        result = DefaultInstance;

+        resultIsReadOnly = true;

       }

       internal Builder(TestXmlRescursive cloneFrom) {

         result = cloneFrom;

-        builderIsReadOnly = true;

+        resultIsReadOnly = true;

       }

       

-      bool builderIsReadOnly;

-      TestXmlRescursive result;

+      private bool resultIsReadOnly;

+      private TestXmlRescursive result;

       

       private TestXmlRescursive PrepareBuilder() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           TestXmlRescursive original = result;

           result = new TestXmlRescursive();

-          builderIsReadOnly = false;

+          resultIsReadOnly = false;

           MergeFrom(original);

         }

         return result;

@@ -846,13 +858,13 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       public override Builder Clear() {

-        result = DefaultInstance ?? new TestXmlRescursive();

-        builderIsReadOnly = true;

+        result = DefaultInstance;

+        resultIsReadOnly = true;

         return this;

       }

       

       public override Builder Clone() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           return new Builder(result);

         } else {

           return new Builder().MergeFrom(result);

@@ -868,11 +880,11 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       public override TestXmlRescursive BuildPartial() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           return result;

         }

-        builderIsReadOnly = true;

-        return result;

+        resultIsReadOnly = true;

+        return result.MakeReadOnly();

       }

       

       public override Builder MergeFrom(pb::IMessage other) {

@@ -988,7 +1000,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       public Builder ClearChild() {

         PrepareBuilder();

         result.hasChild = false;

-        result.child_ = global::Google.ProtocolBuffers.TestProtos.TestXmlRescursive.DefaultInstance;

+        result.child_ = null;

         return this;

       }

     }

@@ -1001,7 +1013,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestXmlMessage : pb::ExtendableMessage<TestXmlMessage, TestXmlMessage.Builder> {

-    private static readonly TestXmlMessage defaultInstance = new Builder().BuildPartial();

+    private static readonly TestXmlMessage defaultInstance = new TestXmlMessage().MakeReadOnly();

     private static readonly string[] _testXmlMessageFieldNames = new string[] { "child", "children", "number", "numbers", "text", "textlines", "valid" };

     private static readonly uint[] _testXmlMessageFieldTags = new uint[] { 10, 3211, 48, 16, 26, 5602, 40 };

     public static TestXmlMessage DefaultInstance {

@@ -1009,7 +1021,7 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     public override TestXmlMessage DefaultInstanceForType {

-      get { return defaultInstance; }

+      get { return DefaultInstance; }

     }

     

     protected override TestXmlMessage ThisMessage {

@@ -1033,7 +1045,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class Children : pb::GeneratedMessage<Children, Children.Builder> {

-        private static readonly Children defaultInstance = new Builder().BuildPartial();

+        private static readonly Children defaultInstance = new Children().MakeReadOnly();

         private static readonly string[] _childrenFieldNames = new string[] { "binary", "options" };

         private static readonly uint[] _childrenFieldTags = new uint[] { 34, 24 };

         public static Children DefaultInstance {

@@ -1041,7 +1053,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         public override Children DefaultInstanceForType {

-          get { return defaultInstance; }

+          get { return DefaultInstance; }

         }

         

         protected override Children ThisMessage {

@@ -1152,6 +1164,11 @@ namespace Google.ProtocolBuffers.TestProtos {
         public static Children ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {

           return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();

         }

+        private Children MakeReadOnly() {

+          options_.MakeReadOnly();

+          return this;

+        }

+        

         public static Builder CreateBuilder() { return new Builder(); }

         public override Builder ToBuilder() { return CreateBuilder(this); }

         public override Builder CreateBuilderForType() { return new Builder(); }

@@ -1167,22 +1184,22 @@ namespace Google.ProtocolBuffers.TestProtos {
             get { return this; }

           }

           public Builder() {

-            result = DefaultInstance ?? new Children();

-            builderIsReadOnly = result == DefaultInstance;

+            result = DefaultInstance;

+            resultIsReadOnly = true;

           }

           internal Builder(Children cloneFrom) {

             result = cloneFrom;

-            builderIsReadOnly = true;

+            resultIsReadOnly = true;

           }

           

-          bool builderIsReadOnly;

-          Children result;

+          private bool resultIsReadOnly;

+          private Children result;

           

           private Children PrepareBuilder() {

-            if (builderIsReadOnly) {

+            if (resultIsReadOnly) {

               Children original = result;

               result = new Children();

-              builderIsReadOnly = false;

+              resultIsReadOnly = false;

               MergeFrom(original);

             }

             return result;

@@ -1197,13 +1214,13 @@ namespace Google.ProtocolBuffers.TestProtos {
           }

           

           public override Builder Clear() {

-            result = DefaultInstance ?? new Children();

-            builderIsReadOnly = true;

+            result = DefaultInstance;

+            resultIsReadOnly = true;

             return this;

           }

           

           public override Builder Clone() {

-            if (builderIsReadOnly) {

+            if (resultIsReadOnly) {

               return new Builder(result);

             } else {

               return new Builder().MergeFrom(result);

@@ -1219,12 +1236,11 @@ namespace Google.ProtocolBuffers.TestProtos {
           }

           

           public override Children BuildPartial() {

-            if (builderIsReadOnly) {

+            if (resultIsReadOnly) {

               return result;

             }

-            result.options_.MakeReadOnly();

-            builderIsReadOnly = true;

-            return result;

+            resultIsReadOnly = true;

+            return result.MakeReadOnly();

           }

           

           public override Builder MergeFrom(pb::IMessage other) {

@@ -1431,12 +1447,12 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     public const int ChildFieldNumber = 1;

     private bool hasChild;

-    private global::Google.ProtocolBuffers.TestProtos.TestXmlChild child_ = global::Google.ProtocolBuffers.TestProtos.TestXmlChild.DefaultInstance;

+    private global::Google.ProtocolBuffers.TestProtos.TestXmlChild child_;

     public bool HasChild {

       get { return hasChild; }

     }

     public global::Google.ProtocolBuffers.TestProtos.TestXmlChild Child {

-      get { return child_; }

+      get { return child_ ?? global::Google.ProtocolBuffers.TestProtos.TestXmlChild.DefaultInstance; }

     }

     

     public const int ChildrenFieldNumber = 401;

@@ -1562,6 +1578,13 @@ namespace Google.ProtocolBuffers.TestProtos {
     public static TestXmlMessage ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {

       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();

     }

+    private TestXmlMessage MakeReadOnly() {

+      numbers_.MakeReadOnly();

+      textlines_.MakeReadOnly();

+      children_.MakeReadOnly();

+      return this;

+    }

+    

     public static Builder CreateBuilder() { return new Builder(); }

     public override Builder ToBuilder() { return CreateBuilder(this); }

     public override Builder CreateBuilderForType() { return new Builder(); }

@@ -1577,22 +1600,22 @@ namespace Google.ProtocolBuffers.TestProtos {
         get { return this; }

       }

       public Builder() {

-        result = DefaultInstance ?? new TestXmlMessage();

-        builderIsReadOnly = result == DefaultInstance;

+        result = DefaultInstance;

+        resultIsReadOnly = true;

       }

       internal Builder(TestXmlMessage cloneFrom) {

         result = cloneFrom;

-        builderIsReadOnly = true;

+        resultIsReadOnly = true;

       }

       

-      bool builderIsReadOnly;

-      TestXmlMessage result;

+      private bool resultIsReadOnly;

+      private TestXmlMessage result;

       

       private TestXmlMessage PrepareBuilder() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           TestXmlMessage original = result;

           result = new TestXmlMessage();

-          builderIsReadOnly = false;

+          resultIsReadOnly = false;

           MergeFrom(original);

         }

         return result;

@@ -1607,13 +1630,13 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       public override Builder Clear() {

-        result = DefaultInstance ?? new TestXmlMessage();

-        builderIsReadOnly = true;

+        result = DefaultInstance;

+        resultIsReadOnly = true;

         return this;

       }

       

       public override Builder Clone() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           return new Builder(result);

         } else {

           return new Builder().MergeFrom(result);

@@ -1629,14 +1652,11 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       public override TestXmlMessage BuildPartial() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           return result;

         }

-        result.numbers_.MakeReadOnly();

-        result.textlines_.MakeReadOnly();

-        result.children_.MakeReadOnly();

-        builderIsReadOnly = true;

-        return result;

+        resultIsReadOnly = true;

+        return result.MakeReadOnly();

       }

       

       public override Builder MergeFrom(pb::IMessage other) {

@@ -1919,7 +1939,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       public Builder ClearChild() {

         PrepareBuilder();

         result.hasChild = false;

-        result.child_ = global::Google.ProtocolBuffers.TestProtos.TestXmlChild.DefaultInstance;

+        result.child_ = null;

         return this;

       }

       

@@ -1976,7 +1996,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestXmlExtension : pb::GeneratedMessage<TestXmlExtension, TestXmlExtension.Builder> {

-    private static readonly TestXmlExtension defaultInstance = new Builder().BuildPartial();

+    private static readonly TestXmlExtension defaultInstance = new TestXmlExtension().MakeReadOnly();

     private static readonly string[] _testXmlExtensionFieldNames = new string[] { "number" };

     private static readonly uint[] _testXmlExtensionFieldTags = new uint[] { 8 };

     public static TestXmlExtension DefaultInstance {

@@ -1984,7 +2004,7 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     public override TestXmlExtension DefaultInstanceForType {

-      get { return defaultInstance; }

+      get { return DefaultInstance; }

     }

     

     protected override TestXmlExtension ThisMessage {

@@ -2071,6 +2091,10 @@ namespace Google.ProtocolBuffers.TestProtos {
     public static TestXmlExtension ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {

       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();

     }

+    private TestXmlExtension MakeReadOnly() {

+      return this;

+    }

+    

     public static Builder CreateBuilder() { return new Builder(); }

     public override Builder ToBuilder() { return CreateBuilder(this); }

     public override Builder CreateBuilderForType() { return new Builder(); }

@@ -2086,22 +2110,22 @@ namespace Google.ProtocolBuffers.TestProtos {
         get { return this; }

       }

       public Builder() {

-        result = DefaultInstance ?? new TestXmlExtension();

-        builderIsReadOnly = result == DefaultInstance;

+        result = DefaultInstance;

+        resultIsReadOnly = true;

       }

       internal Builder(TestXmlExtension cloneFrom) {

         result = cloneFrom;

-        builderIsReadOnly = true;

+        resultIsReadOnly = true;

       }

       

-      bool builderIsReadOnly;

-      TestXmlExtension result;

+      private bool resultIsReadOnly;

+      private TestXmlExtension result;

       

       private TestXmlExtension PrepareBuilder() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           TestXmlExtension original = result;

           result = new TestXmlExtension();

-          builderIsReadOnly = false;

+          resultIsReadOnly = false;

           MergeFrom(original);

         }

         return result;

@@ -2116,13 +2140,13 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       public override Builder Clear() {

-        result = DefaultInstance ?? new TestXmlExtension();

-        builderIsReadOnly = true;

+        result = DefaultInstance;

+        resultIsReadOnly = true;

         return this;

       }

       

       public override Builder Clone() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           return new Builder(result);

         } else {

           return new Builder().MergeFrom(result);

@@ -2138,11 +2162,11 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       public override TestXmlExtension BuildPartial() {

-        if (builderIsReadOnly) {

+        if (resultIsReadOnly) {

           return result;

         }

-        builderIsReadOnly = true;

-        return result;

+        resultIsReadOnly = true;

+        return result.MakeReadOnly();

       }

       

       public override Builder MergeFrom(pb::IMessage other) {