diff --git a/objectivec/GPBDictionary.h b/objectivec/GPBDictionary.h
index a81165e815..d00b5b3116 100644
--- a/objectivec/GPBDictionary.h
+++ b/objectivec/GPBDictionary.h
@@ -109,7 +109,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (^)(uint32_t key, uint32_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(uint32_t key, uint32_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -204,7 +204,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndInt32sUsingBlock:
-    (void (^)(uint32_t key, int32_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(uint32_t key, int32_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -299,7 +299,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (^)(uint32_t key, uint64_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(uint32_t key, uint64_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -394,7 +394,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndInt64sUsingBlock:
-    (void (^)(uint32_t key, int64_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(uint32_t key, int64_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -489,7 +489,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndBoolsUsingBlock:
-    (void (^)(uint32_t key, BOOL value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(uint32_t key, BOOL value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -584,7 +584,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndFloatsUsingBlock:
-    (void (^)(uint32_t key, float value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(uint32_t key, float value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -679,7 +679,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndDoublesUsingBlock:
-    (void (^)(uint32_t key, double value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(uint32_t key, double value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -795,7 +795,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndEnumsUsingBlock:
-    (void (^)(uint32_t key, int32_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(uint32_t key, int32_t value, BOOL *stop))block;
 
 /**
  * Gets the raw enum value for the given key.
@@ -822,7 +822,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:     A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (^)(uint32_t key, int32_t rawValue, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(uint32_t key, int32_t rawValue, BOOL *stop))block;
 
 /**
  * Adds the keys and raw enum values from another dictionary.
@@ -935,7 +935,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:        A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndObjectsUsingBlock:
-    (void (^)(uint32_t key, ObjectType object, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(uint32_t key, ObjectType object, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -1030,7 +1030,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (^)(int32_t key, uint32_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(int32_t key, uint32_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -1125,7 +1125,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndInt32sUsingBlock:
-    (void (^)(int32_t key, int32_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(int32_t key, int32_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -1220,7 +1220,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (^)(int32_t key, uint64_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(int32_t key, uint64_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -1315,7 +1315,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndInt64sUsingBlock:
-    (void (^)(int32_t key, int64_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(int32_t key, int64_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -1410,7 +1410,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndBoolsUsingBlock:
-    (void (^)(int32_t key, BOOL value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(int32_t key, BOOL value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -1505,7 +1505,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndFloatsUsingBlock:
-    (void (^)(int32_t key, float value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(int32_t key, float value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -1600,7 +1600,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndDoublesUsingBlock:
-    (void (^)(int32_t key, double value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(int32_t key, double value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -1716,7 +1716,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndEnumsUsingBlock:
-    (void (^)(int32_t key, int32_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(int32_t key, int32_t value, BOOL *stop))block;
 
 /**
  * Gets the raw enum value for the given key.
@@ -1743,7 +1743,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:     A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (^)(int32_t key, int32_t rawValue, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(int32_t key, int32_t rawValue, BOOL *stop))block;
 
 /**
  * Adds the keys and raw enum values from another dictionary.
@@ -1856,7 +1856,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:        A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndObjectsUsingBlock:
-    (void (^)(int32_t key, ObjectType object, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(int32_t key, ObjectType object, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -1951,7 +1951,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (^)(uint64_t key, uint32_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(uint64_t key, uint32_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -2046,7 +2046,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndInt32sUsingBlock:
-    (void (^)(uint64_t key, int32_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(uint64_t key, int32_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -2141,7 +2141,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (^)(uint64_t key, uint64_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(uint64_t key, uint64_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -2236,7 +2236,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndInt64sUsingBlock:
-    (void (^)(uint64_t key, int64_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(uint64_t key, int64_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -2331,7 +2331,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndBoolsUsingBlock:
-    (void (^)(uint64_t key, BOOL value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(uint64_t key, BOOL value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -2426,7 +2426,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndFloatsUsingBlock:
-    (void (^)(uint64_t key, float value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(uint64_t key, float value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -2521,7 +2521,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndDoublesUsingBlock:
-    (void (^)(uint64_t key, double value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(uint64_t key, double value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -2637,7 +2637,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndEnumsUsingBlock:
-    (void (^)(uint64_t key, int32_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(uint64_t key, int32_t value, BOOL *stop))block;
 
 /**
  * Gets the raw enum value for the given key.
@@ -2664,7 +2664,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:     A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (^)(uint64_t key, int32_t rawValue, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(uint64_t key, int32_t rawValue, BOOL *stop))block;
 
 /**
  * Adds the keys and raw enum values from another dictionary.
@@ -2777,7 +2777,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:        A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndObjectsUsingBlock:
-    (void (^)(uint64_t key, ObjectType object, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(uint64_t key, ObjectType object, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -2872,7 +2872,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (^)(int64_t key, uint32_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(int64_t key, uint32_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -2967,7 +2967,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndInt32sUsingBlock:
-    (void (^)(int64_t key, int32_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(int64_t key, int32_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -3062,7 +3062,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (^)(int64_t key, uint64_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(int64_t key, uint64_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -3157,7 +3157,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndInt64sUsingBlock:
-    (void (^)(int64_t key, int64_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(int64_t key, int64_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -3252,7 +3252,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndBoolsUsingBlock:
-    (void (^)(int64_t key, BOOL value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(int64_t key, BOOL value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -3347,7 +3347,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndFloatsUsingBlock:
-    (void (^)(int64_t key, float value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(int64_t key, float value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -3442,7 +3442,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndDoublesUsingBlock:
-    (void (^)(int64_t key, double value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(int64_t key, double value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -3558,7 +3558,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndEnumsUsingBlock:
-    (void (^)(int64_t key, int32_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(int64_t key, int32_t value, BOOL *stop))block;
 
 /**
  * Gets the raw enum value for the given key.
@@ -3585,7 +3585,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:     A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (^)(int64_t key, int32_t rawValue, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(int64_t key, int32_t rawValue, BOOL *stop))block;
 
 /**
  * Adds the keys and raw enum values from another dictionary.
@@ -3698,7 +3698,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:        A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndObjectsUsingBlock:
-    (void (^)(int64_t key, ObjectType object, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(int64_t key, ObjectType object, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -3793,7 +3793,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (^)(BOOL key, uint32_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(BOOL key, uint32_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -3888,7 +3888,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndInt32sUsingBlock:
-    (void (^)(BOOL key, int32_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(BOOL key, int32_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -3983,7 +3983,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (^)(BOOL key, uint64_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(BOOL key, uint64_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -4078,7 +4078,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndInt64sUsingBlock:
-    (void (^)(BOOL key, int64_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(BOOL key, int64_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -4173,7 +4173,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndBoolsUsingBlock:
-    (void (^)(BOOL key, BOOL value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(BOOL key, BOOL value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -4268,7 +4268,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndFloatsUsingBlock:
-    (void (^)(BOOL key, float value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(BOOL key, float value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -4363,7 +4363,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndDoublesUsingBlock:
-    (void (^)(BOOL key, double value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(BOOL key, double value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -4479,7 +4479,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndEnumsUsingBlock:
-    (void (^)(BOOL key, int32_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(BOOL key, int32_t value, BOOL *stop))block;
 
 /**
  * Gets the raw enum value for the given key.
@@ -4506,7 +4506,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:     A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (^)(BOOL key, int32_t rawValue, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(BOOL key, int32_t rawValue, BOOL *stop))block;
 
 /**
  * Adds the keys and raw enum values from another dictionary.
@@ -4619,7 +4619,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:        A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndObjectsUsingBlock:
-    (void (^)(BOOL key, ObjectType object, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(BOOL key, ObjectType object, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -4714,7 +4714,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (^)(NSString *key, uint32_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(NSString *key, uint32_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -4809,7 +4809,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndInt32sUsingBlock:
-    (void (^)(NSString *key, int32_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(NSString *key, int32_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -4904,7 +4904,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (^)(NSString *key, uint64_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(NSString *key, uint64_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -4999,7 +4999,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndInt64sUsingBlock:
-    (void (^)(NSString *key, int64_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(NSString *key, int64_t value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -5094,7 +5094,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndBoolsUsingBlock:
-    (void (^)(NSString *key, BOOL value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(NSString *key, BOOL value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -5189,7 +5189,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndFloatsUsingBlock:
-    (void (^)(NSString *key, float value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(NSString *key, float value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -5284,7 +5284,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndDoublesUsingBlock:
-    (void (^)(NSString *key, double value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(NSString *key, double value, BOOL *stop))block;
 
 /**
  * Adds the keys and values from another dictionary.
@@ -5400,7 +5400,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:       A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndEnumsUsingBlock:
-    (void (^)(NSString *key, int32_t value, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(NSString *key, int32_t value, BOOL *stop))block;
 
 /**
  * Gets the raw enum value for the given key.
@@ -5427,7 +5427,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   **stop**:     A pointer to a boolean that when set stops the enumeration.
  **/
 - (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (^)(NSString *key, int32_t rawValue, BOOL *stop))block;
+    (void (NS_NOESCAPE ^)(NSString *key, int32_t rawValue, BOOL *stop))block;
 
 /**
  * Adds the keys and raw enum values from another dictionary.
@@ -5693,7 +5693,7 @@ NS_ASSUME_NONNULL_END
 //% *   **stop**:     A pointer to a boolean that when set stops the enumeration.
 //% **/
 //%- (void)enumerateKeysAndRawValuesUsingBlock:
-//%    (void (^)(KEY_TYPE KisP##key, VALUE_TYPE rawValue, BOOL *stop))block;
+//%    (void (NS_NOESCAPE ^)(KEY_TYPE KisP##key, VALUE_TYPE rawValue, BOOL *stop))block;
 //%
 //%/**
 //% * Adds the keys and raw enum values from another dictionary.
@@ -5728,7 +5728,7 @@ NS_ASSUME_NONNULL_END
 //% *   **stop**: ##VNAME_VAR$S## A pointer to a boolean that when set stops the enumeration.
 //% **/
 //%- (void)enumerateKeysAnd##VNAME##sUsingBlock:
-//%    (void (^)(KEY_TYPE KisP##key, VALUE_TYPE VNAME_VAR, BOOL *stop))block;
+//%    (void (NS_NOESCAPE ^)(KEY_TYPE KisP##key, VALUE_TYPE VNAME_VAR, BOOL *stop))block;
 
 //%PDDM-DEFINE DICTIONARY_MUTABLE_INTERFACE(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE, VHELPER, VNAME, VNAME_VAR)
 //%/**
diff --git a/objectivec/GPBDictionary.m b/objectivec/GPBDictionary.m
index cedf5e549d..1bb24be0cd 100644
--- a/objectivec/GPBDictionary.m
+++ b/objectivec/GPBDictionary.m
@@ -719,7 +719,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 //%}
 //%
 //%- (void)enumerateKeysAndEnumsUsingBlock:
-//%    (void (^)(KEY_TYPE KisP##key, VALUE_TYPE value, BOOL *stop))block {
+//%    (void (NS_NOESCAPE ^)(KEY_TYPE KisP##key, VALUE_TYPE value, BOOL *stop))block {
 //%  GPBEnumValidationFunc func = _validationFunc;
 //%  BOOL stop = NO;
 //%  NSEnumerator *keys = [_dictionary keyEnumerator];
@@ -792,7 +792,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 //%}
 //%
 //%- (void)enumerateKeysAnd##ACCESSOR_NAME##VNAME##sUsingBlock:
-//%    (void (^)(KEY_TYPE KisP##key, VALUE_TYPE VNAME_VAR, BOOL *stop))block {
+//%    (void (NS_NOESCAPE ^)(KEY_TYPE KisP##key, VALUE_TYPE VNAME_VAR, BOOL *stop))block {
 //%  BOOL stop = NO;
 //%  NSDictionary *internal = _dictionary;
 //%  NSEnumerator *keys = [internal keyEnumerator];
@@ -857,7 +857,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 //%  [_dictionary setObject:WRAPPED##VHELPER(value->##GPBVALUE_##VHELPER(VALUE_NAME)##) forKey:WRAPPED##KHELPER(key->value##KEY_NAME)];
 //%}
 //%
-//%- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+//%- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
 //%  [self enumerateKeysAnd##ACCESSOR_NAME##VNAME##sUsingBlock:^(KEY_TYPE KisP##key, VALUE_TYPE VNAME_VAR, BOOL *stop) {
 //%      #pragma unused(stop)
 //%      block(TEXT_FORMAT_OBJ##KEY_NAME(key), TEXT_FORMAT_OBJ##VALUE_NAME(VNAME_VAR));
@@ -967,7 +967,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 //%
 //%BOOL_SET_GPBVALUE_FOR_KEY_##HELPER(VALUE_NAME, VALUE_TYPE, VisP)
 //%
-//%- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+//%- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
 //%  if (BOOL_DICT_HAS##HELPER(0, )) {
 //%    block(@"false", TEXT_FORMAT_OBJ##VALUE_NAME(_values[0]));
 //%  }
@@ -977,7 +977,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 //%}
 //%
 //%- (void)enumerateKeysAnd##VNAME##sUsingBlock:
-//%    (void (^)(BOOL key, VALUE_TYPE VNAME_VAR, BOOL *stop))block {
+//%    (void (NS_NOESCAPE ^)(BOOL key, VALUE_TYPE VNAME_VAR, BOOL *stop))block {
 //%  BOOL stop = NO;
 //%  if (BOOL_DICT_HAS##HELPER(0, )) {
 //%    block(NO, _values[0], &stop);
@@ -1505,7 +1505,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (^)(uint32_t key, uint32_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(uint32_t key, uint32_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -1570,7 +1570,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueUInt32) forKey:@(key->valueUInt32)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndUInt32sUsingBlock:^(uint32_t key, uint32_t value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%u", key], [NSString stringWithFormat:@"%u", value]);
@@ -1688,7 +1688,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndInt32sUsingBlock:
-    (void (^)(uint32_t key, int32_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(uint32_t key, int32_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -1753,7 +1753,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueInt32) forKey:@(key->valueUInt32)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndInt32sUsingBlock:^(uint32_t key, int32_t value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%u", key], [NSString stringWithFormat:@"%d", value]);
@@ -1871,7 +1871,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (^)(uint32_t key, uint64_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(uint32_t key, uint64_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -1936,7 +1936,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueUInt64) forKey:@(key->valueUInt32)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndUInt64sUsingBlock:^(uint32_t key, uint64_t value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%u", key], [NSString stringWithFormat:@"%llu", value]);
@@ -2054,7 +2054,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndInt64sUsingBlock:
-    (void (^)(uint32_t key, int64_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(uint32_t key, int64_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -2119,7 +2119,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueInt64) forKey:@(key->valueUInt32)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndInt64sUsingBlock:^(uint32_t key, int64_t value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%u", key], [NSString stringWithFormat:@"%lld", value]);
@@ -2237,7 +2237,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndBoolsUsingBlock:
-    (void (^)(uint32_t key, BOOL value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(uint32_t key, BOOL value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -2302,7 +2302,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueBool) forKey:@(key->valueUInt32)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndBoolsUsingBlock:^(uint32_t key, BOOL value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%u", key], (value ? @"true" : @"false"));
@@ -2420,7 +2420,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndFloatsUsingBlock:
-    (void (^)(uint32_t key, float value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(uint32_t key, float value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -2485,7 +2485,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueFloat) forKey:@(key->valueUInt32)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndFloatsUsingBlock:^(uint32_t key, float value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%u", key], [NSString stringWithFormat:@"%.*g", FLT_DIG, value]);
@@ -2603,7 +2603,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndDoublesUsingBlock:
-    (void (^)(uint32_t key, double value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(uint32_t key, double value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -2668,7 +2668,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueDouble) forKey:@(key->valueUInt32)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndDoublesUsingBlock:^(uint32_t key, double value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%u", key], [NSString stringWithFormat:@"%.*lg", DBL_DIG, value]);
@@ -2799,7 +2799,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (^)(uint32_t key, int32_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(uint32_t key, int32_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -2876,7 +2876,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueEnum) forKey:@(key->valueUInt32)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndRawValuesUsingBlock:^(uint32_t key, int32_t value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%u", key], @(value));
@@ -2904,7 +2904,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndEnumsUsingBlock:
-    (void (^)(uint32_t key, int32_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(uint32_t key, int32_t value, BOOL *stop))block {
   GPBEnumValidationFunc func = _validationFunc;
   BOOL stop = NO;
   NSEnumerator *keys = [_dictionary keyEnumerator];
@@ -3042,7 +3042,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndObjectsUsingBlock:
-    (void (^)(uint32_t key, id object, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(uint32_t key, id object, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -3131,7 +3131,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:value->valueString forKey:@(key->valueUInt32)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndObjectsUsingBlock:^(uint32_t key, id object, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%u", key], object);
@@ -3253,7 +3253,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (^)(int32_t key, uint32_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(int32_t key, uint32_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -3318,7 +3318,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueUInt32) forKey:@(key->valueInt32)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndUInt32sUsingBlock:^(int32_t key, uint32_t value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%d", key], [NSString stringWithFormat:@"%u", value]);
@@ -3436,7 +3436,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndInt32sUsingBlock:
-    (void (^)(int32_t key, int32_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(int32_t key, int32_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -3501,7 +3501,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueInt32) forKey:@(key->valueInt32)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndInt32sUsingBlock:^(int32_t key, int32_t value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%d", key], [NSString stringWithFormat:@"%d", value]);
@@ -3619,7 +3619,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (^)(int32_t key, uint64_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(int32_t key, uint64_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -3684,7 +3684,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueUInt64) forKey:@(key->valueInt32)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndUInt64sUsingBlock:^(int32_t key, uint64_t value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%d", key], [NSString stringWithFormat:@"%llu", value]);
@@ -3802,7 +3802,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndInt64sUsingBlock:
-    (void (^)(int32_t key, int64_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(int32_t key, int64_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -3867,7 +3867,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueInt64) forKey:@(key->valueInt32)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndInt64sUsingBlock:^(int32_t key, int64_t value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%d", key], [NSString stringWithFormat:@"%lld", value]);
@@ -3985,7 +3985,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndBoolsUsingBlock:
-    (void (^)(int32_t key, BOOL value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(int32_t key, BOOL value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -4050,7 +4050,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueBool) forKey:@(key->valueInt32)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndBoolsUsingBlock:^(int32_t key, BOOL value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%d", key], (value ? @"true" : @"false"));
@@ -4168,7 +4168,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndFloatsUsingBlock:
-    (void (^)(int32_t key, float value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(int32_t key, float value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -4233,7 +4233,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueFloat) forKey:@(key->valueInt32)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndFloatsUsingBlock:^(int32_t key, float value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%d", key], [NSString stringWithFormat:@"%.*g", FLT_DIG, value]);
@@ -4351,7 +4351,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndDoublesUsingBlock:
-    (void (^)(int32_t key, double value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(int32_t key, double value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -4416,7 +4416,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueDouble) forKey:@(key->valueInt32)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndDoublesUsingBlock:^(int32_t key, double value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%d", key], [NSString stringWithFormat:@"%.*lg", DBL_DIG, value]);
@@ -4547,7 +4547,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (^)(int32_t key, int32_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(int32_t key, int32_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -4624,7 +4624,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueEnum) forKey:@(key->valueInt32)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndRawValuesUsingBlock:^(int32_t key, int32_t value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%d", key], @(value));
@@ -4652,7 +4652,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndEnumsUsingBlock:
-    (void (^)(int32_t key, int32_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(int32_t key, int32_t value, BOOL *stop))block {
   GPBEnumValidationFunc func = _validationFunc;
   BOOL stop = NO;
   NSEnumerator *keys = [_dictionary keyEnumerator];
@@ -4790,7 +4790,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndObjectsUsingBlock:
-    (void (^)(int32_t key, id object, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(int32_t key, id object, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -4879,7 +4879,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:value->valueString forKey:@(key->valueInt32)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndObjectsUsingBlock:^(int32_t key, id object, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%d", key], object);
@@ -5001,7 +5001,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (^)(uint64_t key, uint32_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(uint64_t key, uint32_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -5066,7 +5066,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueUInt32) forKey:@(key->valueUInt64)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndUInt32sUsingBlock:^(uint64_t key, uint32_t value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%llu", key], [NSString stringWithFormat:@"%u", value]);
@@ -5184,7 +5184,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndInt32sUsingBlock:
-    (void (^)(uint64_t key, int32_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(uint64_t key, int32_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -5249,7 +5249,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueInt32) forKey:@(key->valueUInt64)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndInt32sUsingBlock:^(uint64_t key, int32_t value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%llu", key], [NSString stringWithFormat:@"%d", value]);
@@ -5367,7 +5367,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (^)(uint64_t key, uint64_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(uint64_t key, uint64_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -5432,7 +5432,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueUInt64) forKey:@(key->valueUInt64)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndUInt64sUsingBlock:^(uint64_t key, uint64_t value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%llu", key], [NSString stringWithFormat:@"%llu", value]);
@@ -5550,7 +5550,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndInt64sUsingBlock:
-    (void (^)(uint64_t key, int64_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(uint64_t key, int64_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -5615,7 +5615,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueInt64) forKey:@(key->valueUInt64)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndInt64sUsingBlock:^(uint64_t key, int64_t value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%llu", key], [NSString stringWithFormat:@"%lld", value]);
@@ -5733,7 +5733,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndBoolsUsingBlock:
-    (void (^)(uint64_t key, BOOL value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(uint64_t key, BOOL value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -5798,7 +5798,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueBool) forKey:@(key->valueUInt64)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndBoolsUsingBlock:^(uint64_t key, BOOL value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%llu", key], (value ? @"true" : @"false"));
@@ -5916,7 +5916,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndFloatsUsingBlock:
-    (void (^)(uint64_t key, float value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(uint64_t key, float value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -5981,7 +5981,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueFloat) forKey:@(key->valueUInt64)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndFloatsUsingBlock:^(uint64_t key, float value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%llu", key], [NSString stringWithFormat:@"%.*g", FLT_DIG, value]);
@@ -6099,7 +6099,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndDoublesUsingBlock:
-    (void (^)(uint64_t key, double value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(uint64_t key, double value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -6164,7 +6164,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueDouble) forKey:@(key->valueUInt64)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndDoublesUsingBlock:^(uint64_t key, double value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%llu", key], [NSString stringWithFormat:@"%.*lg", DBL_DIG, value]);
@@ -6295,7 +6295,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (^)(uint64_t key, int32_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(uint64_t key, int32_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -6372,7 +6372,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueEnum) forKey:@(key->valueUInt64)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndRawValuesUsingBlock:^(uint64_t key, int32_t value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%llu", key], @(value));
@@ -6400,7 +6400,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndEnumsUsingBlock:
-    (void (^)(uint64_t key, int32_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(uint64_t key, int32_t value, BOOL *stop))block {
   GPBEnumValidationFunc func = _validationFunc;
   BOOL stop = NO;
   NSEnumerator *keys = [_dictionary keyEnumerator];
@@ -6538,7 +6538,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndObjectsUsingBlock:
-    (void (^)(uint64_t key, id object, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(uint64_t key, id object, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -6627,7 +6627,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:value->valueString forKey:@(key->valueUInt64)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndObjectsUsingBlock:^(uint64_t key, id object, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%llu", key], object);
@@ -6749,7 +6749,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (^)(int64_t key, uint32_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(int64_t key, uint32_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -6814,7 +6814,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueUInt32) forKey:@(key->valueInt64)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndUInt32sUsingBlock:^(int64_t key, uint32_t value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%lld", key], [NSString stringWithFormat:@"%u", value]);
@@ -6932,7 +6932,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndInt32sUsingBlock:
-    (void (^)(int64_t key, int32_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(int64_t key, int32_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -6997,7 +6997,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueInt32) forKey:@(key->valueInt64)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndInt32sUsingBlock:^(int64_t key, int32_t value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%lld", key], [NSString stringWithFormat:@"%d", value]);
@@ -7115,7 +7115,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (^)(int64_t key, uint64_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(int64_t key, uint64_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -7180,7 +7180,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueUInt64) forKey:@(key->valueInt64)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndUInt64sUsingBlock:^(int64_t key, uint64_t value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%lld", key], [NSString stringWithFormat:@"%llu", value]);
@@ -7298,7 +7298,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndInt64sUsingBlock:
-    (void (^)(int64_t key, int64_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(int64_t key, int64_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -7363,7 +7363,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueInt64) forKey:@(key->valueInt64)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndInt64sUsingBlock:^(int64_t key, int64_t value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%lld", key], [NSString stringWithFormat:@"%lld", value]);
@@ -7481,7 +7481,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndBoolsUsingBlock:
-    (void (^)(int64_t key, BOOL value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(int64_t key, BOOL value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -7546,7 +7546,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueBool) forKey:@(key->valueInt64)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndBoolsUsingBlock:^(int64_t key, BOOL value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%lld", key], (value ? @"true" : @"false"));
@@ -7664,7 +7664,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndFloatsUsingBlock:
-    (void (^)(int64_t key, float value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(int64_t key, float value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -7729,7 +7729,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueFloat) forKey:@(key->valueInt64)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndFloatsUsingBlock:^(int64_t key, float value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%lld", key], [NSString stringWithFormat:@"%.*g", FLT_DIG, value]);
@@ -7847,7 +7847,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndDoublesUsingBlock:
-    (void (^)(int64_t key, double value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(int64_t key, double value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -7912,7 +7912,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueDouble) forKey:@(key->valueInt64)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndDoublesUsingBlock:^(int64_t key, double value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%lld", key], [NSString stringWithFormat:@"%.*lg", DBL_DIG, value]);
@@ -8043,7 +8043,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (^)(int64_t key, int32_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(int64_t key, int32_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -8120,7 +8120,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueEnum) forKey:@(key->valueInt64)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndRawValuesUsingBlock:^(int64_t key, int32_t value, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%lld", key], @(value));
@@ -8148,7 +8148,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndEnumsUsingBlock:
-    (void (^)(int64_t key, int32_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(int64_t key, int32_t value, BOOL *stop))block {
   GPBEnumValidationFunc func = _validationFunc;
   BOOL stop = NO;
   NSEnumerator *keys = [_dictionary keyEnumerator];
@@ -8286,7 +8286,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndObjectsUsingBlock:
-    (void (^)(int64_t key, id object, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(int64_t key, id object, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -8375,7 +8375,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:value->valueString forKey:@(key->valueInt64)];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndObjectsUsingBlock:^(int64_t key, id object, BOOL *stop) {
       #pragma unused(stop)
       block([NSString stringWithFormat:@"%lld", key], object);
@@ -8501,7 +8501,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (^)(NSString *key, uint32_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(NSString *key, uint32_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -8566,7 +8566,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueUInt32) forKey:key->valueString];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndUInt32sUsingBlock:^(NSString *key, uint32_t value, BOOL *stop) {
       #pragma unused(stop)
       block(key, [NSString stringWithFormat:@"%u", value]);
@@ -8692,7 +8692,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndInt32sUsingBlock:
-    (void (^)(NSString *key, int32_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(NSString *key, int32_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -8757,7 +8757,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueInt32) forKey:key->valueString];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndInt32sUsingBlock:^(NSString *key, int32_t value, BOOL *stop) {
       #pragma unused(stop)
       block(key, [NSString stringWithFormat:@"%d", value]);
@@ -8883,7 +8883,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (^)(NSString *key, uint64_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(NSString *key, uint64_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -8948,7 +8948,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueUInt64) forKey:key->valueString];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndUInt64sUsingBlock:^(NSString *key, uint64_t value, BOOL *stop) {
       #pragma unused(stop)
       block(key, [NSString stringWithFormat:@"%llu", value]);
@@ -9074,7 +9074,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndInt64sUsingBlock:
-    (void (^)(NSString *key, int64_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(NSString *key, int64_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -9139,7 +9139,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueInt64) forKey:key->valueString];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndInt64sUsingBlock:^(NSString *key, int64_t value, BOOL *stop) {
       #pragma unused(stop)
       block(key, [NSString stringWithFormat:@"%lld", value]);
@@ -9265,7 +9265,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndBoolsUsingBlock:
-    (void (^)(NSString *key, BOOL value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(NSString *key, BOOL value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -9330,7 +9330,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueBool) forKey:key->valueString];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndBoolsUsingBlock:^(NSString *key, BOOL value, BOOL *stop) {
       #pragma unused(stop)
       block(key, (value ? @"true" : @"false"));
@@ -9456,7 +9456,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndFloatsUsingBlock:
-    (void (^)(NSString *key, float value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(NSString *key, float value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -9521,7 +9521,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueFloat) forKey:key->valueString];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndFloatsUsingBlock:^(NSString *key, float value, BOOL *stop) {
       #pragma unused(stop)
       block(key, [NSString stringWithFormat:@"%.*g", FLT_DIG, value]);
@@ -9647,7 +9647,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndDoublesUsingBlock:
-    (void (^)(NSString *key, double value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(NSString *key, double value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -9712,7 +9712,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueDouble) forKey:key->valueString];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndDoublesUsingBlock:^(NSString *key, double value, BOOL *stop) {
       #pragma unused(stop)
       block(key, [NSString stringWithFormat:@"%.*lg", DBL_DIG, value]);
@@ -9851,7 +9851,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (^)(NSString *key, int32_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(NSString *key, int32_t value, BOOL *stop))block {
   BOOL stop = NO;
   NSDictionary *internal = _dictionary;
   NSEnumerator *keys = [internal keyEnumerator];
@@ -9928,7 +9928,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   [_dictionary setObject:@(value->valueEnum) forKey:key->valueString];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   [self enumerateKeysAndRawValuesUsingBlock:^(NSString *key, int32_t value, BOOL *stop) {
       #pragma unused(stop)
       block(key, @(value));
@@ -9956,7 +9956,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndEnumsUsingBlock:
-    (void (^)(NSString *key, int32_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(NSString *key, int32_t value, BOOL *stop))block {
   GPBEnumValidationFunc func = _validationFunc;
   BOOL stop = NO;
   NSEnumerator *keys = [_dictionary keyEnumerator];
@@ -10143,7 +10143,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   _valueSet[idx] = YES;
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   if (_valueSet[0]) {
     block(@"false", [NSString stringWithFormat:@"%u", _values[0]]);
   }
@@ -10153,7 +10153,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (^)(BOOL key, uint32_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(BOOL key, uint32_t value, BOOL *stop))block {
   BOOL stop = NO;
   if (_valueSet[0]) {
     block(NO, _values[0], &stop);
@@ -10352,7 +10352,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   _valueSet[idx] = YES;
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   if (_valueSet[0]) {
     block(@"false", [NSString stringWithFormat:@"%d", _values[0]]);
   }
@@ -10362,7 +10362,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndInt32sUsingBlock:
-    (void (^)(BOOL key, int32_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(BOOL key, int32_t value, BOOL *stop))block {
   BOOL stop = NO;
   if (_valueSet[0]) {
     block(NO, _values[0], &stop);
@@ -10561,7 +10561,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   _valueSet[idx] = YES;
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   if (_valueSet[0]) {
     block(@"false", [NSString stringWithFormat:@"%llu", _values[0]]);
   }
@@ -10571,7 +10571,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (^)(BOOL key, uint64_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(BOOL key, uint64_t value, BOOL *stop))block {
   BOOL stop = NO;
   if (_valueSet[0]) {
     block(NO, _values[0], &stop);
@@ -10770,7 +10770,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   _valueSet[idx] = YES;
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   if (_valueSet[0]) {
     block(@"false", [NSString stringWithFormat:@"%lld", _values[0]]);
   }
@@ -10780,7 +10780,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndInt64sUsingBlock:
-    (void (^)(BOOL key, int64_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(BOOL key, int64_t value, BOOL *stop))block {
   BOOL stop = NO;
   if (_valueSet[0]) {
     block(NO, _values[0], &stop);
@@ -10979,7 +10979,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   _valueSet[idx] = YES;
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   if (_valueSet[0]) {
     block(@"false", (_values[0] ? @"true" : @"false"));
   }
@@ -10989,7 +10989,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndBoolsUsingBlock:
-    (void (^)(BOOL key, BOOL value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(BOOL key, BOOL value, BOOL *stop))block {
   BOOL stop = NO;
   if (_valueSet[0]) {
     block(NO, _values[0], &stop);
@@ -11188,7 +11188,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   _valueSet[idx] = YES;
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   if (_valueSet[0]) {
     block(@"false", [NSString stringWithFormat:@"%.*g", FLT_DIG, _values[0]]);
   }
@@ -11198,7 +11198,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndFloatsUsingBlock:
-    (void (^)(BOOL key, float value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(BOOL key, float value, BOOL *stop))block {
   BOOL stop = NO;
   if (_valueSet[0]) {
     block(NO, _values[0], &stop);
@@ -11397,7 +11397,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   _valueSet[idx] = YES;
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   if (_valueSet[0]) {
     block(@"false", [NSString stringWithFormat:@"%.*lg", DBL_DIG, _values[0]]);
   }
@@ -11407,7 +11407,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndDoublesUsingBlock:
-    (void (^)(BOOL key, double value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(BOOL key, double value, BOOL *stop))block {
   BOOL stop = NO;
   if (_valueSet[0]) {
     block(NO, _values[0], &stop);
@@ -11598,7 +11598,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   _values[idx] = [value->valueString retain];
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   if (_values[0] != nil) {
     block(@"false", _values[0]);
   }
@@ -11608,7 +11608,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndObjectsUsingBlock:
-    (void (^)(BOOL key, id object, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(BOOL key, id object, BOOL *stop))block {
   BOOL stop = NO;
   if (_values[0] != nil) {
     block(NO, _values[0], &stop);
@@ -11857,7 +11857,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (^)(BOOL key, int32_t value, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(BOOL key, int32_t value, BOOL *stop))block {
   BOOL stop = NO;
   if (_valueSet[0]) {
     block(NO, _values[0], &stop);
@@ -11868,7 +11868,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
 }
 
 - (void)enumerateKeysAndEnumsUsingBlock:
-    (void (^)(BOOL key, int32_t rawValue, BOOL *stop))block {
+    (void (NS_NOESCAPE ^)(BOOL key, int32_t rawValue, BOOL *stop))block {
   BOOL stop = NO;
   GPBEnumValidationFunc func = _validationFunc;
   int32_t validatedValue;
@@ -11942,7 +11942,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
   }
 }
 
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block {
+- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
   if (_valueSet[0]) {
     block(@"false", @(_values[0]));
   }