From 0400cca3236de1ca303af38bf81eab332d042b7c Mon Sep 17 00:00:00 2001
From: Adam Cozzette <acozzette@google.com>
Date: Tue, 13 Mar 2018 16:37:29 -0700
Subject: Integrated internal changes from Google

---
 src/google/protobuf/compiler/java/java_primitive_field.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/google/protobuf/compiler/java/java_primitive_field.cc')

diff --git a/src/google/protobuf/compiler/java/java_primitive_field.cc b/src/google/protobuf/compiler/java/java_primitive_field.cc
index 074a6be8..71ee0992 100644
--- a/src/google/protobuf/compiler/java/java_primitive_field.cc
+++ b/src/google/protobuf/compiler/java/java_primitive_field.cc
@@ -633,8 +633,7 @@ GenerateMembers(io::Printer* printer) const {
     "}\n");
   printer->Annotate("{", "}", descriptor_);
 
-  if (descriptor_->is_packed() &&
-      context_->HasGeneratedMethods(descriptor_->containing_type())) {
+  if (descriptor_->is_packed()) {
     printer->Print(variables_,
       "private int $name$MemoizedSerializedSize = -1;\n");
   }
-- 
cgit v1.2.3