diff --git a/build/tools/clang/test/Analysis/Output/retain-release.m.tmp.objc.plist b/build/tools/clang/test/Analysis/Output/retain-release.m.tmp.objc.plist
index 9211381..e181304 100644
--- a/build/tools/clang/test/Analysis/Output/retain-release.m.tmp.objc.plist
+++ b/build/tools/clang/test/Analysis/Output/retain-release.m.tmp.objc.plist
@@ -11726,44 +11726,10 @@
    <key>path</key>
    <array>
     <dict>
-     <key>kind</key><string>control</string>
-     <key>edges</key>
-      <array>
-       <dict>
-        <key>start</key>
-         <array>
-          <dict>
-           <key>line</key><integer>838</integer>
-           <key>col</key><integer>3</integer>
-           <key>file</key><integer>0</integer>
-          </dict>
-          <dict>
-           <key>line</key><integer>838</integer>
-           <key>col</key><integer>3</integer>
-           <key>file</key><integer>0</integer>
-          </dict>
-         </array>
-        <key>end</key>
-         <array>
-          <dict>
-           <key>line</key><integer>839</integer>
-           <key>col</key><integer>3</integer>
-           <key>file</key><integer>0</integer>
-          </dict>
-          <dict>
-           <key>line</key><integer>839</integer>
-           <key>col</key><integer>3</integer>
-           <key>file</key><integer>0</integer>
-          </dict>
-         </array>
-       </dict>
-      </array>
-    </dict>
-    <dict>
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
-      <key>line</key><integer>839</integer>
+      <key>line</key><integer>838</integer>
       <key>col</key><integer>3</integer>
       <key>file</key><integer>0</integer>
      </dict>
@@ -11771,12 +11737,12 @@
      <array>
        <array>
         <dict>
-         <key>line</key><integer>839</integer>
+         <key>line</key><integer>838</integer>
          <key>col</key><integer>3</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>839</integer>
+         <key>line</key><integer>838</integer>
          <key>col</key><integer>18</integer>
          <key>file</key><integer>0</integer>
         </dict>
@@ -11784,15 +11750,15 @@
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
-     <string>Calling &apos;noCopyString&apos;</string>
+     <string>Calling &apos;NoCopyString&apos;</string>
      <key>message</key>
-     <string>Calling &apos;noCopyString&apos;</string>
+     <string>Calling &apos;NoCopyString&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
-      <key>line</key><integer>834</integer>
+      <key>line</key><integer>833</integer>
       <key>col</key><integer>1</integer>
       <key>file</key><integer>0</integer>
      </dict>
@@ -11810,12 +11776,12 @@
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>834</integer>
+           <key>line</key><integer>833</integer>
            <key>col</key><integer>1</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>834</integer>
+           <key>line</key><integer>833</integer>
            <key>col</key><integer>1</integer>
            <key>file</key><integer>0</integer>
           </dict>
@@ -11823,12 +11789,12 @@
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>834</integer>
+           <key>line</key><integer>833</integer>
            <key>col</key><integer>30</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>834</integer>
+           <key>line</key><integer>833</integer>
            <key>col</key><integer>35</integer>
            <key>file</key><integer>0</integer>
           </dict>
@@ -11844,12 +11810,12 @@
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>834</integer>
+           <key>line</key><integer>833</integer>
            <key>col</key><integer>30</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>834</integer>
+           <key>line</key><integer>833</integer>
            <key>col</key><integer>35</integer>
            <key>file</key><integer>0</integer>
           </dict>
@@ -11857,12 +11823,12 @@
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>834</integer>
+           <key>line</key><integer>833</integer>
            <key>col</key><integer>37</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>834</integer>
+           <key>line</key><integer>833</integer>
            <key>col</key><integer>37</integer>
            <key>file</key><integer>0</integer>
           </dict>
@@ -11874,7 +11840,7 @@
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
-      <key>line</key><integer>834</integer>
+      <key>line</key><integer>833</integer>
       <key>col</key><integer>37</integer>
       <key>file</key><integer>0</integer>
      </dict>
@@ -11882,12 +11848,12 @@
      <array>
        <array>
         <dict>
-         <key>line</key><integer>834</integer>
+         <key>line</key><integer>833</integer>
          <key>col</key><integer>37</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>834</integer>
+         <key>line</key><integer>833</integer>
          <key>col</key><integer>59</integer>
          <key>file</key><integer>0</integer>
         </dict>
@@ -11903,7 +11869,7 @@
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
-      <key>line</key><integer>839</integer>
+      <key>line</key><integer>838</integer>
       <key>col</key><integer>3</integer>
       <key>file</key><integer>0</integer>
      </dict>
@@ -11911,12 +11877,12 @@
      <array>
        <array>
         <dict>
-         <key>line</key><integer>839</integer>
+         <key>line</key><integer>838</integer>
          <key>col</key><integer>3</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>839</integer>
+         <key>line</key><integer>838</integer>
          <key>col</key><integer>18</integer>
          <key>file</key><integer>0</integer>
         </dict>
@@ -11924,9 +11890,43 @@
      </array>
      <key>depth</key><integer>1</integer>
      <key>extended_message</key>
-     <string>Returning from &apos;noCopyString&apos;</string>
+     <string>Returning from &apos;NoCopyString&apos;</string>
      <key>message</key>
-     <string>Returning from &apos;noCopyString&apos;</string>
+     <string>Returning from &apos;NoCopyString&apos;</string>
+    </dict>
+    <dict>
+     <key>kind</key><string>control</string>
+     <key>edges</key>
+      <array>
+       <dict>
+        <key>start</key>
+         <array>
+          <dict>
+           <key>line</key><integer>838</integer>
+           <key>col</key><integer>3</integer>
+           <key>file</key><integer>0</integer>
+          </dict>
+          <dict>
+           <key>line</key><integer>838</integer>
+           <key>col</key><integer>3</integer>
+           <key>file</key><integer>0</integer>
+          </dict>
+         </array>
+        <key>end</key>
+         <array>
+          <dict>
+           <key>line</key><integer>839</integer>
+           <key>col</key><integer>3</integer>
+           <key>file</key><integer>0</integer>
+          </dict>
+          <dict>
+           <key>line</key><integer>839</integer>
+           <key>col</key><integer>3</integer>
+           <key>file</key><integer>0</integer>
+          </dict>
+         </array>
+       </dict>
+      </array>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
