Fix for eDO to manage extra release (from ARC) for non vanilla selectors.

Service/Sources/EDOInvocationMessage.m

@@ -140,6 +140,24 @@ static EDOMethodFamily MethodTypeOfRetainsReturn(const char *methodName, Class t
   }
 }
 
+/**
+ *  Gets the length of the prefix of the given family type.
+ *
+ *
+ *  @param FamilyType The EDOMethodFamily (enum).
+ *  @return The length of the prefix associated with the EDOMethodFamily.
+ */
+static size_t PrefixLengthForEDOMethodFamily(EDOMethodFamily FamilyType) {
+  int familySize = sizeof(kRetainReturnsMethodsFamily) / sizeof(MethodFamily);
+  for (int methodIdx = 0; methodIdx < familySize; methodIdx++) {
+    MethodFamily methodFam = kRetainReturnsMethodsFamily[methodIdx];
+    if (methodFam.family == FamilyType) {
+      return methodFam.length;
+    }
+  }
+  return 0;
+}
+
 static EDORemoteException *CreateRemoteException(id localException) {
   if (!localException) {
     return nil;
@@ -198,8 +216,11 @@ - (instancetype)initWithReturnValue:(EDOBoxedValueType *)value
     _returnValue = value;
     _exception = exception;
     _outValues = outValues;
-    _returnRetained = MethodTypeOfRetainsReturn(request.selectorName.UTF8String, targetClass) !=
-                      EDOMethodFamilyNone;
+
+    EDOMethodFamily familyType =
+        MethodTypeOfRetainsReturn(request.selectorName.UTF8String, targetClass);
+    _returnRetained = familyType != EDOMethodFamilyNone &&
+                      [request.selectorName length] > PrefixLengthForEDOMethodFamily(familyType);
   }
   return self;
 }
@@ -429,7 +450,9 @@ + (EDORequestHandler)requestHandler {
             returnValue = request.returnByValue ? [EDOParameter parameterWithObject:obj]
                                                 : BOX_VALUE(obj, nil, service, hostPort);
           }
-          if (family != EDOMethodFamilyNone) {
+
+          if (family != EDOMethodFamilyNone &&
+              [request.selectorName length] > PrefixLengthForEDOMethodFamily(family)) {
             // We need to do an extra release here because the method return is not autoreleased,
             // and because the invocation is dynamically created, ARC won't insert an extra release
             // for us.
@@ -526,4 +549,4 @@ - (NSString *)description {
                                     self.messageID, self.target, self.selectorName];
 }
 
-@end
+@end

Service/Tests/FunctionalTests/EDOServiceUIMemoryTest.m

@@ -60,6 +60,48 @@ - (void)testStubClassAllocEqualsInit {
   XCTAssertEqual(testDummy.value, 10);
 }
 
+/** Verifies the retain count of the vanilla `new` method is balanced. */
+- (void)testStubClassNewBalancesRetainCount {
+  __weak EDOTestClassDummy *testDummy;
+  @autoreleasepool {
+    // The autoreleasepool to assure the inserted releases within the scope and all the temporary
+    // objects if any will be reclaimed.
+    id strongRef = [EDOTestClassDummy new];  // NOLINT
+    testDummy = strongRef;
+    XCTAssertNotNil(testDummy);
+  }
+  // Ensure the appropriate value is retrieved from the object.
+  XCTAssertNil(testDummy);
+}
+
+- (void)testStubClassCopyBalancesRetainCount {
+  EDOTestClassDummy *testDummy;
+  @autoreleasepool {
+    // The autoreleasepool to assure the inserted releases within the scope and all the temporary
+    // objects if any will be reclaimed.
+    // +alloc should return the same instance as from -init.
+    EDOTestClassDummy *strongRef = [EDOTestClassDummy alloc];
+    testDummy = [strongRef copy];
+    XCTAssertNotNil(testDummy);
+  }
+  // Ensure the appropriate value is retrieved from the object.
+  XCTAssertNotNil(testDummy);
+}
+
+- (void)testStubClassMutableCopyBalancesRetainCount {
+  EDOTestClassDummy *testDummy;
+  @autoreleasepool {
+    // The autoreleasepool to assure the inserted releases within the scope and all the temporary
+    // objects if any will be reclaimed.
+    // +alloc should return the same instance as from -init.
+    EDOTestClassDummy *strongRef = [EDOTestClassDummy alloc];
+    testDummy = [strongRef mutableCopy];
+    XCTAssertNotNil(testDummy);
+  }
+  // Ensure the appropriate value is retrieved from the object.
+  XCTAssertNotNil(testDummy);
+}
+
 - (void)testAllocFamilyRetainsReturn {
   EDOTestClassDummy *testDummy1, *testDummy2, *testDummy3;
   @autoreleasepool {
@@ -76,6 +118,47 @@ - (void)testAllocFamilyRetainsReturn {
   XCTAssertEqual(testDummy3.value, 30);
 }
 
+- (void)testNewPrefixedFamilyRetainsReturn {
+  __weak EDOTestClassDummy *testDummy;
+  @autoreleasepool {
+    // The autoreleasepool to assure the inserted releases within the scope and all the temporary
+    // objects if any will be reclaimed.
+    id strongRef = [EDOTestClassDummy newBuilder];
+    testDummy = strongRef;
+    XCTAssertNotNil(testDummy);
+  }
+  // Ensure the appropriate value is retrieved from the object.
+  XCTAssertNil(testDummy);
+}
+
+- (void)testCopyPrefixedFamilyRetainsReturn {
+  EDOTestClassDummy *testDummy;
+  @autoreleasepool {
+    // The autoreleasepool to assure the inserted releases within the scope and all the temporary
+    // objects if any will be reclaimed.
+    // +alloc should return the same instance as from -init.
+    EDOTestClassDummy *strongRef = [EDOTestClassDummy alloc];
+    testDummy = [strongRef copyDummy];
+    XCTAssertNotNil(testDummy);
+  }
+  // Ensure the appropriate value is retrieved from the object.
+  XCTAssertNotNil(testDummy);
+}
+
+- (void)testMutableCopyPrefixedFamilyRetainsReturn {
+  EDOTestClassDummy *testDummy;
+  @autoreleasepool {
+    // The autoreleasepool to assure the inserted releases within the scope and all the temporary
+    // objects if any will be reclaimed.
+    // +alloc should return the same instance as from -init.
+    EDOTestClassDummy *strongRef = [EDOTestClassDummy alloc];
+    testDummy = [strongRef mutableCopyDummy];
+    XCTAssertNotNil(testDummy);
+  }
+  // Ensure the appropriate value is retrieved from the object.
+  XCTAssertNotNil(testDummy);
+}
+
 - (void)testAllocRemoteValueType {
   XCTAssertThrowsSpecificNamed([[EDO_REMOTE_CLASS(NSData, EDOTEST_APP_SERVICE_PORT) alloc] init],
                                EDORemoteException, EDOServiceAllocValueTypeException);

Service/Tests/TestsBundle/EDOTestClassDummy.h

@@ -47,7 +47,35 @@
  */
 + (instancetype)allocateDummy;
 
+/**
+ *  A method with the new prefix belonging to the new family.
+ *  http://clang.llvm.org/docs/AutomaticReferenceCounting.html#method-families
+ */
++ (instancetype)newBuilder;
+
+/**
+ *  This is the method invoked behind the scenes for vanilla copy.
+ */
+- (instancetype)copyWithZone:(NSZone*)zone;
+
+/**
+ *  A method with the copy prefix belonging to the copy family.
+ *  http://clang.llvm.org/docs/AutomaticReferenceCounting.html#method-families
+ */
+- (instancetype)copyDummy;
+
+/**
+ *  This is the method invoked behind the scenes for vanilla mutableCopy.
+ */
+- (instancetype)mutableCopyWithZone:(NSZone*)zone;
+
+/**
+ *  A method with the mutableCopy prefix belonging to the mutableCopy family.
+ *  http://clang.llvm.org/docs/AutomaticReferenceCounting.html#method-families
+ */
+- (instancetype)mutableCopyDummy;
+
 + (int)classMethodWithInt:(int)value;
-+ (EDOTestClassDummy *)classMethodWithIdReturn:(int)value;
++ (EDOTestClassDummy*)classMethodWithIdReturn:(int)value;
 
 @end

Service/Tests/TestsBundle/EDOTestClassDummy.m

@@ -30,6 +30,34 @@ + (instancetype)allocateDummy {
   return [self alloc];
 }
 
++ (instancetype)newBuilder {
+  return [self new];
+}
+
+- (instancetype)copyWithZone:(NSZone *)zone {
+  EDOTestClassDummy *newInstance = [[EDOTestClassDummy alloc] init];
+  newInstance->_value = _value;
+  return newInstance;
+}
+
+- (instancetype)copyDummy {
+  EDOTestClassDummy *newInstance = [[EDOTestClassDummy alloc] init];
+  newInstance->_value = _value;
+  return newInstance;
+}
+
+- (instancetype)mutableCopyWithZone:(NSZone *)zone {
+  EDOTestClassDummy *newInstance = [[EDOTestClassDummy alloc] init];
+  newInstance->_value = _value;
+  return newInstance;
+}
+
+- (instancetype)mutableCopyDummy {
+  EDOTestClassDummy *newInstance = [[EDOTestClassDummy alloc] init];
+  newInstance->_value = _value;
+  return newInstance;
+}
+
 + (int)classMethodWithInt:(int)value {
   return [self classMethodWithIdReturn:value].value + 9;
 }