Move to using objc_externally_retained to elide unneeded calls to retain/release in j2objc protobuf code.

Dave MacLachlan · copybara-github · commit 808a1810926d · 2025-12-11T07:27:30.000-08:00
PiperOrigin-RevId: 841790480
diff --git a/jre_emul/Classes/J2ObjC_common.h b/jre_emul/Classes/J2ObjC_common.h
@@ -127,6 +127,18 @@ __attribute__((always_inline)) inline id JreRetainedAutoreleasedReturnValue(id v
 # define WEAK_ __unsafe_unretained
 #endif
 
+#ifndef J2OBJC_EXTERNALLY_RETAINED
+#if __has_feature(objc_arc) && __has_attribute(objc_externally_retained)
+#   define J2OBJC_EXTERNALLY_RETAINED              __attribute__((objc_externally_retained))
+#   define J2OBJC_ASSUME_EXTERNALLY_RETAINED_BEGIN _Pragma("clang attribute J2OBJC_ASSUME_EXTERNALLY_RETAINED.push(__attribute__((objc_externally_retained)), apply_to=any(function, block, objc_method))")
+#   define J2OBJC_ASSUME_EXTERNALLY_RETAINED_END   _Pragma("clang attribute J2OBJC_ASSUME_EXTERNALLY_RETAINED.pop")
+#else // __OBJC__ && objc_arc && objc_externally_retained
+#   define J2OBJC_EXTERNALLY_RETAINED
+#   define J2OBJC_ASSUME_EXTERNALLY_RETAINED_BEGIN
+#   define J2OBJC_ASSUME_EXTERNALLY_RETAINED_END
+#endif // __OBJC__ && objc_arc && objc_externally_retained
+#endif // !J2OBJC_EXTERNALLY_RETAINED
+
 CF_EXTERN_C_BEGIN
 
 id JreThrowNullPointerException(void) __attribute__((noreturn));
diff --git a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_enum.cc b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_enum.cc
@@ -398,6 +398,7 @@ void EnumGenerator::GenerateSource(io::Printer* printer) {
       "\n"
       "@end\n"
       "\n"
+      "J2OBJC_ASSUME_EXTERNALLY_RETAINED_BEGIN\n"
       "J2OBJC_CLASS_TYPE_LITERAL_SOURCE($classname$)\n"
       "\n"
       "IOSObjectArray *$classname$_values(void) {\n"
@@ -471,6 +472,7 @@ void EnumGenerator::GenerateSource(io::Printer* printer) {
         "}\n",
         "classname", ClassName(descriptor_), "name", "UNRECOGNIZED");
   }
+  printer->Print("\nJ2OBJC_ASSUME_EXTERNALLY_RETAINED_END\n");
 }
 
 }  // namespace j2objc
diff --git a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_message.cc b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_message.cc
@@ -236,40 +236,12 @@ void MessageGenerator::GenerateHeader(io::Printer* printer) {
         "classname", ClassName(descriptor_), "superclassname", superclassName);
   }
   printer->Print(
-      "+ (nonnull $classname$ *)getDefaultInstance;\n"
-      "- (nonnull $classname$ *)getDefaultInstanceForType;\n"
       "+ (nonnull $classname$_Builder *)newBuilder OBJC_METHOD_FAMILY_NONE;\n"
       "- (nonnull $classname$_Builder *)newBuilderForType "
       "OBJC_METHOD_FAMILY_NONE;\n"
       "- (nonnull $classname$_Builder *)toBuilder;\n"
       "+ (nonnull $classname$_Builder *)newBuilderWith$classname$:"
-      "($classname$ *)message OBJC_METHOD_FAMILY_NONE;\n"
-      "+ (nonnull ComGoogleProtobufDescriptors_Descriptor *)getDescriptor;\n"
-      "+ ($classname$ *)parseFromWithByteArray:(IOSByteArray *)bytes;\n"
-      "+ ($classname$ *)parseFromWithByteArray:(IOSByteArray *)bytes "
-      "withComGoogleProtobufExtensionRegistryLite:"
-      "(ComGoogleProtobufExtensionRegistryLite *)registry;\n"
-      "+ ($classname$ *)parseFromNSData:(NSData *)data;\n"
-      "+ ($classname$ *)parseFromNSData:(NSData *)data registry:"
-      "(ComGoogleProtobufExtensionRegistryLite *)registry;\n"
-      "+ ($classname$ *)parseFromWithJavaIoInputStream:"
-      "(JavaIoInputStream *)input;\n"
-      "+ ($classname$ *)parseFromWithJavaIoInputStream:"
-      "(JavaIoInputStream *)bytes "
-      "withComGoogleProtobufExtensionRegistryLite:"
-      "(ComGoogleProtobufExtensionRegistryLite *)registry;\n"
-      "+ ($classname$ *)parseFromWithComGoogleProtobufByteString:"
-      "(ComGoogleProtobufByteString *)byteString;\n"
-      "+ (id)parseFromWithComGoogleProtobufByteString:("
-      "ComGoogleProtobufByteString *)byteString "
-      "withComGoogleProtobufExtensionRegistryLite:"
-      "(ComGoogleProtobufExtensionRegistryLite *)registry;\n"
-      "+ ($classname$ *)parseDelimitedFromWithJavaIoInputStream:"
-      "(JavaIoInputStream *)input;\n"
-      "+ ($classname$ *)parseDelimitedFromWithJavaIoInputStream:"
-      "(JavaIoInputStream *)bytes "
-      "withComGoogleProtobufExtensionRegistryLite:"
-      "(ComGoogleProtobufExtensionRegistryLite *)registry;\n",
+      "($classname$ *)message OBJC_METHOD_FAMILY_NONE;\n",
       "classname", ClassName(descriptor_), "superclassname", superclassName);
 
   if (descriptor_->field_count() > 0) {
@@ -546,6 +518,7 @@ void MessageGenerator::GenerateSource(io::Printer* printer) {
       "\n"
       "@end\n"
       "\n"
+      "J2OBJC_ASSUME_EXTERNALLY_RETAINED_BEGIN\n"
       "J2OBJC_CLASS_TYPE_LITERAL_SOURCE($classname$)\n"
       "\n"
       "$classname$ * _Nonnull $classname$_getDefaultInstance(void) {\n"
@@ -603,6 +576,7 @@ void MessageGenerator::GenerateSource(io::Printer* printer) {
       "$classname$_descriptor_, input, registry);\n"
       "}\n",
       "classname", ClassName(descriptor_));
+    printer->Print("\nJ2OBJC_ASSUME_EXTERNALLY_RETAINED_END\n");
 
   for (int i = 0; i < descriptor_->real_oneof_decl_count(); i++) {
     OneofGenerator(descriptor_->oneof_decl(i)).GenerateSource(printer);
@@ -637,14 +611,10 @@ void MessageGenerator::GenerateBuilderHeader(io::Printer* printer) {
       "@interface $classname$_Builder : "
       "$superclassname$<$classname$OrBuilder>\n"
       "\n"
-      "- (nonnull $classname$ *)getDefaultInstanceForType;\n"
       "- (nonnull $classname$_Builder *)mergeFromWith$classname$:"
       "(nonnull $classname$ *)message;\n"
-      "- (nonnull $classname$_Builder *)mergeFromWithComGoogleProtobufMessage:"
-      "(nonnull id<ComGoogleProtobufMessage>)message;\n"
       "- (nonnull $classname$ *)build;\n"
-      "- (nonnull $classname$ *)buildPartial;\n"
-      "+ (nonnull ComGoogleProtobufDescriptors_Descriptor *)getDescriptor;\n",
+      "- (nonnull $classname$ *)buildPartial;\n",
       "classname", ClassName(descriptor_), "superclassname", superclassName);
 
   for (int i = 0; i < descriptor_->field_count(); i++) {
diff --git a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_message_lite.cc b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_message_lite.cc
@@ -169,34 +169,12 @@ void MessageLiteGenerator::GenerateHeader(io::Printer* printer) {
       "\n"
       "// in j2objc_message_lite.cc \n"
       "@interface $classname$ : $superclassname$<$classname$OrBuilder>\n\n"
-      "+ (nonnull $classname$ *)getDefaultInstance;\n"
-      "- (nonnull $classname$ *)getDefaultInstanceForType;\n"
       "+ (nonnull $classname$_Builder *)newBuilder OBJC_METHOD_FAMILY_NONE;\n"
       "- (nonnull $classname$_Builder *)newBuilderForType "
       "OBJC_METHOD_FAMILY_NONE;\n"
       "- (nonnull $classname$_Builder *)toBuilder;\n"
       "+ (nonnull $classname$_Builder *)newBuilderWith$classname$:"
-      "($classname$ *)message OBJC_METHOD_FAMILY_NONE;\n"
-      "+ (nonnull ComGoogleProtobufDescriptors_Descriptor *)getDescriptor;\n"
-      "+ ($classname$ *)parseFromWithByteArray:(IOSByteArray *)bytes;\n"
-      "+ ($classname$ *)parseFromWithByteArray:(IOSByteArray *)bytes "
-      "withComGoogleProtobufExtensionRegistryLite:"
-      "(ComGoogleProtobufExtensionRegistryLite *)registry;\n"
-      "+ ($classname$ *)parseFromNSData:(NSData *)data;\n"
-      "+ ($classname$ *)parseFromNSData:(NSData *)data registry:"
-      "(ComGoogleProtobufExtensionRegistryLite *)registry;\n"
-      "+ ($classname$ *)parseFromWithJavaIoInputStream:"
-      "(JavaIoInputStream *)input;\n"
-      "+ ($classname$ *)parseFromWithJavaIoInputStream:"
-      "(JavaIoInputStream *)bytes "
-      "withComGoogleProtobufExtensionRegistryLite:"
-      "(ComGoogleProtobufExtensionRegistryLite *)registry;\n"
-      "+ ($classname$ *)parseDelimitedFromWithJavaIoInputStream:"
-      "(JavaIoInputStream *)input;\n"
-      "+ ($classname$ *)parseDelimitedFromWithJavaIoInputStream:"
-      "(JavaIoInputStream *)bytes "
-      "withComGoogleProtobufExtensionRegistryLite:"
-      "(ComGoogleProtobufExtensionRegistryLite *)registry;\n",
+      "($classname$ *)message OBJC_METHOD_FAMILY_NONE;\n",
       "classname", ClassName(descriptor_), "superclassname", superclassName);
   if (descriptor_->field_count() > 0) {
     printer->Print("\n");
@@ -420,6 +398,7 @@ void MessageLiteGenerator::GenerateSource(io::Printer* printer) {
       "\n"
       "@end\n"
       "\n"
+      "J2OBJC_ASSUME_EXTERNALLY_RETAINED_BEGIN\n"
       "J2OBJC_CLASS_TYPE_LITERAL_SOURCE($classname$)\n"
       "\n"
       "$classname$ * _Nonnull $classname$_getDefaultInstance(void) {\n"
@@ -477,6 +456,7 @@ void MessageLiteGenerator::GenerateSource(io::Printer* printer) {
       "$classname$_descriptor_, input, registry);\n"
       "}\n",
       "classname", ClassName(descriptor_));
+  printer->Print("\nJ2OBJC_ASSUME_EXTERNALLY_RETAINED_END\n");
 
   for (int i = 0; i < descriptor_->oneof_decl_count(); i++) {
     OneofGenerator(descriptor_->oneof_decl(i)).GenerateSource(printer);
@@ -506,13 +486,9 @@ void MessageLiteGenerator::GenerateBuilderHeader(io::Printer* printer) {
       "$superclassname$<$classname$OrBuilder>\n"
       "\n"
       "- ($classname$ *)getDefaultInstanceForType;\n"
-      "- ($classname$_Builder *)mergeFromWith$classname$:"
-      "($classname$ *)message;\n"
-      "- ($classname$_Builder *)mergeFromWithComGoogleProtobufMessage:"
-      "(id<ComGoogleProtobufMessage>)message;\n"
+      "- (instancetype)mergeFromWith$classname$:($classname$ *)message;\n"
       "- ($classname$ *)build;\n"
-      "- ($classname$ *)buildPartial;\n"
-      "+ (nonnull ComGoogleProtobufDescriptors_Descriptor *)getDescriptor;\n",
+      "- ($classname$ *)buildPartial;\n",
       "classname", ClassName(descriptor_), "superclassname", superclassName);
 
   for (int i = 0; i < descriptor_->field_count(); i++) {
diff --git a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_oneof.cc b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_oneof.cc
@@ -326,6 +326,7 @@ void OneofGenerator::GenerateSource(io::Printer* printer) {
       "\n"
       "@end\n"
       "\n"
+      "J2OBJC_ASSUME_EXTERNALLY_RETAINED_BEGIN\n"
       "J2OBJC_CLASS_TYPE_LITERAL_SOURCE($classname$)\n"
       "\n"
       "IOSObjectArray *$classname$_values(void) {\n"
@@ -379,6 +380,7 @@ void OneofGenerator::GenerateSource(io::Printer* printer) {
         "classname", CaseClassName(descriptor_),
         "name", CaseValueName(descriptor_->field(i)));
   }
+  printer->Print("\nJ2OBJC_ASSUME_EXTERNALLY_RETAINED_END\n");
 }
 
 void OneofGenerator::GenerateMessageOrBuilder(io::Printer* printer) {
diff --git a/protobuf/runtime/src/com/google/protobuf/GeneratedMessage.h b/protobuf/runtime/src/com/google/protobuf/GeneratedMessage.h
@@ -54,13 +54,26 @@ typedef ComGoogleProtobufGeneratedMessage_GeneratedExtension CGPGeneratedExtensi
 
 @interface ComGoogleProtobufGeneratedMessage : ComGoogleProtobufAbstractMessage
 
-+ (id)getDescriptor;
-+ (id)parseFromWithComGoogleProtobufByteString:(ComGoogleProtobufByteString *)byteString;
-+ (id)parseFromWithComGoogleProtobufByteString:(ComGoogleProtobufByteString *)byteString
++ (nonnull ComGoogleProtobufDescriptors_Descriptor *)getDescriptor;
++ (nonnull instancetype)getDefaultInstance;
+- (nonnull instancetype)getDefaultInstanceForType;
++ (instancetype)parseFromWithComGoogleProtobufByteString:(ComGoogleProtobufByteString *)byteString;
++ (instancetype)parseFromWithComGoogleProtobufByteString:(ComGoogleProtobufByteString *)byteString
+              withComGoogleProtobufExtensionRegistryLite:
+                  (ComGoogleProtobufExtensionRegistryLite *)registry;
++ (instancetype)parseFromNSData:(NSData *)data;
++ (instancetype)parseFromNSData:(NSData *)data
+                       registry:(ComGoogleProtobufExtensionRegistryLite *)registry;
++ (instancetype)parseFromWithByteArray:(IOSByteArray *)bytes;
++ (instancetype)parseFromWithByteArray:(IOSByteArray *)bytes
     withComGoogleProtobufExtensionRegistryLite:(ComGoogleProtobufExtensionRegistryLite *)registry;
-+ (id)parseFromNSData:(NSData *)data;
-+ (id)parseFromNSData:(NSData *)data registry:(ComGoogleProtobufExtensionRegistryLite *)registry;
-
++ (instancetype)parseFromWithJavaIoInputStream:(JavaIoInputStream *)input;
++ (instancetype)parseFromWithJavaIoInputStream:(JavaIoInputStream *)bytes
+    withComGoogleProtobufExtensionRegistryLite:(ComGoogleProtobufExtensionRegistryLite *)registry;
++ (instancetype)parseDelimitedFromWithJavaIoInputStream:(JavaIoInputStream *)input;
++ (instancetype)parseDelimitedFromWithJavaIoInputStream:(JavaIoInputStream *)bytes
+             withComGoogleProtobufExtensionRegistryLite:
+                 (ComGoogleProtobufExtensionRegistryLite *)registry;
 @end
 
 J2OBJC_EMPTY_STATIC_INIT(ComGoogleProtobufGeneratedMessage)
@@ -69,18 +82,19 @@ J2OBJC_TYPE_LITERAL_HEADER(ComGoogleProtobufGeneratedMessage)
 
 @interface ComGoogleProtobufGeneratedMessage_Builder : ComGoogleProtobufAbstractMessage_Builder
 
-- (id)mergeFromWithJavaIoInputStream:(JavaIoInputStream *)input;
-- (id)mergeFromWithJavaIoInputStream:(JavaIoInputStream *)input
-    withComGoogleProtobufExtensionRegistryLite:
-        (ComGoogleProtobufExtensionRegistryLite *)extensionRegistry;
-- (id)mergeFromWithComGoogleProtobufByteString:(ComGoogleProtobufByteString *)data;
-- (id)mergeFromWithComGoogleProtobufByteString:(ComGoogleProtobufByteString *)data
+- (instancetype)mergeFromWithJavaIoInputStream:(JavaIoInputStream *)input;
+- (instancetype)mergeFromWithJavaIoInputStream:(JavaIoInputStream *)input
     withComGoogleProtobufExtensionRegistryLite:
         (ComGoogleProtobufExtensionRegistryLite *)extensionRegistry;
-- (id)mergeFromWithByteArray:(IOSByteArray *)data;
-- (id)mergeFromWithByteArray:(IOSByteArray *)data
+- (instancetype)mergeFromWithComGoogleProtobufByteString:(ComGoogleProtobufByteString *)data;
+- (instancetype)mergeFromWithComGoogleProtobufByteString:(ComGoogleProtobufByteString *)data
+              withComGoogleProtobufExtensionRegistryLite:
+                  (ComGoogleProtobufExtensionRegistryLite *)extensionRegistry;
+- (instancetype)mergeFromWithByteArray:(IOSByteArray *)data;
+- (instancetype)mergeFromWithByteArray:(IOSByteArray *)data
     withComGoogleProtobufExtensionRegistryLite:
         (ComGoogleProtobufExtensionRegistryLite *)extensionRegistry;
+- (instancetype)mergeFromWithComGoogleProtobufMessage:(id<ComGoogleProtobufMessage>)message;
 
 @end
 
diff --git a/protobuf/runtime/src/com/google/protobuf/GeneratedMessage.mm b/protobuf/runtime/src/com/google/protobuf/GeneratedMessage.mm
@@ -3381,39 +3381,39 @@ - (ComGoogleProtobufGeneratedMessage_Builder *)toBuilder {
   return AUTORELEASE(newBuilder);
 }
 
-+ (ComGoogleProtobufGeneratedMessage *)getDefaultInstance {
++ (instancetype)getDefaultInstance {
   CGPDescriptor *descriptor = [self getDescriptor];
   return AUTORELEASE(CGPNewMessage(descriptor));
 }
 
-- (ComGoogleProtobufGeneratedMessage *)getDefaultInstanceForType {
+- (instancetype)getDefaultInstanceForType {
   CGPDescriptor *descriptor = [object_getClass(self) getDescriptor];
   return descriptor->defaultInstance_;
 }
 
-+ (id)parseFromWithByteArray:(IOSByteArray *)bytes {
++ (instancetype)parseFromWithByteArray:(IOSByteArray *)bytes {
   return CGPParseFromByteArray([self getDescriptor], bytes, nil);
 }
 
-+ (id)parseFromWithByteArray:(IOSByteArray *)bytes
++ (instancetype)parseFromWithByteArray:(IOSByteArray *)bytes
     withComGoogleProtobufExtensionRegistryLite:(CGPExtensionRegistryLite *)registry {
   return CGPParseFromByteArray([self getDescriptor], bytes, registry);
 }
 
-+ (id)parseFromWithComGoogleProtobufByteString:(CGPByteString *)byteString {
++ (instancetype)parseFromWithComGoogleProtobufByteString:(CGPByteString *)byteString {
   return CGPParseFromByteString([self getDescriptor], byteString, nil);
 }
 
-+ (id)parseFromWithComGoogleProtobufByteString:(CGPByteString *)byteString
-    withComGoogleProtobufExtensionRegistryLite:(CGPExtensionRegistryLite *)registry {
++ (instancetype)parseFromWithComGoogleProtobufByteString:(CGPByteString *)byteString
+              withComGoogleProtobufExtensionRegistryLite:(CGPExtensionRegistryLite *)registry {
   return CGPParseFromByteString([self getDescriptor], byteString, registry);
 }
 
-+ (id)parseFromNSData:(NSData *)data {
++ (instancetype)parseFromNSData:(NSData *)data {
   return [self parseFromNSData:data registry:nil];
 }
 
-+ (id)parseFromNSData:(NSData *)data registry:(CGPExtensionRegistryLite *)registry {
++ (instancetype)parseFromNSData:(NSData *)data registry:(CGPExtensionRegistryLite *)registry {
   CGPDescriptor *descriptor = [self getDescriptor];
   ComGoogleProtobufGeneratedMessage *msg = AUTORELEASE(CGPNewMessage(descriptor));
   CGPCodedInputStream codedStream([data bytes], (int)[data length]);
@@ -3426,21 +3426,21 @@ + (id)parseFromNSData:(NSData *)data registry:(CGPExtensionRegistryLite *)regist
   return msg;
 }
 
-+ (id)parseFromWithJavaIoInputStream:(JavaIoInputStream *)input {
++ (instancetype)parseFromWithJavaIoInputStream:(JavaIoInputStream *)input {
   return CGPParseFromInputStream([self getDescriptor], input, nil);
 }
 
-+ (id)parseFromWithJavaIoInputStream:(JavaIoInputStream *)input
++ (instancetype)parseFromWithJavaIoInputStream:(JavaIoInputStream *)input
     withComGoogleProtobufExtensionRegistryLite:(CGPExtensionRegistryLite *)registry {
   return CGPParseFromInputStream([self getDescriptor], input, registry);
 }
 
-+ (id)parseDelimitedFromWithJavaIoInputStream:(JavaIoInputStream *)input {
++ (instancetype)parseDelimitedFromWithJavaIoInputStream:(JavaIoInputStream *)input {
   return CGPParseDelimitedFromInputStream([self getDescriptor], input, nil);
 }
 
-+ (id)parseDelimitedFromWithJavaIoInputStream:(JavaIoInputStream *)input
-    withComGoogleProtobufExtensionRegistryLite:(CGPExtensionRegistryLite *)registry {
++ (instancetype)parseDelimitedFromWithJavaIoInputStream:(JavaIoInputStream *)input
+             withComGoogleProtobufExtensionRegistryLite:(CGPExtensionRegistryLite *)registry {
   return CGPParseDelimitedFromInputStream([self getDescriptor], input, registry);
 }
 
@@ -3653,9 +3653,9 @@ - (CGPDescriptor *)getDescriptorForType {
   return [object_getClass(self) getDescriptor];
 }
 
-- (ComGoogleProtobufGeneratedMessage *)getDefaultInstanceForType {
+- (instancetype)getDefaultInstanceForType {
   CGPDescriptor *descriptor = [object_getClass(self) getDescriptor];
-  return descriptor->defaultInstance_;
+  return (id)descriptor->defaultInstance_;
 }
 
 - (id<ComGoogleProtobufMessage_Builder>)
@@ -3765,8 +3765,7 @@ - (id)getRepeatedFieldWithComGoogleProtobufDescriptors_FieldDescriptor:
   return GetAllFields(self);
 }
 
-- (id<ComGoogleProtobufMessage_Builder>)mergeFromWithComGoogleProtobufMessage:
-    (id<ComGoogleProtobufMessage>)message {
+- (instancetype)mergeFromWithComGoogleProtobufMessage:(id<ComGoogleProtobufMessage>)message {
   CGPDescriptor *descriptor = [object_getClass(self) getDescriptor];
   CGPDescriptor *otherDescriptor = [object_getClass(message) getDescriptor];
   if (descriptor != otherDescriptor) {
@@ -3840,7 +3839,7 @@ - (bool)mergeDelimitedFromWithJavaIoInputStream:(JavaIoInputStream *)input
   return self;
 }
 
-- (id<ComGoogleProtobufMessage_Builder>)mergeFromWithByteArray:(IOSByteArray *)data {
+- (instancetype)mergeFromWithByteArray:(IOSByteArray *)data {
   return [self mergeFromWithByteArray:data withComGoogleProtobufExtensionRegistryLite:nil];
 }
 
diff --git a/protobuf/runtime/src/com/google/protobuf/MessageOrBuilder.h b/protobuf/runtime/src/com/google/protobuf/MessageOrBuilder.h
@@ -42,7 +42,7 @@
 
 @protocol ComGoogleProtobufMessageOrBuilder <JavaObject>
 
-- (id<ComGoogleProtobufMessage>)getDefaultInstanceForType;
+- (instancetype)getDefaultInstanceForType;
 
 - (jint)getRepeatedFieldCountWithComGoogleProtobufDescriptors_FieldDescriptor:
     (ComGoogleProtobufDescriptors_FieldDescriptor *)descriptor;

Original file line number	Diff line number	Diff line change
`@@ -398,6 +398,7 @@ void EnumGenerator::GenerateSource(io::Printer* printer) {`
`398`	`398`	`"\n"`
`399`	`399`	`"@end\n"`
`400`	`400`	`"\n"`
	`401`	`+ "J2OBJC_ASSUME_EXTERNALLY_RETAINED_BEGIN\n"`
`401`	`402`	`"J2OBJC_CLASS_TYPE_LITERAL_SOURCE($classname$)\n"`
`402`	`403`	`"\n"`
`403`	`404`	`"IOSObjectArray *$classname$_values(void) {\n"`
`@@ -471,6 +472,7 @@ void EnumGenerator::GenerateSource(io::Printer* printer) {`
`471`	`472`	`"}\n",`
`472`	`473`	`"classname", ClassName(descriptor_), "name", "UNRECOGNIZED");`
`473`	`474`	`}`
	`475`	`+ printer->Print("\nJ2OBJC_ASSUME_EXTERNALLY_RETAINED_END\n");`
`474`	`476`	`}`
`475`	`477`
`476`	`478`	`} // namespace j2objc`
Original file line number	Diff line number	Diff line change
`@@ -326,6 +326,7 @@ void OneofGenerator::GenerateSource(io::Printer* printer) {`
`326`	`326`	`"\n"`
`327`	`327`	`"@end\n"`
`328`	`328`	`"\n"`
	`329`	`+ "J2OBJC_ASSUME_EXTERNALLY_RETAINED_BEGIN\n"`
`329`	`330`	`"J2OBJC_CLASS_TYPE_LITERAL_SOURCE($classname$)\n"`
`330`	`331`	`"\n"`
`331`	`332`	`"IOSObjectArray *$classname$_values(void) {\n"`
`@@ -379,6 +380,7 @@ void OneofGenerator::GenerateSource(io::Printer* printer) {`
`379`	`380`	`"classname", CaseClassName(descriptor_),`
`380`	`381`	`"name", CaseValueName(descriptor_->field(i)));`
`381`	`382`	`}`
	`383`	`+ printer->Print("\nJ2OBJC_ASSUME_EXTERNALLY_RETAINED_END\n");`
`382`	`384`	`}`
`383`	`385`
`384`	`386`	`void OneofGenerator::GenerateMessageOrBuilder(io::Printer* printer) {`
Original file line number	Diff line number	Diff line change
`@@ -3381,39 +3381,39 @@ - (ComGoogleProtobufGeneratedMessage_Builder *)toBuilder {`
`3381`	`3381`	`return AUTORELEASE(newBuilder);`
`3382`	`3382`	`}`
`3383`	`3383`
`3384`		`-+ (ComGoogleProtobufGeneratedMessage *)getDefaultInstance {`
	`3384`	`++ (instancetype)getDefaultInstance {`
`3385`	`3385`	`CGPDescriptor *descriptor = [self getDescriptor];`
`3386`	`3386`	`return AUTORELEASE(CGPNewMessage(descriptor));`
`3387`	`3387`	`}`
`3388`	`3388`
`3389`		`-- (ComGoogleProtobufGeneratedMessage *)getDefaultInstanceForType {`
	`3389`	`+- (instancetype)getDefaultInstanceForType {`
`3390`	`3390`	`CGPDescriptor *descriptor = [object_getClass(self) getDescriptor];`
`3391`	`3391`	`return descriptor->defaultInstance_;`
`3392`	`3392`	`}`
`3393`	`3393`
`3394`		`-+ (id)parseFromWithByteArray:(IOSByteArray *)bytes {`
	`3394`	`++ (instancetype)parseFromWithByteArray:(IOSByteArray *)bytes {`
`3395`	`3395`	`return CGPParseFromByteArray([self getDescriptor], bytes, nil);`
`3396`	`3396`	`}`
`3397`	`3397`
`3398`		`-+ (id)parseFromWithByteArray:(IOSByteArray *)bytes`
	`3398`	`++ (instancetype)parseFromWithByteArray:(IOSByteArray *)bytes`
`3399`	`3399`	`withComGoogleProtobufExtensionRegistryLite:(CGPExtensionRegistryLite *)registry {`
`3400`	`3400`	`return CGPParseFromByteArray([self getDescriptor], bytes, registry);`
`3401`	`3401`	`}`
`3402`	`3402`
`3403`		`-+ (id)parseFromWithComGoogleProtobufByteString:(CGPByteString *)byteString {`
	`3403`	`++ (instancetype)parseFromWithComGoogleProtobufByteString:(CGPByteString *)byteString {`
`3404`	`3404`	`return CGPParseFromByteString([self getDescriptor], byteString, nil);`
`3405`	`3405`	`}`
`3406`	`3406`
`3407`		`-+ (id)parseFromWithComGoogleProtobufByteString:(CGPByteString *)byteString`
`3408`		`- withComGoogleProtobufExtensionRegistryLite:(CGPExtensionRegistryLite *)registry {`
	`3407`	`++ (instancetype)parseFromWithComGoogleProtobufByteString:(CGPByteString *)byteString`
	`3408`	`+ withComGoogleProtobufExtensionRegistryLite:(CGPExtensionRegistryLite *)registry {`
`3409`	`3409`	`return CGPParseFromByteString([self getDescriptor], byteString, registry);`
`3410`	`3410`	`}`
`3411`	`3411`
`3412`		`-+ (id)parseFromNSData:(NSData *)data {`
	`3412`	`++ (instancetype)parseFromNSData:(NSData *)data {`
`3413`	`3413`	`return [self parseFromNSData:data registry:nil];`
`3414`	`3414`	`}`
`3415`	`3415`
`3416`		`-+ (id)parseFromNSData:(NSData )data registry:(CGPExtensionRegistryLite )registry {`
	`3416`	`++ (instancetype)parseFromNSData:(NSData )data registry:(CGPExtensionRegistryLite )registry {`
`3417`	`3417`	`CGPDescriptor *descriptor = [self getDescriptor];`
`3418`	`3418`	`ComGoogleProtobufGeneratedMessage *msg = AUTORELEASE(CGPNewMessage(descriptor));`
`3419`	`3419`	`CGPCodedInputStream codedStream([data bytes], (int)[data length]);`
`@@ -3426,21 +3426,21 @@ + (id)parseFromNSData:(NSData )data registry:(CGPExtensionRegistryLite )regist`
`3426`	`3426`	`return msg;`
`3427`	`3427`	`}`
`3428`	`3428`
`3429`		`-+ (id)parseFromWithJavaIoInputStream:(JavaIoInputStream *)input {`
	`3429`	`++ (instancetype)parseFromWithJavaIoInputStream:(JavaIoInputStream *)input {`
`3430`	`3430`	`return CGPParseFromInputStream([self getDescriptor], input, nil);`
`3431`	`3431`	`}`
`3432`	`3432`
`3433`		`-+ (id)parseFromWithJavaIoInputStream:(JavaIoInputStream *)input`
	`3433`	`++ (instancetype)parseFromWithJavaIoInputStream:(JavaIoInputStream *)input`
`3434`	`3434`	`withComGoogleProtobufExtensionRegistryLite:(CGPExtensionRegistryLite *)registry {`
`3435`	`3435`	`return CGPParseFromInputStream([self getDescriptor], input, registry);`
`3436`	`3436`	`}`
`3437`	`3437`
`3438`		`-+ (id)parseDelimitedFromWithJavaIoInputStream:(JavaIoInputStream *)input {`
	`3438`	`++ (instancetype)parseDelimitedFromWithJavaIoInputStream:(JavaIoInputStream *)input {`
`3439`	`3439`	`return CGPParseDelimitedFromInputStream([self getDescriptor], input, nil);`
`3440`	`3440`	`}`
`3441`	`3441`
`3442`		`-+ (id)parseDelimitedFromWithJavaIoInputStream:(JavaIoInputStream *)input`
`3443`		`- withComGoogleProtobufExtensionRegistryLite:(CGPExtensionRegistryLite *)registry {`
	`3442`	`++ (instancetype)parseDelimitedFromWithJavaIoInputStream:(JavaIoInputStream *)input`
	`3443`	`+ withComGoogleProtobufExtensionRegistryLite:(CGPExtensionRegistryLite *)registry {`
`3444`	`3444`	`return CGPParseDelimitedFromInputStream([self getDescriptor], input, registry);`
`3445`	`3445`	`}`
`3446`	`3446`
`@@ -3653,9 +3653,9 @@ - (CGPDescriptor *)getDescriptorForType {`
`3653`	`3653`	`return [object_getClass(self) getDescriptor];`
`3654`	`3654`	`}`
`3655`	`3655`
`3656`		`-- (ComGoogleProtobufGeneratedMessage *)getDefaultInstanceForType {`
	`3656`	`+- (instancetype)getDefaultInstanceForType {`
`3657`	`3657`	`CGPDescriptor *descriptor = [object_getClass(self) getDescriptor];`
`3658`		`- return descriptor->defaultInstance_;`
	`3658`	`+ return (id)descriptor->defaultInstance_;`
`3659`	`3659`	`}`
`3660`	`3660`
`3661`	`3661`	`- (id<ComGoogleProtobufMessage_Builder>)`
`@@ -3765,8 +3765,7 @@ - (id)getRepeatedFieldWithComGoogleProtobufDescriptors_FieldDescriptor:`
`3765`	`3765`	`return GetAllFields(self);`
`3766`	`3766`	`}`
`3767`	`3767`
`3768`		`-- (id<ComGoogleProtobufMessage_Builder>)mergeFromWithComGoogleProtobufMessage:`
`3769`		`- (id<ComGoogleProtobufMessage>)message {`
	`3768`	`+- (instancetype)mergeFromWithComGoogleProtobufMessage:(id<ComGoogleProtobufMessage>)message {`
`3770`	`3769`	`CGPDescriptor *descriptor = [object_getClass(self) getDescriptor];`
`3771`	`3770`	`CGPDescriptor *otherDescriptor = [object_getClass(message) getDescriptor];`
`3772`	`3771`	`if (descriptor != otherDescriptor) {`
`@@ -3840,7 +3839,7 @@ - (bool)mergeDelimitedFromWithJavaIoInputStream:(JavaIoInputStream *)input`
`3840`	`3839`	`return self;`
`3841`	`3840`	`}`
`3842`	`3841`
`3843`		`-- (id<ComGoogleProtobufMessage_Builder>)mergeFromWithByteArray:(IOSByteArray *)data {`
	`3842`	`+- (instancetype)mergeFromWithByteArray:(IOSByteArray *)data {`
`3844`	`3843`	`return [self mergeFromWithByteArray:data withComGoogleProtobufExtensionRegistryLite:nil];`
`3845`	`3844`	`}`
`3846`	`3845`