Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

third_party/protobuf/java/core/src/main/java/com/google/protobuf/GeneratedMessageLite.java

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 21 matching lines @@
 
 import com.google.protobuf.AbstractMessageLite.Builder.LimitedInputStream;
 import com.google.protobuf.GeneratedMessageLite.EqualsVisitor.NotEqualsException;
 import com.google.protobuf.Internal.BooleanList;
 import com.google.protobuf.Internal.DoubleList;
 import com.google.protobuf.Internal.FloatList;
 import com.google.protobuf.Internal.IntList;
 import com.google.protobuf.Internal.LongList;
 import com.google.protobuf.Internal.ProtobufList;
 import com.google.protobuf.WireFormat.FieldType;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectStreamException;
 import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
 /**
  * Lite version of {@link GeneratedMessage}.
  *
  * @author kenton@google.com Kenton Varda
  */
 public abstract class GeneratedMessageLite<
     MessageType extends GeneratedMessageLite<MessageType, BuilderType>,
-    BuilderType extends GeneratedMessageLite.Builder<MessageType, BuilderType>>
+    BuilderType extends GeneratedMessageLite.Builder<MessageType, BuilderType>> 
         extends AbstractMessageLite<MessageType, BuilderType> {
 
   /** For use by generated code only. Lazily initialized to reduce allocations. */
   protected UnknownFieldSetLite unknownFields = UnknownFieldSetLite.getDefaultInstance();
-
+  
   /** For use by generated code only.  */
   protected int memoizedSerializedSize = -1;
-
+  
   @Override
   @SuppressWarnings("unchecked") // Guaranteed by runtime.
   public final Parser<MessageType> getParserForType() {
     return (Parser<MessageType>) dynamicMethod(MethodToInvoke.GET_PARSER);
   }
 
   @Override
   @SuppressWarnings("unchecked") // Guaranteed by runtime.
   public final MessageType getDefaultInstanceForType() {
     return (MessageType) dynamicMethod(MethodToInvoke.GET_DEFAULT_INSTANCE);
@@ skipping 25 matching lines @@
   @SuppressWarnings("unchecked") // Guaranteed by runtime
   @Override
   public int hashCode() {
     if (memoizedHashCode == 0) {
       HashCodeVisitor visitor = new HashCodeVisitor();
       visit(visitor, (MessageType) this);
       memoizedHashCode = visitor.hashCode;
     }
     return memoizedHashCode;
   }
-
+  
   @SuppressWarnings("unchecked") // Guaranteed by runtime
   int hashCode(HashCodeVisitor visitor) {
     if (memoizedHashCode == 0) {
       int inProgressHashCode = visitor.hashCode;
       visitor.hashCode = 0;
       visit(visitor, (MessageType) this);
       memoizedHashCode = visitor.hashCode;
       visitor.hashCode = inProgressHashCode;
     }
     return memoizedHashCode;
   }
-
+  
   @SuppressWarnings("unchecked") // Guaranteed by isInstance + runtime
   @Override
   public boolean equals(Object other) {
     if (this == other) {
       return true;
     }
-
+    
     if (!getDefaultInstanceForType().getClass().isInstance(other)) {
       return false;
     }
-
+    
     try {
       visit(EqualsVisitor.INSTANCE, (MessageType) other);
     } catch (NotEqualsException e) {
       return false;
     }
     return true;
   }
-
+  
   /**
    * Same as {@link #equals(Object)} but throws {@code NotEqualsException}.
    */
   @SuppressWarnings("unchecked") // Guaranteed by isInstance + runtime
   boolean equals(EqualsVisitor visitor, MessageLite other) {
     if (this == other) {
       return true;
     }
-
+    
     if (!getDefaultInstanceForType().getClass().isInstance(other)) {
       return false;
     }
 
     visit(visitor, (MessageType) other);
     return true;
   }
-
+  
   // The general strategy for unknown fields is to use an UnknownFieldSetLite that is treated as
   // mutable during the parsing constructor and immutable after. This allows us to avoid
   // any unnecessary intermediary allocations while reducing the generated code size.
 
   /**
    * Lazily initializes unknown fields.
    */
   private final void ensureUnknownFieldsInitialized() {
     if (unknownFields == UnknownFieldSetLite.getDefaultInstance()) {
       unknownFields = UnknownFieldSetLite.newInstance();
     }
   }
-
+  
   /**
    * Called by subclasses to parse an unknown field. For use by generated code only.
-   *
+   * 
    * @return {@code true} unless the tag is an end-group tag.
    */
   protected boolean parseUnknownField(int tag, CodedInputStream input) throws IOException {
     // This will avoid the allocation of unknown fields when a group tag is encountered.
     if (WireFormat.getTagWireType(tag) == WireFormat.WIRETYPE_END_GROUP) {
       return false;
     }
-
+    
     ensureUnknownFieldsInitialized();
     return unknownFields.mergeFieldFrom(tag, input);
   }
 
   /**
    * Called by subclasses to parse an unknown field. For use by generated code only.
    */
   protected void mergeVarintField(int tag, int value) {
     ensureUnknownFieldsInitialized();
     unknownFields.mergeVarintField(tag, value);
   }
-
+  
   /**
    * Called by subclasses to parse an unknown field. For use by generated code only.
    */
   protected void mergeLengthDelimitedField(int fieldNumber, ByteString value) {
     ensureUnknownFieldsInitialized();
     unknownFields.mergeLengthDelimitedField(fieldNumber, value);
   }
-
+  
   /**
    * Called by subclasses to complete parsing. For use by generated code only.
    */
   protected void makeImmutable() {
     dynamicMethod(MethodToInvoke.MAKE_IMMUTABLE);
 
     unknownFields.makeImmutable();
   }
 
   @Override
@@ skipping 66 matching lines @@
    * Same as {@link #dynamicMethod(MethodToInvoke, Object, Object)} with {@code null} padding.
    */
   protected Object dynamicMethod(MethodToInvoke method) {
     return dynamicMethod(method, null, null);
   }
 
   void visit(Visitor visitor, MessageType other) {
     dynamicMethod(MethodToInvoke.VISIT, visitor, other);
     unknownFields = visitor.visitUnknownFields(unknownFields, other.unknownFields);
   }
-
+  
   /**
    * Merge some unknown fields into the {@link UnknownFieldSetLite} for this
    * message.
    *
    * <p>For use by generated code only.
    */
   protected final void mergeUnknownFields(UnknownFieldSetLite unknownFields) {
     this.unknownFields = UnknownFieldSetLite.mutableCopyOf(this.unknownFields, unknownFields);
   }
 
@@ skipping 46 matching lines @@
           (BuilderType) getDefaultInstanceForType().newBuilderForType();
       builder.mergeFrom(buildPartial());
       return builder;
     }
 
     @Override
     public MessageType buildPartial() {
       if (isBuilt) {
         return instance;
       }
-
+      
       instance.makeImmutable();
-
+      
       isBuilt = true;
       return instance;
     }
 
     @Override
     public final MessageType build() {
       MessageType result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
-
+    
     @Override
     protected BuilderType internalMergeFrom(MessageType message) {
       return mergeFrom(message);
     }
-
+    
     /** All subclasses implement this. */
     public BuilderType mergeFrom(MessageType message) {
       copyOnWrite();
       instance.visit(MergeFromVisitor.INSTANCE, message);
       return (BuilderType) this;
     }
-
+    
     @Override
     public MessageType getDefaultInstanceForType() {
       return defaultInstance;
     }
-
+    
     @Override
     public BuilderType mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws IOException {
       copyOnWrite();
       try {
         instance.dynamicMethod(MethodToInvoke.MERGE_FROM_STREAM, input, extensionRegistry);
       } catch (RuntimeException e) {
         if (e.getCause() instanceof IOException) {
@@ skipping 54 matching lines @@
         extensions = extensions.clone();
       }
       extensions.mergeFrom(((ExtendableMessage) other).extensions);
     }
 
     @Override
     final void visit(Visitor visitor, MessageType other) {
       super.visit(visitor, other);
       extensions = visitor.visitExtensions(extensions, other.extensions);
     }
-
+    
     /**
      * Parse an unknown field or an extension. For use by generated code only.
-     *
+     * 
      * <p>For use by generated code only.
-     *
+     * 
      * @return {@code true} unless the tag is an end-group tag.
      */
     protected <MessageType extends MessageLite> boolean parseUnknownField(
         MessageType defaultInstance,
         CodedInputStream input,
         ExtensionRegistryLite extensionRegistry,
         int tag) throws IOException {
+      int wireType = WireFormat.getTagWireType(tag);
       int fieldNumber = WireFormat.getTagFieldNumber(tag);
 
       // TODO(dweis): How much bytecode would be saved by not requiring the generated code to
       //     provide the default instance?
       GeneratedExtension<MessageType, ?> extension = extensionRegistry.findLiteExtensionByNumber(
           defaultInstance, fieldNumber);
 
-      return parseExtension(input, extensionRegistry, extension, tag, fieldNumber);
-    }
-
-    private boolean parseExtension(
-        CodedInputStream input,
-        ExtensionRegistryLite extensionRegistry,
-        GeneratedExtension<?, ?> extension,
-        int tag,
-        int fieldNumber)
-        throws IOException {
-      int wireType = WireFormat.getTagWireType(tag);
       boolean unknown = false;
       boolean packed = false;
       if (extension == null) {
         unknown = true;  // Unknown field.
       } else if (wireType == FieldSet.getWireFormatForFieldType(
                    extension.descriptor.getLiteType(),
                    false  /* isPacked */)) {
         packed = false;  // Normal, unpacked value.
       } else if (extension.descriptor.isRepeated &&
                  extension.descriptor.type.isPackable() &&
                  wireType == FieldSet.getWireFormatForFieldType(
                    extension.descriptor.getLiteType(),
                    true  /* isPacked */)) {
         packed = true;  // Packed value.
       } else {
         unknown = true;  // Wrong wire type.
       }
 
       if (unknown) {  // Unknown field or wrong wire type.  Skip.
         return parseUnknownField(tag, input);
       }
-      
+
       if (packed) {
         int length = input.readRawVarint32();
         int limit = input.pushLimit(length);
         if (extension.descriptor.getLiteType() == WireFormat.FieldType.ENUM) {
           while (input.getBytesUntilLimit() > 0) {
             int rawValue = input.readEnum();
             Object value =
                 extension.descriptor.getEnumType().findValueByNumber(rawValue);
             if (value == null) {
               // If the number isn't recognized as a valid value for this
@@ skipping 58 matching lines @@
         }
 
         if (extension.descriptor.isRepeated()) {
           extensions.addRepeatedField(extension.descriptor,
                                       extension.singularToFieldSetType(value));
         } else {
           extensions.setField(extension.descriptor,
                               extension.singularToFieldSetType(value));
         }
       }
+
       return true;
     }
     
-    /**
-     * Parse an unknown field or an extension. For use by generated code only.
-     *
-     * <p>For use by generated code only.
-     *
-     * @return {@code true} unless the tag is an end-group tag.
-     */
-    protected <MessageType extends MessageLite> boolean parseUnknownFieldAsMessageSet(
-        MessageType defaultInstance,
-        CodedInputStream input,
-        ExtensionRegistryLite extensionRegistry,
-        int tag)
-        throws IOException {
-
-      if (tag == WireFormat.MESSAGE_SET_ITEM_TAG) {
-        mergeMessageSetExtensionFromCodedStream(defaultInstance, input, extensionRegistry);
-        return true;
-      }
-
-      // TODO(dweis): Do we really want to support non message set wire format in message sets?
-      // Full runtime does... So we do for now.
-      int wireType = WireFormat.getTagWireType(tag);
-      if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-        return parseUnknownField(defaultInstance, input, extensionRegistry, tag);
-      } else {
-        // TODO(dweis): Should we throw on invalid input? Full runtime does not...
-        return input.skipField(tag);
-      }
-    }
-
-    /**
-     * Merges the message set from the input stream; requires message set wire format.
-     * 
-     * @param defaultInstance the default instance of the containing message we are parsing in
-     * @param input the stream to parse from
-     * @param extensionRegistry the registry to use when parsing
-     */
-    private <MessageType extends MessageLite> void mergeMessageSetExtensionFromCodedStream(
-        MessageType defaultInstance,
-        CodedInputStream input,
-        ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      // The wire format for MessageSet is:
-      //   message MessageSet {
-      //     repeated group Item = 1 {
-      //       required int32 typeId = 2;
-      //       required bytes message = 3;
-      //     }
-      //   }
-      // "typeId" is the extension's field number.  The extension can only be
-      // a message type, where "message" contains the encoded bytes of that
-      // message.
-      //
-      // In practice, we will probably never see a MessageSet item in which
-      // the message appears before the type ID, or where either field does not
-      // appear exactly once.  However, in theory such cases are valid, so we
-      // should be prepared to accept them.
-
-      int typeId = 0;
-      ByteString rawBytes = null; // If we encounter "message" before "typeId"
-      GeneratedExtension<?, ?> extension = null;
-
-      // Read bytes from input, if we get it's type first then parse it eagerly,
-      // otherwise we store the raw bytes in a local variable.
-      while (true) {
-        final int tag = input.readTag();
-        if (tag == 0) {
-          break;
-        }
-
-        if (tag == WireFormat.MESSAGE_SET_TYPE_ID_TAG) {
-          typeId = input.readUInt32();
-          if (typeId != 0) {
-            extension = extensionRegistry.findLiteExtensionByNumber(defaultInstance, typeId);
-          }
-
-        } else if (tag == WireFormat.MESSAGE_SET_MESSAGE_TAG) {
-          if (typeId != 0) {
-            if (extension != null) {
-              // We already know the type, so we can parse directly from the
-              // input with no copying.  Hooray!
-              eagerlyMergeMessageSetExtension(input, extension, extensionRegistry, typeId);
-              rawBytes = null;
-              continue;
-            }
-          }
-          // We haven't seen a type ID yet or we want parse message lazily.
-          rawBytes = input.readBytes();
-
-        } else { // Unknown tag. Skip it.
-          if (!input.skipField(tag)) {
-            break; // End of group
-          }
-        }
-      }
-      input.checkLastTagWas(WireFormat.MESSAGE_SET_ITEM_END_TAG);
-
-      // Process the raw bytes.
-      if (rawBytes != null && typeId != 0) { // Zero is not a valid type ID.
-        if (extension != null) { // We known the type
-          mergeMessageSetExtensionFromBytes(rawBytes, extensionRegistry, extension);
-        } else { // We don't know how to parse this. Ignore it.
-          if (rawBytes != null) {
-            mergeLengthDelimitedField(typeId, rawBytes);
-          }
-        }
-      }
-    }
-
-    private void eagerlyMergeMessageSetExtension(
-        CodedInputStream input,
-        GeneratedExtension<?, ?> extension,
-        ExtensionRegistryLite extensionRegistry,
-        int typeId)
-        throws IOException {
-      int fieldNumber = typeId;
-      int tag = WireFormat.makeTag(typeId, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      parseExtension(input, extensionRegistry, extension, tag, fieldNumber);
-    }
-
-    private void mergeMessageSetExtensionFromBytes(
-        ByteString rawBytes,
-        ExtensionRegistryLite extensionRegistry,
-        GeneratedExtension<?, ?> extension)
-        throws IOException {
-      MessageLite.Builder subBuilder = null;
-      MessageLite existingValue = (MessageLite) extensions.getField(extension.descriptor);
-      if (existingValue != null) {
-        subBuilder = existingValue.toBuilder();
-      }
-      if (subBuilder == null) {
-        subBuilder = extension.getMessageDefaultInstance().newBuilderForType();
-      }
-      rawBytes.newCodedInput().readMessage(subBuilder, extensionRegistry);
-      MessageLite value = subBuilder.build();
-
-      extensions.setField(extension.descriptor, extension.singularToFieldSetType(value));
-    }
-
     private void verifyExtensionContainingType(
         final GeneratedExtension<MessageType, ?> extension) {
       if (extension.getContainingTypeDefaultInstance() !=
           getDefaultInstanceForType()) {
         // This can only happen if someone uses unchecked operations.
         throw new IllegalArgumentException(
           "This extension is for a different message type.  Please make " +
           "sure that you are not suppressing any generics type warnings.");
       }
     }
 
     /** Check if a singular extension is present. */
     @Override
     public final <Type> boolean hasExtension(final ExtensionLite<MessageType, Type> extension) {
       GeneratedExtension<MessageType, Type> extensionLite =
           checkIsLite(extension);
-
+      
       verifyExtensionContainingType(extensionLite);
       return extensions.hasField(extensionLite.descriptor);
     }
 
     /** Get the number of elements in a repeated extension. */
     @Override
     public final <Type> int getExtensionCount(
         final ExtensionLite<MessageType, List<Type>> extension) {
       GeneratedExtension<MessageType, List<Type>> extensionLite =
           checkIsLite(extension);
-
+      
       verifyExtensionContainingType(extensionLite);
       return extensions.getRepeatedFieldCount(extensionLite.descriptor);
     }
 
     /** Get the value of an extension. */
     @Override
     @SuppressWarnings("unchecked")
     public final <Type> Type getExtension(final ExtensionLite<MessageType, Type> extension) {
       GeneratedExtension<MessageType, Type> extensionLite =
           checkIsLite(extension);
-
+      
       verifyExtensionContainingType(extensionLite);
       final Object value = extensions.getField(extensionLite.descriptor);
       if (value == null) {
         return extensionLite.defaultValue;
       } else {
         return (Type) extensionLite.fromFieldSetType(value);
       }
     }
 
     /** Get one element of a repeated extension. */
@@ skipping 10 matching lines @@
     }
 
     /** Called by subclasses to check if all extensions are initialized. */
     protected boolean extensionsAreInitialized() {
       return extensions.isInitialized();
     }
 
     @Override
     protected final void makeImmutable() {
       super.makeImmutable();
-
+      
       extensions.makeImmutable();
     }
 
     /**
      * Used by subclasses to serialize extensions.  Extension ranges may be
      * interleaved with field numbers, but we must write them in canonical
      * (sorted by field number) order.  ExtensionWriter helps us write
      * individual ranges of extensions at once.
      */
     protected class ExtensionWriter {
@@ skipping 53 matching lines @@
    * Lite equivalent of {@link GeneratedMessage.ExtendableBuilder}.
    */
   @SuppressWarnings("unchecked")
   public abstract static class ExtendableBuilder<
         MessageType extends ExtendableMessage<MessageType, BuilderType>,
         BuilderType extends ExtendableBuilder<MessageType, BuilderType>>
       extends Builder<MessageType, BuilderType>
       implements ExtendableMessageOrBuilder<MessageType, BuilderType> {
     protected ExtendableBuilder(MessageType defaultInstance) {
       super(defaultInstance);
-
+      
       // TODO(dweis): This is kind of an unnecessary clone since we construct a
       //     new instance in the parent constructor which makes the extensions
       //     immutable. This extra allocation shouldn't matter in practice
       //     though.
       instance.extensions = instance.extensions.clone();
     }
 
     // For immutable message conversion.
     void internalSetExtensionSet(FieldSet<ExtensionDescriptor> extensions) {
       copyOnWrite();
       instance.extensions = extensions;
     }
 
     @Override
     protected void copyOnWrite() {
       if (!isBuilt) {
         return;
       }
-
+      
       super.copyOnWrite();
       instance.extensions = instance.extensions.clone();
     }
 
     @Override
     public final MessageType buildPartial() {
       if (isBuilt) {
         return instance;
       }
 
@@ skipping 33 matching lines @@
     }
 
     /** Get one element of a repeated extension. */
     @Override
     @SuppressWarnings("unchecked")
     public final <Type> Type getExtension(
         final ExtensionLite<MessageType, List<Type>> extension, final int index) {
       return instance.getExtension(extension, index);
     }
 
+    // This is implemented here only to work around an apparent bug in the
+    // Java compiler and/or build system.  See bug #1898463.  The mere presence
+    // of this dummy clone() implementation makes it go away.
+    @Override
+    public BuilderType clone() {
+      return super.clone();
+    }
+    
     /** Set the value of an extension. */
     public final <Type> BuilderType setExtension(
         final ExtensionLite<MessageType, Type> extension,
         final Type value) {
       GeneratedExtension<MessageType, Type> extensionLite =
           checkIsLite(extension);
-
+      
       verifyExtensionContainingType(extensionLite);
       copyOnWrite();
       instance.extensions.setField(extensionLite.descriptor, extensionLite.toFieldSetType(value));
       return (BuilderType) this;
     }
 
     /** Set the value of one element of a repeated extension. */
     public final <Type> BuilderType setExtension(
         final ExtensionLite<MessageType, List<Type>> extension,
         final int index, final Type value) {
       GeneratedExtension<MessageType, List<Type>> extensionLite =
           checkIsLite(extension);
-
+      
       verifyExtensionContainingType(extensionLite);
       copyOnWrite();
       instance.extensions.setRepeatedField(
           extensionLite.descriptor, index, extensionLite.singularToFieldSetType(value));
       return (BuilderType) this;
     }
 
     /** Append a value to a repeated extension. */
     public final <Type> BuilderType addExtension(
         final ExtensionLite<MessageType, List<Type>> extension,
         final Type value) {
       GeneratedExtension<MessageType, List<Type>> extensionLite =
           checkIsLite(extension);
-
+      
       verifyExtensionContainingType(extensionLite);
       copyOnWrite();
       instance.extensions.addRepeatedField(
           extensionLite.descriptor, extensionLite.singularToFieldSetType(value));
       return (BuilderType) this;
     }
 
     /** Clear an extension. */
     public final <Type> BuilderType clearExtension(
         final ExtensionLite<MessageType, ?> extension) {
       GeneratedExtension<MessageType, ?> extensionLite = checkIsLite(extension);
-
+      
       verifyExtensionContainingType(extensionLite);
       copyOnWrite();
       instance.extensions.clearField(extensionLite.descriptor);
       return (BuilderType) this;
     }
   }
 
   // -----------------------------------------------------------------
 
   /** For use by generated code only. */
@@ skipping 276 matching lines @@
 
   /**
    * A serialized (serializable) form of the generated message.  Stores the
    * message as a class name and a byte array.
    */
   protected static final class SerializedForm implements Serializable {
 
     public static SerializedForm of(MessageLite message) {
       return new SerializedForm(message);
     }
-
+    
     private static final long serialVersionUID = 0L;
 
     private final String messageClassName;
     private final byte[] asBytes;
 
     /**
      * Creates the serialized form by calling {@link com.google.protobuf.MessageLite#toByteArray}.
      * @param regularForm the message to serialize
      */
     SerializedForm(MessageLite regularForm) {
@@ skipping 13 matching lines @@
         java.lang.reflect.Field defaultInstanceField =
             messageClass.getDeclaredField("DEFAULT_INSTANCE");
         defaultInstanceField.setAccessible(true);
         MessageLite defaultInstance = (MessageLite) defaultInstanceField.get(null);
         return defaultInstance.newBuilderForType()
             .mergeFrom(asBytes)
             .buildPartial();
       } catch (ClassNotFoundException e) {
         throw new RuntimeException("Unable to find proto buffer class: " + messageClassName, e);
       } catch (NoSuchFieldException e) {
-        return readResolveFallback();
+        throw new RuntimeException("Unable to find DEFAULT_INSTANCE in " + messageClassName, e);
       } catch (SecurityException e) {
         throw new RuntimeException("Unable to call DEFAULT_INSTANCE in " + messageClassName, e);
       } catch (IllegalAccessException e) {
         throw new RuntimeException("Unable to call parsePartialFrom", e);
       } catch (InvalidProtocolBufferException e) {
         throw new RuntimeException("Unable to understand proto buffer", e);
       }
     }
-
-    /**
-     * @deprecated from v3.0.0-beta-3+, for compatibility with v2.5.0 and v2.6.1 generated code.
-     */
-    @Deprecated
-    private Object readResolveFallback() throws ObjectStreamException {
-      try {
-        Class<?> messageClass = Class.forName(messageClassName);
-        java.lang.reflect.Field defaultInstanceField =
-            messageClass.getDeclaredField("defaultInstance");
-        defaultInstanceField.setAccessible(true);
-        MessageLite defaultInstance = (MessageLite) defaultInstanceField.get(null);
-        return defaultInstance.newBuilderForType()
-            .mergeFrom(asBytes)
-            .buildPartial();
-      } catch (ClassNotFoundException e) {
-        throw new RuntimeException("Unable to find proto buffer class: " + messageClassName, e);
-      } catch (NoSuchFieldException e) {
-        throw new RuntimeException("Unable to find defaultInstance in " + messageClassName, e);
-      } catch (SecurityException e) {
-        throw new RuntimeException("Unable to call defaultInstance in " + messageClassName, e);
-      } catch (IllegalAccessException e) {
-        throw new RuntimeException("Unable to call parsePartialFrom", e);
-      } catch (InvalidProtocolBufferException e) {
-        throw new RuntimeException("Unable to understand proto buffer", e);
-      }
-    }
   }
-
+  
   /**
    * Checks that the {@link Extension} is Lite and returns it as a
    * {@link GeneratedExtension}.
    */
   private static <
       MessageType extends ExtendableMessage<MessageType, BuilderType>,
       BuilderType extends ExtendableBuilder<MessageType, BuilderType>,
       T>
     GeneratedExtension<MessageType, T> checkIsLite(
         ExtensionLite<MessageType, T> extension) {
     if (!extension.isLite()) {
       throw new IllegalArgumentException("Expected a lite extension.");
     }
-
+    
     return (GeneratedExtension<MessageType, T>) extension;
   }
 
   /**
    * A static helper method for checking if a message is initialized, optionally memoizing.
    * <p>
    * For use by generated code only.
    */
   protected static final <T extends GeneratedMessageLite<T, ?>> boolean isInitialized(
       T message, boolean shouldMemoize) {
     return message.dynamicMethod(MethodToInvoke.IS_INITIALIZED, shouldMemoize) != null;
-  }
-
+  } 
+  
   protected static final <T extends GeneratedMessageLite<T, ?>> void makeImmutable(T message) {
     message.dynamicMethod(MethodToInvoke.MAKE_IMMUTABLE);
   }
 
   protected static IntList emptyIntList() {
     return IntArrayList.emptyList();
   }
 
   protected static IntList mutableCopy(IntList list) {
     int size = list.size();
     return list.mutableCopyWithCapacity(
         size == 0 ? AbstractProtobufList.DEFAULT_CAPACITY : size * 2);
   }
 
   protected static LongList emptyLongList() {
     return LongArrayList.emptyList();
   }
-
+  
   protected static LongList mutableCopy(LongList list) {
     int size = list.size();
     return list.mutableCopyWithCapacity(
         size == 0 ? AbstractProtobufList.DEFAULT_CAPACITY : size * 2);
   }
 
   protected static FloatList emptyFloatList() {
     return FloatArrayList.emptyList();
   }
-
+  
   protected static FloatList mutableCopy(FloatList list) {
     int size = list.size();
     return list.mutableCopyWithCapacity(
         size == 0 ? AbstractProtobufList.DEFAULT_CAPACITY : size * 2);
   }
 
   protected static DoubleList emptyDoubleList() {
     return DoubleArrayList.emptyList();
   }
-
+  
   protected static DoubleList mutableCopy(DoubleList list) {
     int size = list.size();
     return list.mutableCopyWithCapacity(
         size == 0 ? AbstractProtobufList.DEFAULT_CAPACITY : size * 2);
   }
 
   protected static BooleanList emptyBooleanList() {
     return BooleanArrayList.emptyList();
   }
-
+  
   protected static BooleanList mutableCopy(BooleanList list) {
     int size = list.size();
     return list.mutableCopyWithCapacity(
         size == 0 ? AbstractProtobufList.DEFAULT_CAPACITY : size * 2);
   }
 
   protected static <E> ProtobufList<E> emptyProtobufList() {
     return ProtobufArrayList.emptyList();
   }
-
+  
   protected static <E> ProtobufList<E> mutableCopy(ProtobufList<E> list) {
     int size = list.size();
     return list.mutableCopyWithCapacity(
         size == 0 ? AbstractProtobufList.DEFAULT_CAPACITY : size * 2);
   }
 
   /**
    * A {@link Parser} implementation that delegates to the default instance.
    * <p>
    * For use by generated code only.
    */
   protected static class DefaultInstanceBasedParser<T extends GeneratedMessageLite<T, ?>>
       extends AbstractParser<T> {
-
+    
     private T defaultInstance;
-
+    
     public DefaultInstanceBasedParser(T defaultInstance) {
       this.defaultInstance = defaultInstance;
     }
-
+    
     @Override
     public T parsePartialFrom(CodedInputStream input, ExtensionRegistryLite extensionRegistry)
         throws InvalidProtocolBufferException {
       return GeneratedMessageLite.parsePartialFrom(defaultInstance, input, extensionRegistry);
     }
   }
-
+  
   /**
    * A static helper method for parsing a partial from input using the extension registry and the
    * instance.
    */
   // TODO(dweis): Should this verify that the last tag was 0?
   static <T extends GeneratedMessageLite<T, ?>> T parsePartialFrom(
       T instance, CodedInputStream input, ExtensionRegistryLite extensionRegistry)
           throws InvalidProtocolBufferException {
     @SuppressWarnings("unchecked") // Guaranteed by protoc
     T result = (T) instance.dynamicMethod(MethodToInvoke.NEW_MUTABLE_INSTANCE);
     try {
       result.dynamicMethod(MethodToInvoke.MERGE_FROM_STREAM, input, extensionRegistry);
       result.makeImmutable();
     } catch (RuntimeException e) {
       if (e.getCause() instanceof InvalidProtocolBufferException) {
         throw (InvalidProtocolBufferException) e.getCause();
       }
       throw e;
     }
     return result;
   }
-
+  
   protected static <T extends GeneratedMessageLite<T, ?>> T parsePartialFrom(
       T defaultInstance,
       CodedInputStream input)
       throws InvalidProtocolBufferException {
     return parsePartialFrom(defaultInstance, input, ExtensionRegistryLite.getEmptyRegistry());
   }
-
+  
   /**
    * Helper method to check if message is initialized.
    *
    * @throws InvalidProtocolBufferException if it is not initialized.
    * @return The message to check.
    */
   private static <T extends GeneratedMessageLite<T, ?>> T checkMessageInitialized(T message)
       throws InvalidProtocolBufferException {
     if (message != null && !message.isInitialized()) {
       throw message.newUninitializedMessageException()
@@ skipping 10 matching lines @@
     return checkMessageInitialized(
         parseFrom(defaultInstance, data, ExtensionRegistryLite.getEmptyRegistry()));
   }
 
   // Validates last tag.
   protected static <T extends GeneratedMessageLite<T, ?>> T parseFrom(
       T defaultInstance, ByteString data, ExtensionRegistryLite extensionRegistry)
       throws InvalidProtocolBufferException {
     return checkMessageInitialized(parsePartialFrom(defaultInstance, data, extensionRegistry));
   }
-
+  
   // This is a special case since we want to verify that the last tag is 0. We assume we exhaust the
   // ByteString.
   private static <T extends GeneratedMessageLite<T, ?>> T parsePartialFrom(
       T defaultInstance, ByteString data, ExtensionRegistryLite extensionRegistry)
       throws InvalidProtocolBufferException {
     T message;
     try {
       CodedInputStream input = data.newCodedInput();
       message = parsePartialFrom(defaultInstance, input, extensionRegistry);
       try {
         input.checkLastTagWas(0);
       } catch (InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(message);
       }
       return message;
     } catch (InvalidProtocolBufferException e) {
       throw e;
     }
   }
-
+  
   // This is a special case since we want to verify that the last tag is 0. We assume we exhaust the
   // ByteString.
   private static <T extends GeneratedMessageLite<T, ?>> T parsePartialFrom(
       T defaultInstance, byte[] data, ExtensionRegistryLite extensionRegistry)
       throws InvalidProtocolBufferException {
     T message;
     try {
       CodedInputStream input = CodedInputStream.newInstance(data);
       message = parsePartialFrom(defaultInstance, input, extensionRegistry);
       try {
@@ skipping 63 matching lines @@
             ExtensionRegistryLite.getEmptyRegistry()));
   }
 
   // Validates last tag.
   protected static <T extends GeneratedMessageLite<T, ?>> T parseDelimitedFrom(
       T defaultInstance, InputStream input, ExtensionRegistryLite extensionRegistry)
       throws InvalidProtocolBufferException {
     return checkMessageInitialized(
         parsePartialDelimitedFrom(defaultInstance, input, extensionRegistry));
   }
-
+  
   private static <T extends GeneratedMessageLite<T, ?>> T parsePartialDelimitedFrom(
       T defaultInstance,
       InputStream input,
       ExtensionRegistryLite extensionRegistry)
       throws InvalidProtocolBufferException {
     int size;
     try {
       int firstByte = input.read();
       if (firstByte == -1) {
         return null;
@@ skipping 32 matching lines @@
     Object visitOneofBoolean(boolean minePresent, Object mine, Object other);
     Object visitOneofInt(boolean minePresent, Object mine, Object other);
     Object visitOneofDouble(boolean minePresent, Object mine, Object other);
     Object visitOneofFloat(boolean minePresent, Object mine, Object other);
     Object visitOneofLong(boolean minePresent, Object mine, Object other);
     Object visitOneofString(boolean minePresent, Object mine, Object other);
     Object visitOneofByteString(boolean minePresent, Object mine, Object other);
     Object visitOneofLazyMessage(boolean minePresent, Object mine, Object other);
     Object visitOneofMessage(boolean minePresent, Object mine, Object other);
     void visitOneofNotSet(boolean minePresent);
-
+    
     /**
      * Message fields use null sentinals.
      */
     <T extends MessageLite> T visitMessage(T mine, T other);
-    LazyFieldLite visitLazyMessage(LazyFieldLite mine, LazyFieldLite other);
+    LazyFieldLite visitLazyMessage(
+        boolean minePresent, LazyFieldLite mine, boolean otherPresent, LazyFieldLite other);
 
     <T> ProtobufList<T> visitList(ProtobufList<T> mine, ProtobufList<T> other);
     BooleanList visitBooleanList(BooleanList mine, BooleanList other);
     IntList visitIntList(IntList mine, IntList other);
     DoubleList visitDoubleList(DoubleList mine, DoubleList other);
     FloatList visitFloatList(FloatList mine, FloatList other);
     LongList visitLongList(LongList mine, LongList other);
     FieldSet<ExtensionDescriptor> visitExtensions(
         FieldSet<ExtensionDescriptor> mine, FieldSet<ExtensionDescriptor> other);
     UnknownFieldSetLite visitUnknownFields(UnknownFieldSetLite mine, UnknownFieldSetLite other);
@@ skipping 129 matching lines @@
       throw NOT_EQUALS;
     }
 
     @Override
     public Object visitOneofLazyMessage(boolean minePresent, Object mine, Object other) {
       if (minePresent && mine.equals(other)) {
         return mine;
       }
       throw NOT_EQUALS;
     }
-
+    
     @Override
     public Object visitOneofMessage(boolean minePresent, Object mine, Object other) {
       if (minePresent && ((GeneratedMessageLite<?, ?>) mine).equals(this, (MessageLite) other)) {
         return mine;
       }
       throw NOT_EQUALS;
     }
-
+    
     @Override
     public void visitOneofNotSet(boolean minePresent) {
       if (minePresent) {
         throw NOT_EQUALS;
       }
     }
 
     @Override
     public <T extends MessageLite> T visitMessage(T mine, T other) {
       if (mine == null && other == null) {
         return null;
       }
 
       if (mine == null || other == null) {
         throw NOT_EQUALS;
       }
 
       ((GeneratedMessageLite<?, ?>) mine).equals(this, other);
 
       return mine;
     }
-
+    
     @Override
     public LazyFieldLite visitLazyMessage(
-        LazyFieldLite mine, LazyFieldLite other) {
-      if (mine == null && other == null) {
-        return null;
-      }
-      if (mine == null || other == null) {
-        throw NOT_EQUALS;
-      }
-      if (mine.equals(other)) {
+        boolean minePresent, LazyFieldLite mine, boolean otherPresent, LazyFieldLite other) {
+      if (!minePresent && !otherPresent) {
+        return mine;
+      } else if (minePresent && otherPresent && mine.equals(other)) {
         return mine;
       }
       throw NOT_EQUALS;
     }
 
     @Override
     public <T> ProtobufList<T> visitList(ProtobufList<T> mine, ProtobufList<T> other) {
       if (!mine.equals(other)) {
         throw NOT_EQUALS;
       }
@@ skipping 70 matching lines @@
   }
 
   /**
    * Implements hashCode by accumulating state.
    */
   private static class HashCodeVisitor implements Visitor {
 
     // The caller must ensure that the visitor is invoked parameterized with this and this such that
     // other is this. This is required due to how oneof cases are handled. See the class comment
     // on Visitor for more information.
-
+    
     private int hashCode = 0;
 
     @Override
     public boolean visitBoolean(
         boolean minePresent, boolean mine, boolean otherPresent, boolean other) {
       hashCode = (53 * hashCode) + Internal.hashBoolean(mine);
       return mine;
     }
 
     @Override
@@ skipping 75 matching lines @@
     public Object visitOneofByteString(boolean minePresent, Object mine, Object other) {
       hashCode = (53 * hashCode) + mine.hashCode();
       return mine;
     }
 
     @Override
     public Object visitOneofLazyMessage(boolean minePresent, Object mine, Object other) {
       hashCode = (53 * hashCode) + mine.hashCode();
       return mine;
     }
-
+    
     @Override
     public Object visitOneofMessage(boolean minePresent, Object mine, Object other) {
       return visitMessage((MessageLite) mine, (MessageLite) other);
     }
 
     @Override
     public void visitOneofNotSet(boolean minePresent) {
       if (minePresent) {
-        throw new IllegalStateException(); // Can't happen if other == this.
+        throw new IllegalStateException(); // Can't happen if other == this. 
       }
     }
 
     @Override
     public <T extends MessageLite> T visitMessage(T mine, T other) {
       final int protoHash;
       if (mine != null) {
         if (mine instanceof GeneratedMessageLite) {
           protoHash = ((GeneratedMessageLite) mine).hashCode(this);
         } else {
           protoHash = mine.hashCode();
         }
       } else {
         protoHash = 37;
       }
       hashCode = (53 * hashCode) + protoHash;
       return mine;
     }
 
     @Override
-    public LazyFieldLite visitLazyMessage(LazyFieldLite mine, LazyFieldLite other) {
-      final int protoHash;
-      if (mine != null) {
-        protoHash = mine.hashCode();
-      } else {
-        protoHash = 37;
-      }
-      hashCode = (53 * hashCode) + protoHash;
+    public LazyFieldLite visitLazyMessage(
+        boolean minePresent, LazyFieldLite mine, boolean otherPresent, LazyFieldLite other) {
+      hashCode = (53 * hashCode) + mine.hashCode();
       return mine;
     }
 
     @Override
     public <T> ProtobufList<T> visitList(ProtobufList<T> mine, ProtobufList<T> other) {
       hashCode = (53 * hashCode) + mine.hashCode();
       return mine;
     }
 
     @Override
@@ skipping 34 matching lines @@
       return mine;
     }
 
     @Override
     public UnknownFieldSetLite visitUnknownFields(
         UnknownFieldSetLite mine,
         UnknownFieldSetLite other) {
       hashCode = (53 * hashCode) + mine.hashCode();
       return mine;
     }
-
+    
     @Override
     public <K, V> MapFieldLite<K, V> visitMap(MapFieldLite<K, V> mine, MapFieldLite<K, V> other) {
       hashCode = (53 * hashCode) + mine.hashCode();
       return mine;
     }
   }
 
   /**
    * Implements field merging semantics over the visitor interface.
    */
@@ skipping 47 matching lines @@
       return other;
     }
 
     @Override
     public Object visitOneofInt(boolean minePresent, Object mine, Object other) {
       return other;
     }
 
     @Override
     public Object visitOneofDouble(boolean minePresent, Object mine, Object other) {
-      return other;
+      return other;      
     }
 
     @Override
     public Object visitOneofFloat(boolean minePresent, Object mine, Object other) {
       return other;
     }
 
     @Override
     public Object visitOneofLong(boolean minePresent, Object mine, Object other) {
-      return other;
+      return other;      
     }
 
     @Override
     public Object visitOneofString(boolean minePresent, Object mine, Object other) {
-      return other;
+      return other;      
     }
 
     @Override
     public Object visitOneofByteString(boolean minePresent, Object mine, Object other) {
-      return other;
+      return other;      
     }
 
     @Override
     public Object visitOneofLazyMessage(boolean minePresent, Object mine, Object other) {
-      LazyFieldLite lazy = minePresent ? (LazyFieldLite) mine : new LazyFieldLite();
-      lazy.merge((LazyFieldLite) other);
-      return lazy;
+      if (minePresent) {
+        LazyFieldLite lazy = (LazyFieldLite) mine;
+        lazy.merge((LazyFieldLite) other);
+        return lazy;
+      }
+      return other;
     }
-
+    
     @Override
     public Object visitOneofMessage(boolean minePresent, Object mine, Object other) {
       if (minePresent) {
         return visitMessage((MessageLite) mine, (MessageLite) other);
       }
       return other;
     }
-
+    
     @Override
     public void visitOneofNotSet(boolean minePresent) {
       return;
     }
 
     @SuppressWarnings("unchecked") // Guaranteed by runtime.
     @Override
     public <T extends MessageLite> T visitMessage(T mine, T other) {
       if (mine != null && other != null) {
         return (T) mine.toBuilder().mergeFrom(other).build();
       }
 
       return mine != null ? mine : other;
     }
 
     @Override
-    public LazyFieldLite visitLazyMessage(LazyFieldLite mine, LazyFieldLite other) {
-      if (other != null) {
-        if (mine == null) {
-          mine = new LazyFieldLite();
-        }
-        mine.merge(other);
-      }
+    public LazyFieldLite visitLazyMessage(
+        boolean minePresent, LazyFieldLite mine, boolean otherPresent, LazyFieldLite other) {
+      // LazyFieldLite's are never null so we can just copy across. Necessary to avoid leakage
+      // from builder into immutable message.
+      // TODO(dweis): Change to null sentinels?
+      mine.merge(other);
       return mine;
     }
 
     @Override
     public <T> ProtobufList<T> visitList(ProtobufList<T> mine, ProtobufList<T> other) {
       int size = mine.size();
       int otherSize = other.size();
       if (size > 0 && otherSize > 0) {
         if (!mine.isModifiable()) {
           mine = mine.mutableCopyWithCapacity(size + otherSize);
         }
         mine.addAll(other);
       }
-
+      
       return size > 0 ? mine : other;
     }
 
     @Override
     public BooleanList visitBooleanList(BooleanList mine, BooleanList other) {
       int size = mine.size();
       int otherSize = other.size();
       if (size > 0 && otherSize > 0) {
         if (!mine.isModifiable()) {
           mine = mine.mutableCopyWithCapacity(size + otherSize);
         }
         mine.addAll(other);
       }
-
+      
       return size > 0 ? mine : other;
     }
 
     @Override
     public IntList visitIntList(IntList mine, IntList other) {
       int size = mine.size();
       int otherSize = other.size();
       if (size > 0 && otherSize > 0) {
         if (!mine.isModifiable()) {
           mine = mine.mutableCopyWithCapacity(size + otherSize);
         }
         mine.addAll(other);
       }
-
+      
       return size > 0 ? mine : other;
     }
 
     @Override
     public DoubleList visitDoubleList(DoubleList mine, DoubleList other) {
       int size = mine.size();
       int otherSize = other.size();
       if (size > 0 && otherSize > 0) {
         if (!mine.isModifiable()) {
           mine = mine.mutableCopyWithCapacity(size + otherSize);
         }
         mine.addAll(other);
       }
-
+      
       return size > 0 ? mine : other;
     }
 
     @Override
     public FloatList visitFloatList(FloatList mine, FloatList other) {
       int size = mine.size();
       int otherSize = other.size();
       if (size > 0 && otherSize > 0) {
         if (!mine.isModifiable()) {
           mine = mine.mutableCopyWithCapacity(size + otherSize);
         }
         mine.addAll(other);
       }
-
+      
       return size > 0 ? mine : other;
     }
 
     @Override
     public LongList visitLongList(LongList mine, LongList other) {
       int size = mine.size();
       int otherSize = other.size();
       if (size > 0 && otherSize > 0) {
         if (!mine.isModifiable()) {
           mine = mine.mutableCopyWithCapacity(size + otherSize);
         }
         mine.addAll(other);
       }
-
+      
       return size > 0 ? mine : other;
     }
 
     @Override
     public FieldSet<ExtensionDescriptor> visitExtensions(
         FieldSet<ExtensionDescriptor> mine,
         FieldSet<ExtensionDescriptor> other) {
       if (mine.isImmutable()) {
         mine = mine.clone();
       }
       mine.mergeFrom(other);
       return mine;
     }
 
     @Override
     public UnknownFieldSetLite visitUnknownFields(
         UnknownFieldSetLite mine,
         UnknownFieldSetLite other) {
       return other == UnknownFieldSetLite.getDefaultInstance()
           ? mine : UnknownFieldSetLite.mutableCopyOf(mine, other);
     }
-
+    
     @Override
     public <K, V> MapFieldLite<K, V> visitMap(MapFieldLite<K, V> mine, MapFieldLite<K, V> other) {
-      if (!other.isEmpty()) {
-        if (!mine.isMutable()) {
-          mine = mine.mutableCopy();
-        }
-        mine.mergeFrom(other);
-      }
+      mine.mergeFrom(other);
       return mine;
     }
   }
 }