diff --git a/BUILD b/BUILD
index 222cc82..1b8e92b 100644
--- a/BUILD
+++ b/BUILD
@@ -14,7 +14,7 @@
     "-Wwrite-strings",
     "-Woverloaded-virtual",
     "-Wno-sign-compare",
-    "-Wno-error=unused-function",
+    "-Wno-unused-function",
 ]
 
 config_setting(
diff --git a/src/google/protobuf/compiler/cpp/cpp_message.cc b/src/google/protobuf/compiler/cpp/cpp_message.cc
index 0034b12..1f1a0f1 100644
--- a/src/google/protobuf/compiler/cpp/cpp_message.cc
+++ b/src/google/protobuf/compiler/cpp/cpp_message.cc
@@ -3804,7 +3804,7 @@
   if (descriptor_->extension_range_count() > 0) {
     printer->Print(
       "\n"
-      "if (!_extensions_.IsInitialized()) return false;");
+      "if (!_extensions_.IsInitialized()) return false;\n");
   }
 
   printer->Outdent();
diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc
index 56c3b7f..13e8776 100644
--- a/src/google/protobuf/descriptor.pb.cc
+++ b/src/google/protobuf/descriptor.pb.cc
@@ -8937,7 +8937,8 @@
 
   if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;
 
-  if (!_extensions_.IsInitialized()) return false;  return true;
+  if (!_extensions_.IsInitialized()) return false;
+  return true;
 }
 
 void FileOptions::Swap(FileOptions* other) {
@@ -9902,7 +9903,8 @@
 
   if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;
 
-  if (!_extensions_.IsInitialized()) return false;  return true;
+  if (!_extensions_.IsInitialized()) return false;
+  return true;
 }
 
 void MessageOptions::Swap(MessageOptions* other) {
@@ -10601,7 +10603,8 @@
 
   if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;
 
-  if (!_extensions_.IsInitialized()) return false;  return true;
+  if (!_extensions_.IsInitialized()) return false;
+  return true;
 }
 
 void FieldOptions::Swap(FieldOptions* other) {
@@ -11052,7 +11055,8 @@
 
   if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;
 
-  if (!_extensions_.IsInitialized()) return false;  return true;
+  if (!_extensions_.IsInitialized()) return false;
+  return true;
 }
 
 void OneofOptions::Swap(OneofOptions* other) {
@@ -11446,7 +11450,8 @@
 
   if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;
 
-  if (!_extensions_.IsInitialized()) return false;  return true;
+  if (!_extensions_.IsInitialized()) return false;
+  return true;
 }
 
 void EnumOptions::Swap(EnumOptions* other) {
@@ -11833,7 +11838,8 @@
 
   if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;
 
-  if (!_extensions_.IsInitialized()) return false;  return true;
+  if (!_extensions_.IsInitialized()) return false;
+  return true;
 }
 
 void EnumValueOptions::Swap(EnumValueOptions* other) {
@@ -12195,7 +12201,8 @@
 
   if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;
 
-  if (!_extensions_.IsInitialized()) return false;  return true;
+  if (!_extensions_.IsInitialized()) return false;
+  return true;
 }
 
 void ServiceOptions::Swap(ServiceOptions* other) {
@@ -12557,7 +12564,8 @@
 
   if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;
 
-  if (!_extensions_.IsInitialized()) return false;  return true;
+  if (!_extensions_.IsInitialized()) return false;
+  return true;
 }
 
 void MethodOptions::Swap(MethodOptions* other) {