From 4ba30923fabfca78a0d8cbef8e153bd2fb83ad17 Mon Sep 17 00:00:00 2001 From: Dave MacLachlan Date: Wed, 15 Nov 2017 08:41:29 -0800 Subject: [PATCH] code review cleanup --- objectivec/GPBMessage.m | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/objectivec/GPBMessage.m b/objectivec/GPBMessage.m index 649ed8a69..90485bd1b 100644 --- a/objectivec/GPBMessage.m +++ b/objectivec/GPBMessage.m @@ -2998,6 +2998,9 @@ typedef struct ResolveIvarAccessorMethodResult { SEL encodingSelector; } ResolveIvarAccessorMethodResult; +// |field| can be __unsafe_unretained because they are created at startup +// and are essentially global. No need to pay for retain/release when +// they are captured in blocks. static void ResolveIvarGet(__unsafe_unretained GPBFieldDescriptor *field, ResolveIvarAccessorMethodResult *result) { GPBDataType fieldDataType = GPBGetFieldDataType(field); @@ -3040,6 +3043,7 @@ static void ResolveIvarGet(__unsafe_unretained GPBFieldDescriptor *field, } } +// See comment about __unsafe_unretained on ResolveIvarGet. static void ResolveIvarSet(__unsafe_unretained GPBFieldDescriptor *field, GPBFileSyntax syntax, ResolveIvarAccessorMethodResult *result) { @@ -3084,13 +3088,9 @@ static void ResolveIvarSet(__unsafe_unretained GPBFieldDescriptor *field, // NOTE: hasOrCountSel_/setHasSel_ will be NULL if the field for the given // message should not have has support (done in GPBDescriptor.m), so there is // no need for checks here to see if has*/setHas* are allowed. - ResolveIvarAccessorMethodResult result = {NULL, NULL}; - - // |field| can be __unsafe_unretained because they are created at startup - // and are essentially global. No need to pay for retain/release when - // they are captured in blocks. + // See comment about __unsafe_unretained on ResolveIvarGet. for (__unsafe_unretained GPBFieldDescriptor *field in descriptor->fields_) { BOOL isMapOrArray = GPBFieldIsMapOrArray(field); if (!isMapOrArray) {