[analyzer] trackExpressionValue(): Handle unknown values better

[Charusso]

Summary

If we have an unknown value do not treat it as known.

[Charusso]

Suppressed example:

return-non-null.html542 KBDownload

[NoQ]

Ah, that positive!

No, i don't think this is a valid way to suppress it. I'll tease you a bit more though, and only give a hint: the null value that we're null-dereferencing was in fact assumed to be null in the top frame, not within any inline function. Therefore the whole "Returning pointer..." note is completely misleading: it is irrelevant what value we return from getSuperRegion(), we might have as well evaluated it conservatively, the report would still have been emitted.

[Charusso]

• The report was too misleading.
• It turns out we have to keep non-nulls.
• Now we do not treat unknown values as known.

[Charusso]

In D62978#1533558, @NoQ wrote:

Ah, that positive!

Positive == true positive, not false positive, I got it.

No, i don't think this is a valid way to suppress it.

Bought me, they are worth to report. The misleading reports made me think I have to suppress them.

Example (difference starts at note 33, at line 410):

before.html918 KBDownload

after.html171 KBDownload

[NoQ]

clang/test/Analysis/diagnostics/find_last_store.c

9–10

This remaining note is also unnecessary. You can safely stop tracking the value at e || .... In particular, ReturnVisitor is not at fault.

That said, when we renamed trackNullOrUndefValue to trackExpressionValue, we kinda assumed that it's not really important whether the value is null/undef or not - the function simply tracks the value. This change would break this invariant, causing null values to be handled in a special manner. I recommend adding another flag argument (similar to EnableNullFPSuppression) that would allow the caller to tell whether it's interested in the null or in the "whole" value (defaulting to the latter).

[Charusso]

clang/test/Analysis/diagnostics/deref-track-symbolic-region.c

14

Here.

clang/test/Analysis/diagnostics/find_last_store.c

9–10

That is a great idea! I tried my best but after a while I give up because it is already too complex, so I just removed them. It turns out it makes sense to remove those notes, see inline.

clang/test/Analysis/diagnostics/macro-null-return-suppression.cpp

53

Here.

clang/test/Analysis/loop-widening-notes.cpp

12

Here.

clang/test/Analysis/uninit-const.cpp

59

Here we mismatch the parameter.

[NoQ]

This problem is fairly complicated. We clearly need both behaviors (sometimes track until the definition, sometimes track until the collapse-to-null), and it's not clear to me right now when exactly do we need each of them. This is also not a high priority for GSoC because neither there are a lot of warnings of this kind (~15 or so) nor they're actually that false. I suggest taking this more slowly and delay this patch until we actually understand what is the right thing to do here.

clang/test/Analysis/null-deref-path-notes.cpp

20

This note was pretty good. It's not very clear but we should definitely keep it.

clang/test/Analysis/uninit-vals.m

405

These notes are also nice, we should keep them.

clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp

static void addVisitorIfNecessary(const ExplodedNode *Node, const Stmt *S,
     AnalyzerOptions &Options = State->getAnalysisManager().options;
 
     bool EnableNullFPSuppression = false;
     if (InEnableNullFPSuppression &&
         Options.ShouldSuppressNullReturnPaths)
       if (Optional<Loc> RetLoc = RetVal.getAs<Loc>())
         EnableNullFPSuppression = State->isNull(*RetLoc).isConstrainedTrue();
 
-    BR.markInteresting(CalleeContext);
     BR.addVisitor(llvm::make_unique<ReturnVisitor>(CalleeContext,
                                                    EnableNullFPSuppression,
                                                    Options));
   }
 
   std::shared_ptr<PathDiagnosticPiece>
   visitNodeInitial(const ExplodedNode *N,
                    BugReporterContext &BRC, BugReport &BR) {
visitNodeInitial(const ExplodedNode *N,
 
     // Ignore aggregate rvalues.
     if (V.getAs<nonloc::LazyCompoundVal>() ||
         V.getAs<nonloc::CompoundVal>())
       return nullptr;
 
     RetE = RetE->IgnoreParenCasts();
 
-    // If we're returning 0, we should track where that 0 came from.
-    bugreporter::trackExpressionValue(N, RetE, BR, EnableNullFPSuppression);
-
     // Build an appropriate message based on the return value.
     SmallString<64> Msg;
     llvm::raw_svector_ostream Out(Msg);
 
+    // Known to be null.
     if (State->isNull(V).isConstrainedTrue()) {
       if (V.getAs<Loc>()) {
-
         // If we have counter-suppression enabled, make sure we keep visiting
         // future nodes. We want to emit a path note as well, in case
         // the report is resurrected as valid later on.
         if (EnableNullFPSuppression &&
             Options.ShouldAvoidSuppressingNullArgumentPaths)
           Mode = MaybeUnsuppress;
 
         if (RetE->getType()->isObjCObjectPointerType()) {
           Out << "Returning nil";
         } else {
           Out << "Returning null pointer";
         }
       } else {
         Out << "Returning zero";
       }
-
-    } else {
+    // Known to be non-null.
+    } else if (State->isNonNull(V).isConstrainedTrue()) {
       if (auto CI = V.getAs<nonloc::ConcreteInt>()) {
         Out << "Returning the value " << CI->getValue();
       } else if (V.getAs<Loc>()) {
         Out << "Returning pointer";
       } else {
         Out << "Returning value";
       }
+    // Unknown value. If a pointer and its LValue is available treat as known.
+    } else if (V.getAs<Loc>() && LValue) {
+      Out << "Returning pointer";
     }
 
+    // If we do not return a known value do not report that.
+    if (Msg.empty())
+      return nullptr;
+
     if (LValue) {
       if (const MemRegion *MR = LValue->getAsRegion()) {
         if (MR->canPrintPretty()) {
           Out << " (reference to ";
           MR->printPretty(Out);
           Out << ")";
         }
       }
     } else {
       // FIXME: We should have a more generalized location printing mechanism.
       if (const auto *DR = dyn_cast<DeclRefExpr>(RetE))
         if (const auto *DD = dyn_cast<DeclaratorDecl>(DR->getDecl()))
           Out << " (loaded from '" << *DD << "')";
     }
 
+    // If we return a value track where it came from.
+    bugreporter::trackExpressionValue(N, RetE, BR, EnableNullFPSuppression);
+
     PathDiagnosticLocation L(Ret, BRC.getSourceManager(), StackFrame);
     if (!L.isValid() || !L.asLocation().isValid())
       return nullptr;
 
     return std::make_shared<PathDiagnosticEventPiece>(L, Out.str());
   }
 
   std::shared_ptr<PathDiagnosticPiece>
if (!FrameSpace) {
     return true;
   }
 
   assert(VR->getDecl()->hasLocalStorage());
   const LocationContext *LCtx = N->getLocationContext();
   return FrameSpace->getStackFrame() == LCtx->getStackFrame();
 }
 
-/// Show diagnostics for initializing or declaring a region \p R with a bad value.
-static void showBRDiagnostics(const char *action, llvm::raw_svector_ostream &os,
+/// Show diagnostics for initializing/declaring a region \p R with a bad value.
+/// \returns Whether we create a report.
+static bool showBRDiagnostics(const char *action, llvm::raw_svector_ostream &os,
                               const MemRegion *R, SVal V, const DeclStmt *DS) {
   if (R->canPrintPretty()) {
     R->printPretty(os);
     os << " ";
   }
 
   if (V.getAs<loc::ConcreteInt>()) {
     bool b = false;
if (V.isUndef()) {
           os << (R->canPrintPretty() ? "initialized" : "Initializing")
             << " to a garbage value";
         } else {
           os << (R->canPrintPretty() ? "declared" : "Declaring")
             << " without an initial value";
         }
       }
     } else {
-      os << (R->canPrintPretty() ? "initialized" : "Initialized")
-        << " here";
+      // At this point we do not make a report.
+      return false;
     }
   }
+
+  return true;
 }
 
 /// Display diagnostics for passing bad region as a parameter.
-static void showBRParamDiagnostics(llvm::raw_svector_ostream& os,
-    const VarRegion *VR,
-    SVal V) {
+/// \returns Whether we create a report.
+static bool showBRParamDiagnostics(llvm::raw_svector_ostream &os,
+                                   const VarRegion *VR, SVal V) {
   const auto *Param = cast<ParmVarDecl>(VR->getDecl());
 
   os << "Passing ";
 
   if (V.getAs<loc::ConcreteInt>()) {
     if (Param->getType()->isObjCObjectPointerType())
       os << "nil object reference";
     else
       os << "null pointer value";
   } else if (V.isUndef()) {
     os << "uninitialized value";
   } else if (auto CI = V.getAs<nonloc::ConcreteInt>()) {
     os << "the value " << CI->getValue();
   } else {
-    os << "value";
+    // At this point we do not make a report.
+    return false;
   }
 
   // Printed parameter indexes are 1-based, not 0-based.
   unsigned Idx = Param->getFunctionScopeIndex() + 1;
   os << " via " << Idx << llvm::getOrdinalSuffix(Idx) << " parameter";
   if (VR->canPrintPretty()) {
     os << " ";
     VR->printPretty(os);
   }
+
+  return true;
 }
 
 /// Show default diagnostics for storing bad region.
-static void showBRDefaultDiagnostics(llvm::raw_svector_ostream& os,
+/// \returns Whether we create a report.
+static bool showBRDefaultDiagnostics(llvm::raw_svector_ostream& os,
     const MemRegion *R,
     SVal V) {
   if (V.getAs<loc::ConcreteInt>()) {
     bool b = false;
     if (R->isBoundable()) {
       if (const auto *TR = dyn_cast<TypedValueRegion>(R)) {
         if (TR->getValueType()->isObjCObjectPointerType()) {
           os << "nil object reference stored";
static bool showBRDefaultDiagnostics(llvm::raw_svector_ostream& os,
 
   } else if (auto CV = V.getAs<nonloc::ConcreteInt>()) {
     if (R->canPrintPretty())
       os << "The value " << CV->getValue() << " is assigned";
     else
       os << "Assigning " << CV->getValue();
 
   } else {
-    if (R->canPrintPretty())
-      os << "Value assigned";
-    else
-      os << "Assigning value";
+    // At this point we do not make a report.
+    return false;
   }
 
   if (R->canPrintPretty()) {
     os << " to ";
     R->printPretty(os);
   }
+
+  return true;
 }
 
 std::shared_ptr<PathDiagnosticPiece>
 FindLastStoreBRVisitor::VisitNode(const ExplodedNode *Succ,
                                   BugReporterContext &BRC, BugReport &BR) {
   if (Satisfied)
     return nullptr;
 
if (DS) {
           if (const VarRegion *OriginalR = BDR->getOriginalRegion(VR)) {
             if (auto KV = State->getSVal(OriginalR).getAs<KnownSVal>())
               BR.addVisitor(llvm::make_unique<FindLastStoreBRVisitor>(
                   *KV, OriginalR, EnableNullFPSuppression));
           }
         }
       }
     }
+
     if (action)
-      showBRDiagnostics(action, os, R, V, DS);
+      if (!showBRDiagnostics(action, os, R, V, DS))
+        return nullptr;
 
   } else if (StoreSite->getLocation().getAs<CallEnter>()) {
     if (const auto *VR = dyn_cast<VarRegion>(R))
-      showBRParamDiagnostics(os, VR, V);
+      if (!showBRParamDiagnostics(os, VR, V))
+        return nullptr;
   }
 
   if (os.str().empty())
-    showBRDefaultDiagnostics(os, R, V);
+    if (!showBRDefaultDiagnostics(os, R, V))
+      return nullptr;
 
   // Construct a new PathDiagnosticPiece.
   ProgramPoint P = StoreSite->getLocation();
   PathDiagnosticLocation L;
   if (P.getAs<CallEnter>() && InitE)
     L = PathDiagnosticLocation(InitE, BRC.getSourceManager(),
                                P.getLocationContext());
 

clang/test/Analysis/CFContainers.mm

void OutOfBoundsZiro(const void ** input, CFIndex S) {
   CFArrayRef array;
   // The API allows to set the size to 0. Check that we don't undeflow when the size is 0.
   array = CFArrayCreate(kCFAllocatorDefault, 0, 0, 0);
   const void *s1 = CFArrayGetValueAtIndex(array, 0); // expected-warning {{Index is out of bounds}}
                                                      // expected-note@-1 {{Index is out of bounds}}
 }
 
 void TestGetCount(CFArrayRef A, CFIndex sIndex) {
-  CFIndex sCount = CFArrayGetCount(A); // expected-note{{'sCount' initialized here}}
+  CFIndex sCount = CFArrayGetCount(A);
   if (sCount > sIndex) // expected-note{{Assuming 'sCount' is <= 'sIndex'}}
                        // expected-note@-1{{Taking false branch}}
     const void *s1 = CFArrayGetValueAtIndex(A, sIndex);
   const void *s2 = CFArrayGetValueAtIndex(A, sCount);// expected-warning {{Index is out of bounds}}
                                                      // expected-note@-1 {{Index is out of bounds}}
 }
 
 typedef void* XX[3];
void TestCFMutableArrayRefEscapeViaMutableArgument(CFMutableArrayRef a) {
   ArrayRefMutableEscape(a);
 
   // ArrayRefMutableEscape could mutate a to make it have
   // at least aLen + 1 elements, so do not report an error here.
   CFArrayGetValueAtIndex(a, aLen);
 }
 
 void TestCFMutableArrayRefEscapeViaImmutableArgument(CFMutableArrayRef a) {
-  CFIndex aLen = CFArrayGetCount(a); // expected-note{{'aLen' initialized here}}
+  CFIndex aLen = CFArrayGetCount(a);
   ArrayRefEscape(a);
 
   // ArrayRefEscape is declared to take a CFArrayRef (i.e, an immutable array)
   // so we assume it does not change the length of a.
   CFArrayGetValueAtIndex(a, aLen); // expected-warning {{Index is out of bounds}}
                                    // expected-note@-1 {{Index is out of bounds}}
 }

clang/test/Analysis/Inputs/expected-plists/edges-new.mm.plist

<key>edges</key>
            <key>col</key><integer>4</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
            <key>line</key><integer>103</integer>
-           <key>col</key><integer>8</integer>
+           <key>col</key><integer>7</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
            <key>line</key><integer>103</integer>
-           <key>col</key><integer>8</integer>
+           <key>col</key><integer>7</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>103</integer>
       <key>col</key><integer>8</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
          <key>line</key><integer>103</integer>
          <key>col</key><integer>8</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
          <key>line</key><integer>103</integer>
-         <key>col</key><integer>28</integer>
-         <key>file</key><integer>0</integer>
-        </dict>
-       </array>
-     </array>
-     <key>depth</key><integer>0</integer>
-     <key>extended_message</key>
-     <string>Value assigned to &apos;p&apos;</string>
-     <key>message</key>
-     <string>Value assigned to &apos;p&apos;</string>
-    </dict>
-    <dict>
-     <key>kind</key><string>event</string>
-     <key>location</key>
-     <dict>
-      <key>line</key><integer>103</integer>
-      <key>col</key><integer>8</integer>
-      <key>file</key><integer>0</integer>
-     </dict>
-     <key>ranges</key>
-     <array>
-       <array>
-        <dict>
-         <key>line</key><integer>103</integer>
-         <key>col</key><integer>8</integer>
-         <key>file</key><integer>0</integer>
-        </dict>
-        <dict>
-         <key>line</key><integer>103</integer>
          <key>col</key><integer>8</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Assuming &apos;p&apos; is null</string>

clang/test/Analysis/Inputs/expected-plists/null-deref-path-notes.m.plist

<array>
     <integer>19</integer>
    </array>
   </dict>
   </dict>
   <dict>
    <key>path</key>
    <array>
     <dict>
-     <key>kind</key><string>event</string>
-     <key>location</key>
-     <dict>
-      <key>line</key><integer>28</integer>
-      <key>col</key><integer>3</integer>
-      <key>file</key><integer>0</integer>
-     </dict>
-     <key>ranges</key>
-     <array>
-       <array>
-        <dict>
-         <key>line</key><integer>28</integer>
-         <key>col</key><integer>3</integer>
-         <key>file</key><integer>0</integer>
-        </dict>
-        <dict>
-         <key>line</key><integer>28</integer>
-         <key>col</key><integer>33</integer>
-         <key>file</key><integer>0</integer>
-        </dict>
-       </array>
-     </array>
-     <key>depth</key><integer>0</integer>
-     <key>extended_message</key>
-     <string>Value assigned to &apos;self&apos;</string>
-     <key>message</key>
-     <string>Value assigned to &apos;self&apos;</string>
-    </dict>
-    <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
            <key>line</key><integer>28</integer>

clang/test/Analysis/Inputs/expected-plists/plist-macros.cpp.plist

<array>
          <key>line</key><integer>87</integer>
          <key>col</key><integer>12</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
-     <string>Passing value via 1st parameter &apos;a&apos;</string>
-     <key>message</key>
-     <string>Passing value via 1st parameter &apos;a&apos;</string>
-    </dict>
-    <dict>
-     <key>kind</key><string>event</string>
-     <key>location</key>
-     <dict>
-      <key>line</key><integer>87</integer>
-      <key>col</key><integer>3</integer>
-      <key>file</key><integer>0</integer>
-     </dict>
-     <key>ranges</key>
-     <array>
-       <array>
-        <dict>
-         <key>line</key><integer>87</integer>
-         <key>col</key><integer>3</integer>
-         <key>file</key><integer>0</integer>
-        </dict>
-        <dict>
-         <key>line</key><integer>87</integer>
-         <key>col</key><integer>12</integer>
-         <key>file</key><integer>0</integer>
-        </dict>
-       </array>
-     </array>
-     <key>depth</key><integer>0</integer>
-     <key>extended_message</key>
      <string>Calling &apos;null_deref&apos;</string>
      <key>message</key>
      <string>Calling &apos;null_deref&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
<array>
      </array>
      <key>depth</key><integer>1</integer>
      <key>extended_message</key>
      <string>Assuming &apos;a&apos; is null</string>
      <key>message</key>
      <string>Assuming &apos;a&apos; is null</string>
     </dict>
     <dict>
+     <key>kind</key><string>event</string>
+     <key>location</key>
+     <dict>
+      <key>line</key><integer>77</integer>
+      <key>col</key><integer>7</integer>
+      <key>file</key><integer>0</integer>
+     </dict>
+     <key>ranges</key>
+     <array>
+       <array>
+        <dict>
+         <key>line</key><integer>77</integer>
+         <key>col</key><integer>7</integer>
+         <key>file</key><integer>0</integer>
+        </dict>
+        <dict>
+         <key>line</key><integer>77</integer>
+         <key>col</key><integer>7</integer>
+         <key>file</key><integer>0</integer>
+        </dict>
+       </array>
+     </array>
+     <key>depth</key><integer>1</integer>
+     <key>extended_message</key>
+     <string>Assuming pointer value is null</string>
+     <key>message</key>
+     <string>Assuming pointer value is null</string>
+    </dict>
+    <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
            <key>line</key><integer>77</integer>

clang/test/Analysis/Inputs/expected-plists/plist-output.m.plist

<array>
        <array>
         <dict>
          <key>line</key><integer>56</integer>
          <key>col</key><integer>7</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
          <key>line</key><integer>56</integer>
-         <key>col</key><integer>27</integer>
-         <key>file</key><integer>0</integer>
-        </dict>
-       </array>
-     </array>
-     <key>depth</key><integer>0</integer>
-     <key>extended_message</key>
-     <string>Value assigned to &apos;p&apos;</string>
-     <key>message</key>
-     <string>Value assigned to &apos;p&apos;</string>
-    </dict>
-    <dict>
-     <key>kind</key><string>event</string>
-     <key>location</key>
-     <dict>
-      <key>line</key><integer>56</integer>
-      <key>col</key><integer>7</integer>
-      <key>file</key><integer>0</integer>
-     </dict>
-     <key>ranges</key>
-     <array>
-       <array>
-        <dict>
-         <key>line</key><integer>56</integer>
-         <key>col</key><integer>7</integer>
-         <key>file</key><integer>0</integer>
-        </dict>
-        <dict>
-         <key>line</key><integer>56</integer>
          <key>col</key><integer>7</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Assuming &apos;p&apos; is null</string>

clang/test/Analysis/diagnostics/Inputs/expected-plists/deref-track-symbolic-region.c.plist

<key>edges</key>
            <key>line</key><integer>13</integer>
            <key>col</key><integer>5</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>14</integer>
-           <key>col</key><integer>3</integer>
-           <key>file</key><integer>0</integer>
-          </dict>
-          <dict>
-           <key>line</key><integer>14</integer>
-           <key>col</key><integer>5</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>14</integer>
-      <key>col</key><integer>3</integer>
-      <key>file</key><integer>0</integer>
-     </dict>
-     <key>ranges</key>
-     <array>
-       <array>
-        <dict>
-         <key>line</key><integer>14</integer>
-         <key>col</key><integer>3</integer>
-         <key>file</key><integer>0</integer>
-        </dict>
-        <dict>
-         <key>line</key><integer>14</integer>
-         <key>col</key><integer>15</integer>
-         <key>file</key><integer>0</integer>
-        </dict>
-       </array>
-     </array>
-     <key>depth</key><integer>0</integer>
-     <key>extended_message</key>
-     <string>Value assigned to &apos;syz.x&apos;</string>
-     <key>message</key>
-     <string>Value assigned to &apos;syz.x&apos;</string>
-    </dict>
-    <dict>
-     <key>kind</key><string>control</string>
-     <key>edges</key>
-      <array>
-       <dict>
-        <key>start</key>
-         <array>
-          <dict>
-           <key>line</key><integer>14</integer>
-           <key>col</key><integer>3</integer>
-           <key>file</key><integer>0</integer>
-          </dict>
-          <dict>
-           <key>line</key><integer>14</integer>
-           <key>col</key><integer>5</integer>
-           <key>file</key><integer>0</integer>
-          </dict>
-         </array>
-        <key>end</key>
-         <array>
-          <dict>
            <key>line</key><integer>17</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
            <key>line</key><integer>17</integer>
            <key>col</key><integer>4</integer>
            <key>file</key><integer>0</integer>
<key>edges</key>
            <key>line</key><integer>28</integer>
            <key>col</key><integer>5</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>29</integer>
-           <key>col</key><integer>3</integer>
-           <key>file</key><integer>0</integer>
-          </dict>
-          <dict>
-           <key>line</key><integer>29</integer>
-           <key>col</key><integer>5</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>29</integer>
-      <key>col</key><integer>3</integer>
-      <key>file</key><integer>0</integer>
-     </dict>
-     <key>ranges</key>
-     <array>
-       <array>
-        <dict>
-         <key>line</key><integer>29</integer>
-         <key>col</key><integer>3</integer>
-         <key>file</key><integer>0</integer>
-        </dict>
-        <dict>
-         <key>line</key><integer>29</integer>
-         <key>col</key><integer>15</integer>
-         <key>file</key><integer>0</integer>
-        </dict>
-       </array>
-     </array>
-     <key>depth</key><integer>0</integer>
-     <key>extended_message</key>
-     <string>Value assigned to &apos;syz.x&apos;</string>
-     <key>message</key>
-     <string>Value assigned to &apos;syz.x&apos;</string>
-    </dict>
-    <dict>
-     <key>kind</key><string>control</string>
-     <key>edges</key>
-      <array>
-       <dict>
-        <key>start</key>
-         <array>
-          <dict>
-           <key>line</key><integer>29</integer>
-           <key>col</key><integer>3</integer>
-           <key>file</key><integer>0</integer>
-          </dict>
-          <dict>
-           <key>line</key><integer>29</integer>
-           <key>col</key><integer>5</integer>
-           <key>file</key><integer>0</integer>
-          </dict>
-         </array>
-        <key>end</key>
-         <array>
-          <dict>
            <key>line</key><integer>32</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
            <key>line</key><integer>32</integer>
            <key>col</key><integer>4</integer>
            <key>file</key><integer>0</integer>

clang/test/Analysis/diagnostics/deref-track-symbolic-region.c

 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-output=text -verify %s
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-output=plist-multi-file  %s -o %t.plist
 // RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/deref-track-symbolic-region.c.plist -
 
 struct S {
   int *x;
   int y;
 };
 
 int *foo();
 
 void test(struct S syz, int *pp) {
   int m = 0;
-  syz.x = foo(); // expected-note{{Value assigned to 'syz.x'}}
+  syz.x = foo();
 
   struct S *ps = &syz;
   if (ps->x)
     //expected-note@-1{{Assuming field 'x' is null}}
     //expected-note@-2{{Taking false branch}}
 
     m++;
 
   m += *syz.x; // expected-warning{{Dereference of null pointer (loaded from field 'x')}}
   // expected-note@-1{{Dereference of null pointer (loaded from field 'x')}}
 }
 
 void testTrackConstraintBRVisitorIsTrackingTurnedOn(struct S syz, int *pp) {
   int m = 0;
-  syz.x = foo(); // expected-note{{Value assigned to 'syz.x'}}
+  syz.x = foo();
 
   struct S *ps = &syz;
   if (ps->x)
     //expected-note@-1{{Assuming field 'x' is null}}
     //expected-note@-2{{Taking false branch}}
 
     m++;
   int *p = syz.x; //expected-note {{'p' initialized to a null pointer value}}
   m = *p; // expected-warning {{Dereference of null pointer (loaded from variable 'p')}}
           // expected-note@-1 {{Dereference of null pointer (loaded from variable 'p')}}
 }
 

clang/test/Analysis/diagnostics/deref-track-symbolic-region.cpp

 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-output=text -verify %s
 
 struct S {
   int *x;
   int y;
 };
 
 S &getSomeReference();
 void test(S *p) {
-  S &r = *p;   //expected-note {{'r' initialized here}}
+  S &r = *p;
   if (p) return;
                //expected-note@-1{{Taking false branch}}
                //expected-note@-2{{Assuming 'p' is null}}
   r.y = 5; // expected-warning {{Access to field 'y' results in a dereference of a null pointer (loaded from variable 'r')}}
            // expected-note@-1{{Access to field 'y' results in a dereference of a null pointer (loaded from variable 'r')}}
 }
 
 void testRefParam(int *ptr) {
-  int &ref = *ptr; // expected-note {{'ref' initialized here}}
+  int &ref = *ptr;
   if (ptr)
     // expected-note@-1{{Assuming 'ptr' is null}}
     // expected-note@-2{{Taking false branch}}
     return;
 
   extern void use(int &ref);
   use(ref); // expected-warning{{Forming reference to null pointer}}
             // expected-note@-1{{Forming reference to null pointer}}
 }
 
 int testRefToNullPtr() {
   int *p = 0; // expected-note {{'p' initialized to a null pointer value}}
-  int *const &p2 = p; // expected-note{{'p2' initialized here}}
+  int *const &p2 = p;
   int *p3 = p2; // expected-note {{'p3' initialized to a null pointer value}}
   return *p3; // expected-warning {{Dereference of null pointer}}
               // expected-note@-1{{Dereference of null pointer}}
 }
 
 int testRefToNullPtr2() {
   int *p = 0; // expected-note {{'p' initialized to a null pointer value}}
-  int *const &p2 = p;// expected-note{{'p2' initialized here}}
+  int *const &p2 = p;
   return *p2; //expected-warning {{Dereference of null pointer}}
               // expected-note@-1{{Dereference of null pointer}}
-}
+}
 

clang/test/Analysis/diagnostics/find_last_store.c

 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-output=text -verify %s
+
 typedef struct { float b; } c;
 void *a();
 void *d() {
-  return a(); // expected-note{{Returning pointer}}
+  return a();
 }
 
 void no_find_last_store() {
-  c *e = d(); // expected-note{{Calling 'd'}}
-              // expected-note@-1{{Returning from 'd'}}
-              // expected-note@-2{{'e' initialized here}}
-
-  (void)(e || e->b); // expected-note{{Assuming 'e' is null}}
-      // expected-note@-1{{Left side of '||' is false}}
-      // expected-note@-2{{Access to field 'b' results in a dereference of a null pointer (loaded from variable 'e')}}
-      // expected-warning@-3{{Access to field 'b' results in a dereference of a null pointer (loaded from variable 'e')}}
+  c *e = d();
+  (void)(e || e->b);
+  // expected-note@-1{{Assuming 'e' is null}}
+  // expected-note@-2{{Left side of '||' is false}}
+  // expected-note@-3{{Access to field 'b' results in a dereference of a null pointer (loaded from variable 'e')}}
+  // expected-warning@-4{{Access to field 'b' results in a dereference of a null pointer (loaded from variable 'e')}}
 }

clang/test/Analysis/diagnostics/macro-null-return-suppression.cpp

DEREF_IN_MACRO(0) // expected-warning{{Dereference of null pointer}}
                   // expected-note@-2{{Dereference of null pointer}}
 
 // Warning should not be suppressed if the null returned by the macro
 // is not related to the warning.
 #define RETURN_NULL() (0)
 extern int* returnFreshPointer();
 int noSuppressMacroUnrelated() {
   int *x = RETURN_NULL();
-  x = returnFreshPointer();  // expected-note{{Value assigned to 'x'}}
+  x = returnFreshPointer();
   if (x) {} // expected-note{{Taking false branch}}
             // expected-note@-1{{Assuming 'x' is null}}
   return *x; // expected-warning{{Dereference of null pointer}}
              // expected-note@-1{{Dereference}}
 }
 
 // Value haven't changed by the assignment, but the null pointer
 // did not come from the macro.
 int noSuppressMacroUnrelatedOtherReason() {
   int *x = RETURN_NULL();
   x = returnFreshPointer();  
   x = 0; // expected-note{{Null pointer value stored to 'x'}}
   return *x; // expected-warning{{Dereference of null pointer}}
              // expected-note@-1{{Dereference}}
 }

clang/test/Analysis/inlining/Inputs/expected-plists/path-notes.c.plist

<array>
     <integer>24</integer>
    </array>
   </dict>
   </dict>
   <dict>
    <key>path</key>
    <array>
     <dict>
-     <key>kind</key><string>event</string>
-     <key>location</key>
-     <dict>
-      <key>line</key><integer>32</integer>
-      <key>col</key><integer>3</integer>
-      <key>file</key><integer>0</integer>
-     </dict>
-     <key>ranges</key>
-     <array>
-       <array>
-        <dict>
-         <key>line</key><integer>32</integer>
-         <key>col</key><integer>3</integer>
-         <key>file</key><integer>0</integer>
-        </dict>
-        <dict>
-         <key>line</key><integer>32</integer>
-         <key>col</key><integer>8</integer>
-         <key>file</key><integer>0</integer>
-        </dict>
-       </array>
-     </array>
-     <key>depth</key><integer>0</integer>
-     <key>extended_message</key>
-     <string>&apos;a&apos; initialized here</string>
-     <key>message</key>
-     <string>&apos;a&apos; initialized here</string>
-    </dict>
-    <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
            <key>line</key><integer>32</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
            <key>line</key><integer>32</integer>
            <key>col</key><integer>5</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>34</integer>
+           <key>line</key><integer>33</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>34</integer>
+           <key>line</key><integer>33</integer>
            <key>col</key><integer>4</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
        </dict>
       </array>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>34</integer>
+           <key>line</key><integer>33</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>34</integer>
+           <key>line</key><integer>33</integer>
            <key>col</key><integer>4</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>34</integer>
+           <key>line</key><integer>33</integer>
            <key>col</key><integer>7</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>34</integer>
+           <key>line</key><integer>33</integer>
            <key>col</key><integer>7</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>34</integer>
+      <key>line</key><integer>33</integer>
       <key>col</key><integer>7</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>34</integer>
+         <key>line</key><integer>33</integer>
          <key>col</key><integer>7</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>34</integer>
+         <key>line</key><integer>33</integer>
          <key>col</key><integer>7</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Assuming &apos;a&apos; is null</string>
      <key>message</key>
      <string>Assuming &apos;a&apos; is null</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>34</integer>
+           <key>line</key><integer>33</integer>
            <key>col</key><integer>7</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>34</integer>
+           <key>line</key><integer>33</integer>
            <key>col</key><integer>7</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>39</integer>
+           <key>line</key><integer>38</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>39</integer>
+           <key>line</key><integer>38</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>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>39</integer>
+           <key>line</key><integer>38</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>39</integer>
+           <key>line</key><integer>38</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>39</integer>
+           <key>line</key><integer>38</integer>
            <key>col</key><integer>6</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>39</integer>
+           <key>line</key><integer>38</integer>
            <key>col</key><integer>6</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>39</integer>
+      <key>line</key><integer>38</integer>
       <key>col</key><integer>6</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>39</integer>
+         <key>line</key><integer>38</integer>
          <key>col</key><integer>4</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>39</integer>
+         <key>line</key><integer>38</integer>
          <key>col</key><integer>4</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Dereference of null pointer (loaded from variable &apos;a&apos;)</string>
      <key>message</key>
      <string>Dereference of null pointer (loaded from variable &apos;a&apos;)</string>
     </dict>
    </array>
    <key>description</key><string>Dereference of null pointer (loaded from variable &apos;a&apos;)</string>
    <key>category</key><string>Logic error</string>
    <key>type</key><string>Dereference of null pointer</string>
    <key>check_name</key><string>core.NullDereference</string>
    <!-- This hash is experimental and going to change! -->
    <key>issue_hash_content_of_line_in_context</key><string>ec20b5e53a72c82d442b3ca04c81e138</string>
   <key>issue_context_kind</key><string>function</string>
   <key>issue_context</key><string>testInitCheck</string>
-  <key>issue_hash_function_offset</key><string>8</string>
+  <key>issue_hash_function_offset</key><string>7</string>
   <key>location</key>
   <dict>
-   <key>line</key><integer>39</integer>
+   <key>line</key><integer>38</integer>
    <key>col</key><integer>6</integer>
    <key>file</key><integer>0</integer>
   </dict>
   <key>ExecutedLines</key>
   <dict>
    <key>0</key>
    <array>
     <integer>31</integer>
     <integer>32</integer>
-    <integer>34</integer>
-    <integer>39</integer>
+    <integer>33</integer>
+    <integer>38</integer>
    </array>
   </dict>
   </dict>
   <dict>
    <key>path</key>
    <array>
     <dict>
-     <key>kind</key><string>event</string>
-     <key>location</key>
-     <dict>
-      <key>line</key><integer>44</integer>
-      <key>col</key><integer>3</integer>
-      <key>file</key><integer>0</integer>
-     </dict>
-     <key>ranges</key>
-     <array>
-       <array>
-        <dict>
-         <key>line</key><integer>44</integer>
-         <key>col</key><integer>3</integer>
-         <key>file</key><integer>0</integer>
-        </dict>
-        <dict>
-         <key>line</key><integer>44</integer>
-         <key>col</key><integer>18</integer>
-         <key>file</key><integer>0</integer>
-        </dict>
-       </array>
-     </array>
-     <key>depth</key><integer>0</integer>
-     <key>extended_message</key>
-     <string>Value assigned to &apos;a&apos;</string>
-     <key>message</key>
-     <string>Value assigned to &apos;a&apos;</string>
-    </dict>
-    <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>44</integer>
+           <key>line</key><integer>43</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>44</integer>
+           <key>line</key><integer>43</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>46</integer>
+           <key>line</key><integer>44</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>46</integer>
+           <key>line</key><integer>44</integer>
            <key>col</key><integer>4</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
        </dict>
       </array>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>46</integer>
+           <key>line</key><integer>44</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>46</integer>
+           <key>line</key><integer>44</integer>
            <key>col</key><integer>4</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>46</integer>
+           <key>line</key><integer>44</integer>
            <key>col</key><integer>7</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>46</integer>
+           <key>line</key><integer>44</integer>
            <key>col</key><integer>7</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>46</integer>
+      <key>line</key><integer>44</integer>
       <key>col</key><integer>7</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>46</integer>
+         <key>line</key><integer>44</integer>
          <key>col</key><integer>7</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>46</integer>
+         <key>line</key><integer>44</integer>
          <key>col</key><integer>7</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Assuming &apos;a&apos; is null</string>
      <key>message</key>
      <string>Assuming &apos;a&apos; is null</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>46</integer>
+           <key>line</key><integer>44</integer>
            <key>col</key><integer>7</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>46</integer>
+           <key>line</key><integer>44</integer>
            <key>col</key><integer>7</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>51</integer>
+           <key>line</key><integer>49</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>51</integer>
+           <key>line</key><integer>49</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>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>51</integer>
+           <key>line</key><integer>49</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>51</integer>
+           <key>line</key><integer>49</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>51</integer>
+           <key>line</key><integer>49</integer>
            <key>col</key><integer>6</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>51</integer>
+           <key>line</key><integer>49</integer>
            <key>col</key><integer>6</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>51</integer>
+      <key>line</key><integer>49</integer>
       <key>col</key><integer>6</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>51</integer>
+         <key>line</key><integer>49</integer>
          <key>col</key><integer>4</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>51</integer>
+         <key>line</key><integer>49</integer>
          <key>col</key><integer>4</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Dereference of null pointer (loaded from variable &apos;a&apos;)</string>
      <key>message</key>
      <string>Dereference of null pointer (loaded from variable &apos;a&apos;)</string>
     </dict>
    </array>
    <key>description</key><string>Dereference of null pointer (loaded from variable &apos;a&apos;)</string>
    <key>category</key><string>Logic error</string>
    <key>type</key><string>Dereference of null pointer</string>
    <key>check_name</key><string>core.NullDereference</string>
    <!-- This hash is experimental and going to change! -->
    <key>issue_hash_content_of_line_in_context</key><string>1ae8e7c84d15f307abc1df9f5612078b</string>
   <key>issue_context_kind</key><string>function</string>
   <key>issue_context</key><string>testStoreCheck</string>
-  <key>issue_hash_function_offset</key><string>8</string>
+  <key>issue_hash_function_offset</key><string>7</string>
   <key>location</key>
   <dict>
-   <key>line</key><integer>51</integer>
+   <key>line</key><integer>49</integer>
    <key>col</key><integer>6</integer>
    <key>file</key><integer>0</integer>
   </dict>
   <key>ExecutedLines</key>
   <dict>
    <key>0</key>
    <array>
+    <integer>42</integer>
     <integer>43</integer>
     <integer>44</integer>
-    <integer>46</integer>
-    <integer>51</integer>
+    <integer>49</integer>
    </array>
   </dict>
   </dict>
   <dict>
    <key>path</key>
    <array>
     <dict>
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
-      <key>line</key><integer>65</integer>
+      <key>line</key><integer>63</integer>
       <key>col</key><integer>4</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>65</integer>
+         <key>line</key><integer>63</integer>
          <key>col</key><integer>4</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>65</integer>
+         <key>line</key><integer>63</integer>
          <key>col</key><integer>12</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Calling &apos;getZero&apos;</string>
      <key>message</key>
      <string>Calling &apos;getZero&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
-      <key>line</key><integer>56</integer>
+      <key>line</key><integer>54</integer>
       <key>col</key><integer>1</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>depth</key><integer>1</integer>
      <key>extended_message</key>
      <string>Entered call from &apos;testReturnZero&apos;</string>
      <key>message</key>
      <string>Entered call from &apos;testReturnZero&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>56</integer>
+           <key>line</key><integer>54</integer>
            <key>col</key><integer>1</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>56</integer>
+           <key>line</key><integer>54</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>57</integer>
+           <key>line</key><integer>55</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>57</integer>
+           <key>line</key><integer>55</integer>
            <key>col</key><integer>5</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>57</integer>
+      <key>line</key><integer>55</integer>
       <key>col</key><integer>3</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>57</integer>
+         <key>line</key><integer>55</integer>
          <key>col</key><integer>3</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>57</integer>
+         <key>line</key><integer>55</integer>
          <key>col</key><integer>8</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>1</integer>
      <key>extended_message</key>
      <string>&apos;p&apos; initialized to a null pointer value</string>
      <key>message</key>
      <string>&apos;p&apos; initialized to a null pointer value</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>57</integer>
+           <key>line</key><integer>55</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>57</integer>
+           <key>line</key><integer>55</integer>
            <key>col</key><integer>5</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>60</integer>
+           <key>line</key><integer>58</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>60</integer>
+           <key>line</key><integer>58</integer>
            <key>col</key><integer>8</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>60</integer>
+      <key>line</key><integer>58</integer>
       <key>col</key><integer>3</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>60</integer>
+         <key>line</key><integer>58</integer>
          <key>col</key><integer>3</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>60</integer>
+         <key>line</key><integer>58</integer>
          <key>col</key><integer>10</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>1</integer>
      <key>extended_message</key>
      <string>Returning null pointer (loaded from &apos;p&apos;)</string>
      <key>message</key>
      <string>Returning null pointer (loaded from &apos;p&apos;)</string>
     </dict>
     <dict>
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
-      <key>line</key><integer>65</integer>
+      <key>line</key><integer>63</integer>
       <key>col</key><integer>4</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>65</integer>
+         <key>line</key><integer>63</integer>
          <key>col</key><integer>4</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>65</integer>
+         <key>line</key><integer>63</integer>
          <key>col</key><integer>12</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Returning from &apos;getZero&apos;</string>
      <key>message</key>
      <string>Returning from &apos;getZero&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>65</integer>
+           <key>line</key><integer>63</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>65</integer>
+           <key>line</key><integer>63</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>65</integer>
+           <key>line</key><integer>63</integer>
            <key>col</key><integer>14</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>65</integer>
+           <key>line</key><integer>63</integer>
            <key>col</key><integer>14</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>65</integer>
+      <key>line</key><integer>63</integer>
       <key>col</key><integer>14</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>65</integer>
+         <key>line</key><integer>63</integer>
          <key>col</key><integer>3</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>65</integer>
+         <key>line</key><integer>63</integer>
          <key>col</key><integer>16</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Dereference of null pointer</string>
      <key>message</key>
      <string>Dereference of null pointer</string>
     </dict>
    </array>
    <key>description</key><string>Dereference of null pointer</string>
    <key>category</key><string>Logic error</string>
    <key>type</key><string>Dereference of null pointer</string>
    <key>check_name</key><string>core.NullDereference</string>
    <!-- This hash is experimental and going to change! -->
    <key>issue_hash_content_of_line_in_context</key><string>d03346854b8f45b55cbd5efe29bf2c8e</string>
   <key>issue_context_kind</key><string>function</string>
   <key>issue_context</key><string>testReturnZero</string>
   <key>issue_hash_function_offset</key><string>1</string>
   <key>location</key>
   <dict>
-   <key>line</key><integer>65</integer>
+   <key>line</key><integer>63</integer>
    <key>col</key><integer>14</integer>
    <key>file</key><integer>0</integer>
   </dict>
   <key>ExecutedLines</key>
   <dict>
    <key>0</key>
    <array>
-    <integer>56</integer>
-    <integer>57</integer>
-    <integer>60</integer>
-    <integer>64</integer>
-    <integer>65</integer>
+    <integer>54</integer>
+    <integer>55</integer>
+    <integer>58</integer>
+    <integer>62</integer>
+    <integer>63</integer>
    </array>
   </dict>
   </dict>
   <dict>
    <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>72</integer>
+           <key>line</key><integer>70</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>72</integer>
+           <key>line</key><integer>70</integer>
            <key>col</key><integer>8</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>72</integer>
+           <key>line</key><integer>70</integer>
            <key>col</key><integer>11</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>72</integer>
+           <key>line</key><integer>70</integer>
            <key>col</key><integer>17</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>72</integer>
+      <key>line</key><integer>70</integer>
       <key>col</key><integer>11</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>72</integer>
+         <key>line</key><integer>70</integer>
          <key>col</key><integer>11</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>72</integer>
+         <key>line</key><integer>70</integer>
          <key>col</key><integer>19</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Calling &apos;getZero&apos;</string>
      <key>message</key>
      <string>Calling &apos;getZero&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
-      <key>line</key><integer>56</integer>
+      <key>line</key><integer>54</integer>
       <key>col</key><integer>1</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>depth</key><integer>1</integer>
      <key>extended_message</key>
      <string>Entered call from &apos;testReturnZero2&apos;</string>
      <key>message</key>
      <string>Entered call from &apos;testReturnZero2&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>56</integer>
+           <key>line</key><integer>54</integer>
            <key>col</key><integer>1</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>56</integer>
+           <key>line</key><integer>54</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>57</integer>
+           <key>line</key><integer>55</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>57</integer>
+           <key>line</key><integer>55</integer>
            <key>col</key><integer>5</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>57</integer>
+      <key>line</key><integer>55</integer>
       <key>col</key><integer>3</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>57</integer>
+         <key>line</key><integer>55</integer>
          <key>col</key><integer>3</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>57</integer>
+         <key>line</key><integer>55</integer>
          <key>col</key><integer>8</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>1</integer>
      <key>extended_message</key>
      <string>&apos;p&apos; initialized to a null pointer value</string>
      <key>message</key>
      <string>&apos;p&apos; initialized to a null pointer value</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>57</integer>
+           <key>line</key><integer>55</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>57</integer>
+           <key>line</key><integer>55</integer>
            <key>col</key><integer>5</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>60</integer>
+           <key>line</key><integer>58</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>60</integer>
+           <key>line</key><integer>58</integer>
            <key>col</key><integer>8</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>60</integer>
+      <key>line</key><integer>58</integer>
       <key>col</key><integer>3</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>60</integer>
+         <key>line</key><integer>58</integer>
          <key>col</key><integer>3</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>60</integer>
+         <key>line</key><integer>58</integer>
          <key>col</key><integer>10</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>1</integer>
      <key>extended_message</key>
      <string>Returning null pointer (loaded from &apos;p&apos;)</string>
      <key>message</key>
      <string>Returning null pointer (loaded from &apos;p&apos;)</string>
     </dict>
     <dict>
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
-      <key>line</key><integer>72</integer>
+      <key>line</key><integer>70</integer>
       <key>col</key><integer>11</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>72</integer>
+         <key>line</key><integer>70</integer>
          <key>col</key><integer>11</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>72</integer>
+         <key>line</key><integer>70</integer>
          <key>col</key><integer>19</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Returning from &apos;getZero&apos;</string>
      <key>message</key>
      <string>Returning from &apos;getZero&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
-      <key>line</key><integer>72</integer>
+      <key>line</key><integer>70</integer>
       <key>col</key><integer>10</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>72</integer>
+         <key>line</key><integer>70</integer>
          <key>col</key><integer>10</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>72</integer>
+         <key>line</key><integer>70</integer>
          <key>col</key><integer>19</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Dereference of null pointer</string>
      <key>message</key>
      <string>Dereference of null pointer</string>
     </dict>
    </array>
    <key>description</key><string>Dereference of null pointer</string>
    <key>category</key><string>Logic error</string>
    <key>type</key><string>Dereference of null pointer</string>
    <key>check_name</key><string>core.NullDereference</string>
    <!-- This hash is experimental and going to change! -->
    <key>issue_hash_content_of_line_in_context</key><string>5a72f98932a4061a833287a12b28ba8b</string>
   <key>issue_context_kind</key><string>function</string>
   <key>issue_context</key><string>testReturnZero2</string>
   <key>issue_hash_function_offset</key><string>1</string>
   <key>location</key>
   <dict>
-   <key>line</key><integer>72</integer>
+   <key>line</key><integer>70</integer>
    <key>col</key><integer>10</integer>
    <key>file</key><integer>0</integer>
   </dict>
   <key>ExecutedLines</key>
   <dict>
    <key>0</key>
    <array>
-    <integer>56</integer>
-    <integer>57</integer>
-    <integer>60</integer>
-    <integer>71</integer>
-    <integer>72</integer>
+    <integer>54</integer>
+    <integer>55</integer>
+    <integer>58</integer>
+    <integer>69</integer>
+    <integer>70</integer>
    </array>
   </dict>
   </dict>
   <dict>
    <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>79</integer>
+           <key>line</key><integer>77</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>79</integer>
+           <key>line</key><integer>77</integer>
            <key>col</key><integer>5</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>79</integer>
+           <key>line</key><integer>77</integer>
            <key>col</key><integer>12</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>79</integer>
+           <key>line</key><integer>77</integer>
            <key>col</key><integer>18</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>79</integer>
+      <key>line</key><integer>77</integer>
       <key>col</key><integer>12</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>79</integer>
+         <key>line</key><integer>77</integer>
          <key>col</key><integer>12</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>79</integer>
+         <key>line</key><integer>77</integer>
          <key>col</key><integer>20</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Calling &apos;getZero&apos;</string>
      <key>message</key>
      <string>Calling &apos;getZero&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
-      <key>line</key><integer>56</integer>
+      <key>line</key><integer>54</integer>
       <key>col</key><integer>1</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>depth</key><integer>1</integer>
      <key>extended_message</key>
      <string>Entered call from &apos;testInitZero&apos;</string>
      <key>message</key>
      <string>Entered call from &apos;testInitZero&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>56</integer>
+           <key>line</key><integer>54</integer>
            <key>col</key><integer>1</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>56</integer>
+           <key>line</key><integer>54</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>57</integer>
+           <key>line</key><integer>55</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>57</integer>
+           <key>line</key><integer>55</integer>
            <key>col</key><integer>5</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>57</integer>
+      <key>line</key><integer>55</integer>
       <key>col</key><integer>3</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>57</integer>
+         <key>line</key><integer>55</integer>
          <key>col</key><integer>3</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>57</integer>
+         <key>line</key><integer>55</integer>
          <key>col</key><integer>8</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>1</integer>
      <key>extended_message</key>
      <string>&apos;p&apos; initialized to a null pointer value</string>
      <key>message</key>
      <string>&apos;p&apos; initialized to a null pointer value</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>57</integer>
+           <key>line</key><integer>55</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>57</integer>
+           <key>line</key><integer>55</integer>
            <key>col</key><integer>5</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>60</integer>
+           <key>line</key><integer>58</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>60</integer>
+           <key>line</key><integer>58</integer>
            <key>col</key><integer>8</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>60</integer>
+      <key>line</key><integer>58</integer>
       <key>col</key><integer>3</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>60</integer>
+         <key>line</key><integer>58</integer>
          <key>col</key><integer>3</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>60</integer>
+         <key>line</key><integer>58</integer>
          <key>col</key><integer>10</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>1</integer>
      <key>extended_message</key>
      <string>Returning null pointer (loaded from &apos;p&apos;)</string>
      <key>message</key>
      <string>Returning null pointer (loaded from &apos;p&apos;)</string>
     </dict>
     <dict>
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
-      <key>line</key><integer>79</integer>
+      <key>line</key><integer>77</integer>
       <key>col</key><integer>12</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>79</integer>
+         <key>line</key><integer>77</integer>
          <key>col</key><integer>12</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>79</integer>
+         <key>line</key><integer>77</integer>
          <key>col</key><integer>20</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Returning from &apos;getZero&apos;</string>
      <key>message</key>
      <string>Returning from &apos;getZero&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>79</integer>
+           <key>line</key><integer>77</integer>
            <key>col</key><integer>12</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>79</integer>
+           <key>line</key><integer>77</integer>
            <key>col</key><integer>18</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>79</integer>
+           <key>line</key><integer>77</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>79</integer>
+           <key>line</key><integer>77</integer>
            <key>col</key><integer>5</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>79</integer>
+      <key>line</key><integer>77</integer>
       <key>col</key><integer>3</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>79</integer>
+         <key>line</key><integer>77</integer>
          <key>col</key><integer>3</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>79</integer>
+         <key>line</key><integer>77</integer>
          <key>col</key><integer>8</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>&apos;a&apos; initialized to a null pointer value</string>
      <key>message</key>
      <string>&apos;a&apos; initialized to a null pointer value</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>79</integer>
+           <key>line</key><integer>77</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>79</integer>
+           <key>line</key><integer>77</integer>
            <key>col</key><integer>5</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>83</integer>
+           <key>line</key><integer>81</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>83</integer>
+           <key>line</key><integer>81</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>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>83</integer>
+           <key>line</key><integer>81</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>83</integer>
+           <key>line</key><integer>81</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>83</integer>
+           <key>line</key><integer>81</integer>
            <key>col</key><integer>6</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>83</integer>
+           <key>line</key><integer>81</integer>
            <key>col</key><integer>6</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>83</integer>
+      <key>line</key><integer>81</integer>
       <key>col</key><integer>6</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>83</integer>
+         <key>line</key><integer>81</integer>
          <key>col</key><integer>4</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>83</integer>
+         <key>line</key><integer>81</integer>
          <key>col</key><integer>4</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Dereference of null pointer (loaded from variable &apos;a&apos;)</string>
      <key>message</key>
      <string>Dereference of null pointer (loaded from variable &apos;a&apos;)</string>
     </dict>
    </array>
    <key>description</key><string>Dereference of null pointer (loaded from variable &apos;a&apos;)</string>
    <key>category</key><string>Logic error</string>
    <key>type</key><string>Dereference of null pointer</string>
    <key>check_name</key><string>core.NullDereference</string>
    <!-- This hash is experimental and going to change! -->
    <key>issue_hash_content_of_line_in_context</key><string>6d3745ba4b32e1858de16c61fecf8ed4</string>
   <key>issue_context_kind</key><string>function</string>
   <key>issue_context</key><string>testInitZero</string>
   <key>issue_hash_function_offset</key><string>5</string>
   <key>location</key>
   <dict>
-   <key>line</key><integer>83</integer>
+   <key>line</key><integer>81</integer>
    <key>col</key><integer>6</integer>
    <key>file</key><integer>0</integer>
   </dict>
   <key>ExecutedLines</key>
   <dict>
    <key>0</key>
    <array>
-    <integer>56</integer>
-    <integer>57</integer>
-    <integer>60</integer>
-    <integer>78</integer>
-    <integer>79</integer>
-    <integer>83</integer>
+    <integer>54</integer>
+    <integer>55</integer>
+    <integer>58</integer>
+    <integer>76</integer>
+    <integer>77</integer>
+    <integer>81</integer>
    </array>
   </dict>
   </dict>
   <dict>
    <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>88</integer>
+           <key>line</key><integer>86</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>88</integer>
+           <key>line</key><integer>86</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>88</integer>
+           <key>line</key><integer>86</integer>
            <key>col</key><integer>7</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>88</integer>
+           <key>line</key><integer>86</integer>
            <key>col</key><integer>13</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>88</integer>
+      <key>line</key><integer>86</integer>
       <key>col</key><integer>7</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>88</integer>
+         <key>line</key><integer>86</integer>
          <key>col</key><integer>7</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>88</integer>
+         <key>line</key><integer>86</integer>
          <key>col</key><integer>15</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Calling &apos;getZero&apos;</string>
      <key>message</key>
      <string>Calling &apos;getZero&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
-      <key>line</key><integer>56</integer>
+      <key>line</key><integer>54</integer>
       <key>col</key><integer>1</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>depth</key><integer>1</integer>
      <key>extended_message</key>
      <string>Entered call from &apos;testStoreZero&apos;</string>
      <key>message</key>
      <string>Entered call from &apos;testStoreZero&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>56</integer>
+           <key>line</key><integer>54</integer>
            <key>col</key><integer>1</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>56</integer>
+           <key>line</key><integer>54</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>57</integer>
+           <key>line</key><integer>55</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>57</integer>
+           <key>line</key><integer>55</integer>
            <key>col</key><integer>5</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>57</integer>
+      <key>line</key><integer>55</integer>
       <key>col</key><integer>3</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>57</integer>
+         <key>line</key><integer>55</integer>
          <key>col</key><integer>3</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>57</integer>
+         <key>line</key><integer>55</integer>
          <key>col</key><integer>8</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>1</integer>
      <key>extended_message</key>
      <string>&apos;p&apos; initialized to a null pointer value</string>
      <key>message</key>
      <string>&apos;p&apos; initialized to a null pointer value</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>57</integer>
+           <key>line</key><integer>55</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>57</integer>
+           <key>line</key><integer>55</integer>
            <key>col</key><integer>5</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>60</integer>
+           <key>line</key><integer>58</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>60</integer>
+           <key>line</key><integer>58</integer>
            <key>col</key><integer>8</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>60</integer>
+      <key>line</key><integer>58</integer>
       <key>col</key><integer>3</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>60</integer>
+         <key>line</key><integer>58</integer>
          <key>col</key><integer>3</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>60</integer>
+         <key>line</key><integer>58</integer>
          <key>col</key><integer>10</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>1</integer>
      <key>extended_message</key>
      <string>Returning null pointer (loaded from &apos;p&apos;)</string>
      <key>message</key>
      <string>Returning null pointer (loaded from &apos;p&apos;)</string>
     </dict>
     <dict>
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
-      <key>line</key><integer>88</integer>
+      <key>line</key><integer>86</integer>
       <key>col</key><integer>7</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>88</integer>
+         <key>line</key><integer>86</integer>
          <key>col</key><integer>7</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>88</integer>
+         <key>line</key><integer>86</integer>
          <key>col</key><integer>15</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Returning from &apos;getZero&apos;</string>
      <key>message</key>
      <string>Returning from &apos;getZero&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>88</integer>
+           <key>line</key><integer>86</integer>
            <key>col</key><integer>7</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>88</integer>
+           <key>line</key><integer>86</integer>
            <key>col</key><integer>13</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>88</integer>
+           <key>line</key><integer>86</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>88</integer>
+           <key>line</key><integer>86</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>88</integer>
+      <key>line</key><integer>86</integer>
       <key>col</key><integer>3</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>88</integer>
+         <key>line</key><integer>86</integer>
          <key>col</key><integer>3</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>88</integer>
+         <key>line</key><integer>86</integer>
          <key>col</key><integer>15</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Null pointer value stored to &apos;a&apos;</string>
      <key>message</key>
      <string>Null pointer value stored to &apos;a&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>88</integer>
+           <key>line</key><integer>86</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>88</integer>
+           <key>line</key><integer>86</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>92</integer>
+           <key>line</key><integer>90</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>92</integer>
+           <key>line</key><integer>90</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>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>92</integer>
+           <key>line</key><integer>90</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>92</integer>
+           <key>line</key><integer>90</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>92</integer>
+           <key>line</key><integer>90</integer>
            <key>col</key><integer>6</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>92</integer>
+           <key>line</key><integer>90</integer>
            <key>col</key><integer>6</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>92</integer>
+      <key>line</key><integer>90</integer>
       <key>col</key><integer>6</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>92</integer>
+         <key>line</key><integer>90</integer>
          <key>col</key><integer>4</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>92</integer>
+         <key>line</key><integer>90</integer>
          <key>col</key><integer>4</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Dereference of null pointer (loaded from variable &apos;a&apos;)</string>
      <key>message</key>
      <string>Dereference of null pointer (loaded from variable &apos;a&apos;)</string>
     </dict>
    </array>
    <key>description</key><string>Dereference of null pointer (loaded from variable &apos;a&apos;)</string>
    <key>category</key><string>Logic error</string>
    <key>type</key><string>Dereference of null pointer</string>
    <key>check_name</key><string>core.NullDereference</string>
    <!-- This hash is experimental and going to change! -->
    <key>issue_hash_content_of_line_in_context</key><string>2d25b170621486480ca76aaba4c7a0c0</string>
   <key>issue_context_kind</key><string>function</string>
   <key>issue_context</key><string>testStoreZero</string>
   <key>issue_hash_function_offset</key><string>5</string>
   <key>location</key>
   <dict>
-   <key>line</key><integer>92</integer>
+   <key>line</key><integer>90</integer>
    <key>col</key><integer>6</integer>
    <key>file</key><integer>0</integer>
   </dict>
   <key>ExecutedLines</key>
   <dict>
    <key>0</key>
    <array>
-    <integer>56</integer>
-    <integer>57</integer>
-    <integer>60</integer>
-    <integer>87</integer>
-    <integer>88</integer>
-    <integer>92</integer>
+    <integer>54</integer>
+    <integer>55</integer>
+    <integer>58</integer>
+    <integer>85</integer>
+    <integer>86</integer>
+    <integer>90</integer>
    </array>
   </dict>
   </dict>
   <dict>
    <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>103</integer>
+           <key>line</key><integer>101</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>103</integer>
+           <key>line</key><integer>101</integer>
            <key>col</key><integer>12</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>103</integer>
+           <key>line</key><integer>101</integer>
            <key>col</key><integer>14</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>103</integer>
+           <key>line</key><integer>101</integer>
            <key>col</key><integer>20</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>103</integer>
+      <key>line</key><integer>101</integer>
       <key>col</key><integer>14</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>103</integer>
+         <key>line</key><integer>101</integer>
          <key>col</key><integer>14</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>103</integer>
+         <key>line</key><integer>101</integer>
          <key>col</key><integer>22</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Calling &apos;getZero&apos;</string>
      <key>message</key>
      <string>Calling &apos;getZero&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
-      <key>line</key><integer>56</integer>
+      <key>line</key><integer>54</integer>
       <key>col</key><integer>1</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>depth</key><integer>1</integer>
      <key>extended_message</key>
      <string>Entered call from &apos;testUseOfNullPointer&apos;</string>
      <key>message</key>
      <string>Entered call from &apos;testUseOfNullPointer&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>56</integer>
+           <key>line</key><integer>54</integer>
            <key>col</key><integer>1</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>56</integer>
+           <key>line</key><integer>54</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>57</integer>
+           <key>line</key><integer>55</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>57</integer>
+           <key>line</key><integer>55</integer>
            <key>col</key><integer>5</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>57</integer>
+      <key>line</key><integer>55</integer>
       <key>col</key><integer>3</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>57</integer>
+         <key>line</key><integer>55</integer>
          <key>col</key><integer>3</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>57</integer>
+         <key>line</key><integer>55</integer>
          <key>col</key><integer>8</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>1</integer>
      <key>extended_message</key>
      <string>&apos;p&apos; initialized to a null pointer value</string>
      <key>message</key>
      <string>&apos;p&apos; initialized to a null pointer value</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>57</integer>
+           <key>line</key><integer>55</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>57</integer>
+           <key>line</key><integer>55</integer>
            <key>col</key><integer>5</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>60</integer>
+           <key>line</key><integer>58</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>60</integer>
+           <key>line</key><integer>58</integer>
            <key>col</key><integer>8</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>60</integer>
+      <key>line</key><integer>58</integer>
       <key>col</key><integer>3</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>60</integer>
+         <key>line</key><integer>58</integer>
          <key>col</key><integer>3</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>60</integer>
+         <key>line</key><integer>58</integer>
          <key>col</key><integer>10</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>1</integer>
      <key>extended_message</key>
      <string>Returning null pointer (loaded from &apos;p&apos;)</string>
      <key>message</key>
      <string>Returning null pointer (loaded from &apos;p&apos;)</string>
     </dict>
     <dict>
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
-      <key>line</key><integer>103</integer>
+      <key>line</key><integer>101</integer>
       <key>col</key><integer>14</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>103</integer>
+         <key>line</key><integer>101</integer>
          <key>col</key><integer>14</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>103</integer>
+         <key>line</key><integer>101</integer>
          <key>col</key><integer>22</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Returning from &apos;getZero&apos;</string>
      <key>message</key>
      <string>Returning from &apos;getZero&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
-      <key>line</key><integer>103</integer>
+      <key>line</key><integer>101</integer>
       <key>col</key><integer>14</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>103</integer>
+         <key>line</key><integer>101</integer>
          <key>col</key><integer>14</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>103</integer>
+         <key>line</key><integer>101</integer>
          <key>col</key><integer>22</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Passing null pointer value via 1st parameter &apos;p&apos;</string>
      <key>message</key>
      <string>Passing null pointer value via 1st parameter &apos;p&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>103</integer>
+           <key>line</key><integer>101</integer>
            <key>col</key><integer>14</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>103</integer>
+           <key>line</key><integer>101</integer>
            <key>col</key><integer>20</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>103</integer>
+           <key>line</key><integer>101</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>103</integer>
+           <key>line</key><integer>101</integer>
            <key>col</key><integer>12</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>103</integer>
+      <key>line</key><integer>101</integer>
       <key>col</key><integer>3</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>103</integer>
+         <key>line</key><integer>101</integer>
          <key>col</key><integer>3</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>103</integer>
+         <key>line</key><integer>101</integer>
          <key>col</key><integer>23</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Calling &apos;usePointer&apos;</string>
      <key>message</key>
      <string>Calling &apos;usePointer&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
-      <key>line</key><integer>96</integer>
+      <key>line</key><integer>94</integer>
       <key>col</key><integer>1</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>depth</key><integer>1</integer>
      <key>extended_message</key>
      <string>Entered call from &apos;testUseOfNullPointer&apos;</string>
      <key>message</key>
      <string>Entered call from &apos;testUseOfNullPointer&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>96</integer>
+           <key>line</key><integer>94</integer>
            <key>col</key><integer>1</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>96</integer>
+           <key>line</key><integer>94</integer>
            <key>col</key><integer>4</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>97</integer>
+           <key>line</key><integer>95</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>97</integer>
+           <key>line</key><integer>95</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>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>97</integer>
+           <key>line</key><integer>95</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>97</integer>
+           <key>line</key><integer>95</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>97</integer>
+           <key>line</key><integer>95</integer>
            <key>col</key><integer>6</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>97</integer>
+           <key>line</key><integer>95</integer>
            <key>col</key><integer>6</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>97</integer>
+      <key>line</key><integer>95</integer>
       <key>col</key><integer>6</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>97</integer>
+         <key>line</key><integer>95</integer>
          <key>col</key><integer>4</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>97</integer>
+         <key>line</key><integer>95</integer>
          <key>col</key><integer>4</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>1</integer>
      <key>extended_message</key>
      <string>Dereference of null pointer (loaded from variable &apos;p&apos;)</string>
      <key>message</key>
      <string>Dereference of null pointer (loaded from variable &apos;p&apos;)</string>
     </dict>
    </array>
    <key>description</key><string>Dereference of null pointer (loaded from variable &apos;p&apos;)</string>
    <key>category</key><string>Logic error</string>
    <key>type</key><string>Dereference of null pointer</string>
    <key>check_name</key><string>core.NullDereference</string>
    <!-- This hash is experimental and going to change! -->
    <key>issue_hash_content_of_line_in_context</key><string>567151df0ae29b0f0e1a412114d544dc</string>
   <key>issue_context_kind</key><string>function</string>
   <key>issue_context</key><string>usePointer</string>
   <key>issue_hash_function_offset</key><string>1</string>
   <key>location</key>
   <dict>
-   <key>line</key><integer>97</integer>
+   <key>line</key><integer>95</integer>
    <key>col</key><integer>6</integer>
    <key>file</key><integer>0</integer>
   </dict>
   <key>ExecutedLines</key>
   <dict>
    <key>0</key>
    <array>
-    <integer>56</integer>
-    <integer>57</integer>
-    <integer>60</integer>
-    <integer>96</integer>
-    <integer>97</integer>
+    <integer>54</integer>
+    <integer>55</integer>
+    <integer>58</integer>
+    <integer>94</integer>
+    <integer>95</integer>
+    <integer>99</integer>
     <integer>101</integer>
-    <integer>103</integer>
    </array>
   </dict>
   </dict>
   <dict>
    <key>path</key>
    <array>
     <dict>
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
-      <key>line</key><integer>117</integer>
+      <key>line</key><integer>115</integer>
       <key>col</key><integer>3</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>117</integer>
+         <key>line</key><integer>115</integer>
          <key>col</key><integer>3</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>117</integer>
+         <key>line</key><integer>115</integer>
          <key>col</key><integer>19</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Calling &apos;setFieldToNull&apos;</string>
      <key>message</key>
      <string>Calling &apos;setFieldToNull&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
-      <key>line</key><integer>112</integer>
+      <key>line</key><integer>110</integer>
       <key>col</key><integer>1</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>depth</key><integer>1</integer>
      <key>extended_message</key>
      <string>Entered call from &apos;testSetFieldToNull&apos;</string>
      <key>message</key>
      <string>Entered call from &apos;testSetFieldToNull&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>112</integer>
+           <key>line</key><integer>110</integer>
            <key>col</key><integer>1</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>112</integer>
+           <key>line</key><integer>110</integer>
            <key>col</key><integer>4</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>113</integer>
+           <key>line</key><integer>111</integer>
            <key>col</key><integer>2</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>113</integer>
+           <key>line</key><integer>111</integer>
            <key>col</key><integer>2</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>113</integer>
+      <key>line</key><integer>111</integer>
       <key>col</key><integer>2</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>113</integer>
+         <key>line</key><integer>111</integer>
          <key>col</key><integer>2</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>113</integer>
+         <key>line</key><integer>111</integer>
          <key>col</key><integer>9</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>1</integer>
      <key>extended_message</key>
      <string>Null pointer value stored to field &apos;p&apos;</string>
      <key>message</key>
      <string>Null pointer value stored to field &apos;p&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
-      <key>line</key><integer>117</integer>
+      <key>line</key><integer>115</integer>
       <key>col</key><integer>3</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>117</integer>
+         <key>line</key><integer>115</integer>
          <key>col</key><integer>3</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>117</integer>
+         <key>line</key><integer>115</integer>
          <key>col</key><integer>19</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Returning from &apos;setFieldToNull&apos;</string>
      <key>message</key>
      <string>Returning from &apos;setFieldToNull&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>117</integer>
+           <key>line</key><integer>115</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>117</integer>
+           <key>line</key><integer>115</integer>
            <key>col</key><integer>16</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>119</integer>
+           <key>line</key><integer>117</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>119</integer>
+           <key>line</key><integer>117</integer>
            <key>col</key><integer>8</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
        </dict>
       </array>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>119</integer>
+           <key>line</key><integer>117</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>119</integer>
+           <key>line</key><integer>117</integer>
            <key>col</key><integer>8</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>119</integer>
+           <key>line</key><integer>117</integer>
            <key>col</key><integer>10</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>119</integer>
+           <key>line</key><integer>117</integer>
            <key>col</key><integer>10</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>119</integer>
+      <key>line</key><integer>117</integer>
       <key>col</key><integer>10</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>119</integer>
+         <key>line</key><integer>117</integer>
          <key>col</key><integer>14</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>119</integer>
+         <key>line</key><integer>117</integer>
          <key>col</key><integer>14</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Dereference of null pointer (loaded from field &apos;p&apos;)</string>
      <key>message</key>
      <string>Dereference of null pointer (loaded from field &apos;p&apos;)</string>
     </dict>
    </array>
    <key>description</key><string>Dereference of null pointer (loaded from field &apos;p&apos;)</string>
    <key>category</key><string>Logic error</string>
    <key>type</key><string>Dereference of null pointer</string>
    <key>check_name</key><string>core.NullDereference</string>
    <!-- This hash is experimental and going to change! -->
    <key>issue_hash_content_of_line_in_context</key><string>7849ab11af99aee1e3603a24ae95cdfd</string>
   <key>issue_context_kind</key><string>function</string>
   <key>issue_context</key><string>testSetFieldToNull</string>
   <key>issue_hash_function_offset</key><string>3</string>
   <key>location</key>
   <dict>
-   <key>line</key><integer>119</integer>
+   <key>line</key><integer>117</integer>
    <key>col</key><integer>10</integer>
    <key>file</key><integer>0</integer>
   </dict>
   <key>ExecutedLines</key>
   <dict>
    <key>0</key>
    <array>
-    <integer>112</integer>
-    <integer>113</integer>
-    <integer>116</integer>
+    <integer>110</integer>
+    <integer>111</integer>
+    <integer>114</integer>
+    <integer>115</integer>
     <integer>117</integer>
-    <integer>119</integer>
    </array>
   </dict>
   </dict>
   <dict>
    <key>path</key>
    <array>
     <dict>
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
-      <key>line</key><integer>131</integer>
+      <key>line</key><integer>129</integer>
       <key>col</key><integer>3</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>131</integer>
+         <key>line</key><integer>129</integer>
          <key>col</key><integer>3</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>131</integer>
+         <key>line</key><integer>129</integer>
          <key>col</key><integer>25</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Null pointer value stored to field &apos;p&apos;</string>
      <key>message</key>
      <string>Null pointer value stored to field &apos;p&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>131</integer>
+           <key>line</key><integer>129</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>131</integer>
+           <key>line</key><integer>129</integer>
            <key>col</key><integer>12</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>132</integer>
+           <key>line</key><integer>130</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>132</integer>
+           <key>line</key><integer>130</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>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>132</integer>
+           <key>line</key><integer>130</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>132</integer>
+           <key>line</key><integer>130</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>132</integer>
+           <key>line</key><integer>130</integer>
            <key>col</key><integer>24</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>132</integer>
+           <key>line</key><integer>130</integer>
            <key>col</key><integer>24</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>132</integer>
+      <key>line</key><integer>130</integer>
       <key>col</key><integer>24</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>132</integer>
+         <key>line</key><integer>130</integer>
          <key>col</key><integer>22</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>132</integer>
+         <key>line</key><integer>130</integer>
          <key>col</key><integer>22</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Dereference of null pointer (loaded from field &apos;p&apos;)</string>
      <key>message</key>
      <string>Dereference of null pointer (loaded from field &apos;p&apos;)</string>
     </dict>
    </array>
    <key>description</key><string>Dereference of null pointer (loaded from field &apos;p&apos;)</string>
    <key>category</key><string>Logic error</string>
    <key>type</key><string>Dereference of null pointer</string>
    <key>check_name</key><string>core.NullDereference</string>
    <!-- This hash is experimental and going to change! -->
    <key>issue_hash_content_of_line_in_context</key><string>3ccb5e7e2cc82aba5c28a1cc873c83a1</string>
   <key>issue_context_kind</key><string>function</string>
   <key>issue_context</key><string>test</string>
   <key>issue_hash_function_offset</key><string>2</string>
   <key>location</key>
   <dict>
-   <key>line</key><integer>132</integer>
+   <key>line</key><integer>130</integer>
    <key>col</key><integer>24</integer>
    <key>file</key><integer>0</integer>
   </dict>
   <key>ExecutedLines</key>
   <dict>
    <key>0</key>
    <array>
+    <integer>128</integer>
+    <integer>129</integer>
     <integer>130</integer>
-    <integer>131</integer>
-    <integer>132</integer>
    </array>
   </dict>
   </dict>
   <dict>
    <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>137</integer>
+           <key>line</key><integer>135</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>137</integer>
+           <key>line</key><integer>135</integer>
            <key>col</key><integer>4</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>137</integer>
+           <key>line</key><integer>135</integer>
            <key>col</key><integer>7</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>137</integer>
+           <key>line</key><integer>135</integer>
            <key>col</key><integer>7</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>137</integer>
+      <key>line</key><integer>135</integer>
       <key>col</key><integer>7</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>137</integer>
+         <key>line</key><integer>135</integer>
          <key>col</key><integer>7</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>137</integer>
+         <key>line</key><integer>135</integer>
          <key>col</key><integer>8</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Assuming pointer value is null</string>
      <key>message</key>
      <string>Assuming pointer value is null</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>137</integer>
+           <key>line</key><integer>135</integer>
            <key>col</key><integer>7</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>137</integer>
+           <key>line</key><integer>135</integer>
            <key>col</key><integer>7</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>139</integer>
+           <key>line</key><integer>137</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>139</integer>
+           <key>line</key><integer>137</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>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>139</integer>
+           <key>line</key><integer>137</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>139</integer>
+           <key>line</key><integer>137</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>139</integer>
+           <key>line</key><integer>137</integer>
            <key>col</key><integer>7</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>139</integer>
+           <key>line</key><integer>137</integer>
            <key>col</key><integer>7</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>139</integer>
+      <key>line</key><integer>137</integer>
       <key>col</key><integer>7</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>139</integer>
+         <key>line</key><integer>137</integer>
          <key>col</key><integer>3</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>139</integer>
+         <key>line</key><integer>137</integer>
          <key>col</key><integer>9</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Dereference of null pointer</string>
      <key>message</key>
      <string>Dereference of null pointer</string>
     </dict>
    </array>
    <key>description</key><string>Dereference of null pointer</string>
    <key>category</key><string>Logic error</string>
    <key>type</key><string>Dereference of null pointer</string>
    <key>check_name</key><string>core.NullDereference</string>
    <!-- This hash is experimental and going to change! -->
    <key>issue_hash_content_of_line_in_context</key><string>19292468c6c6f83fbbdb2ff072bb2ae8</string>
   <key>issue_context_kind</key><string>function</string>
   <key>issue_context</key><string>test4</string>
   <key>issue_hash_function_offset</key><string>3</string>
   <key>location</key>
   <dict>
-   <key>line</key><integer>139</integer>
+   <key>line</key><integer>137</integer>
    <key>col</key><integer>7</integer>
    <key>file</key><integer>0</integer>
   </dict>
   <key>ExecutedLines</key>
   <dict>
    <key>0</key>
    <array>
-    <integer>136</integer>
+    <integer>134</integer>
+    <integer>135</integer>
     <integer>137</integer>
-    <integer>139</integer>
    </array>
   </dict>
   </dict>
   <dict>
    <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>152</integer>
+           <key>line</key><integer>150</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>152</integer>
+           <key>line</key><integer>150</integer>
            <key>col</key><integer>5</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>153</integer>
+           <key>line</key><integer>151</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>153</integer>
+           <key>line</key><integer>151</integer>
            <key>col</key><integer>19</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>153</integer>
+      <key>line</key><integer>151</integer>
       <key>col</key><integer>3</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>153</integer>
+         <key>line</key><integer>151</integer>
          <key>col</key><integer>3</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>153</integer>
+         <key>line</key><integer>151</integer>
          <key>col</key><integer>23</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Calling &apos;interestingCallee&apos;</string>
      <key>message</key>
      <string>Calling &apos;interestingCallee&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>event</string>
      <key>location</key>
      <dict>
-      <key>line</key><integer>146</integer>
+      <key>line</key><integer>144</integer>
       <key>col</key><integer>1</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>depth</key><integer>1</integer>
      <key>extended_message</key>
      <string>Entered call from &apos;testBoringCalleeOfInterestingCallee&apos;</string>
      <key>message</key>
      <string>Entered call from &apos;testBoringCalleeOfInterestingCallee&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>146</integer>
+           <key>line</key><integer>144</integer>
            <key>col</key><integer>1</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>146</integer>
+           <key>line</key><integer>144</integer>
            <key>col</key><integer>4</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>147</integer>
+           <key>line</key><integer>145</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>147</integer>
+           <key>line</key><integer>145</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>147</integer>
+      <key>line</key><integer>145</integer>
       <key>col</key><integer>3</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>147</integer>
+         <key>line</key><integer>145</integer>
          <key>col</key><integer>3</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>147</integer>
+         <key>line</key><integer>145</integer>
          <key>col</key><integer>8</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>1</integer>
      <key>extended_message</key>
      <string>The value 0 is assigned to &apos;x&apos;</string>
      <key>message</key>
      <string>The value 0 is assigned to &apos;x&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>147</integer>
+           <key>line</key><integer>145</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>147</integer>
+           <key>line</key><integer>145</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>148</integer>
+           <key>line</key><integer>146</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>148</integer>
+           <key>line</key><integer>146</integer>
            <key>col</key><integer>14</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>153</integer>
+      <key>line</key><integer>151</integer>
       <key>col</key><integer>3</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>153</integer>
+         <key>line</key><integer>151</integer>
          <key>col</key><integer>3</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>153</integer>
+         <key>line</key><integer>151</integer>
          <key>col</key><integer>23</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Returning from &apos;interestingCallee&apos;</string>
      <key>message</key>
      <string>Returning from &apos;interestingCallee&apos;</string>
     </dict>
     <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
-           <key>line</key><integer>153</integer>
+           <key>line</key><integer>151</integer>
            <key>col</key><integer>3</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>153</integer>
+           <key>line</key><integer>151</integer>
            <key>col</key><integer>19</integer>
            <key>file</key><integer>0</integer>
           </dict>
          </array>
         <key>end</key>
          <array>
           <dict>
-           <key>line</key><integer>155</integer>
+           <key>line</key><integer>153</integer>
            <key>col</key><integer>12</integer>
            <key>file</key><integer>0</integer>
           </dict>
           <dict>
-           <key>line</key><integer>155</integer>
+           <key>line</key><integer>153</integer>
            <key>col</key><integer>12</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>155</integer>
+      <key>line</key><integer>153</integer>
       <key>col</key><integer>12</integer>
       <key>file</key><integer>0</integer>
      </dict>
      <key>ranges</key>
      <array>
        <array>
         <dict>
-         <key>line</key><integer>155</integer>
+         <key>line</key><integer>153</integer>
          <key>col</key><integer>10</integer>
          <key>file</key><integer>0</integer>
         </dict>
         <dict>
-         <key>line</key><integer>155</integer>
+         <key>line</key><integer>153</integer>
          <key>col</key><integer>14</integer>
          <key>file</key><integer>0</integer>
         </dict>
        </array>
      </array>
      <key>depth</key><integer>0</integer>
      <key>extended_message</key>
      <string>Division by zero</string>
      <key>message</key>
      <string>Division by zero</string>
     </dict>
    </array>
    <key>description</key><string>Division by zero</string>
    <key>category</key><string>Logic error</string>
    <key>type</key><string>Division by zero</string>
    <key>check_name</key><string>core.DivideZero</string>
    <!-- This hash is experimental and going to change! -->
    <key>issue_hash_content_of_line_in_context</key><string>fcd480c0f73d071bac6f908387893e26</string>
   <key>issue_context_kind</key><string>function</string>
   <key>issue_context</key><string>testBoringCalleeOfInterestingCallee</string>
   <key>issue_hash_function_offset</key><string>4</string>
   <key>location</key>
   <dict>
-   <key>line</key><integer>155</integer>
+   <key>line</key><integer>153</integer>
    <key>col</key><integer>12</integer>
    <key>file</key><integer>0</integer>
   </dict>
   <key>ExecutedLines</key>
   <dict>
    <key>0</key>
    <array>
-    <integer>143</integer>
+    <integer>141</integer>
+    <integer>144</integer>
+    <integer>145</integer>
     <integer>146</integer>
-    <integer>147</integer>
-    <integer>148</integer>
+    <integer>149</integer>
+    <integer>150</integer>
     <integer>151</integer>
-    <integer>152</integer>
     <integer>153</integer>
-    <integer>155</integer>
    </array>
   </dict>
   </dict>
  </array>
  <key>files</key>
  <array>
    <string>/clang/test/Analysis/inlining/path-notes.c</string>
  </array>
 </dict>
 </plist>

clang/test/Analysis/inlining/Inputs/expected-plists/path-notes.cpp.plist

<array>
     <integer>205</integer>
    </array>
   </dict>
   </dict>
   <dict>
    <key>path</key>
    <array>
     <dict>
-     <key>kind</key><string>event</string>
-     <key>location</key>
-     <dict>
-      <key>line</key><integer>210</integer>
-      <key>col</key><integer>3</integer>
-      <key>file</key><integer>0</integer>
-     </dict>
-     <key>ranges</key>
-     <array>
-       <array>
-        <dict>
-         <key>line</key><integer>210</integer>
-         <key>col</key><integer>3</integer>
-         <key>file</key><integer>0</integer>
-        </dict>
-        <dict>
-         <key>line</key><integer>210</integer>
-         <key>col</key><integer>9</integer>
-         <key>file</key><integer>0</integer>
-        </dict>
-       </array>
-     </array>
-     <key>depth</key><integer>0</integer>
-     <key>extended_message</key>
-     <string>&apos;y&apos; initialized here</string>
-     <key>message</key>
-     <string>&apos;y&apos; initialized here</string>
-    </dict>
-    <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
            <key>line</key><integer>210</integer>
<array>
     <integer>243</integer>
    </array>
   </dict>
   </dict>
   <dict>
    <key>path</key>
    <array>
     <dict>
-     <key>kind</key><string>event</string>
-     <key>location</key>
-     <dict>
-      <key>line</key><integer>254</integer>
-      <key>col</key><integer>3</integer>
-      <key>file</key><integer>0</integer>
-     </dict>
-     <key>ranges</key>
-     <array>
-       <array>
-        <dict>
-         <key>line</key><integer>254</integer>
-         <key>col</key><integer>3</integer>
-         <key>file</key><integer>0</integer>
-        </dict>
-        <dict>
-         <key>line</key><integer>254</integer>
-         <key>col</key><integer>14</integer>
-         <key>file</key><integer>0</integer>
-        </dict>
-       </array>
-     </array>
-     <key>depth</key><integer>0</integer>
-     <key>extended_message</key>
-     <string>&apos;val&apos; initialized here</string>
-     <key>message</key>
-     <string>&apos;val&apos; initialized here</string>
-    </dict>
-    <dict>
      <key>kind</key><string>control</string>
      <key>edges</key>
       <array>
        <dict>
         <key>start</key>
          <array>
           <dict>
            <key>line</key><integer>254</integer>

clang/test/Analysis/inlining/path-notes.c

void testCheck(int *a) {
   // expected-note@-1 {{Dereference of null pointer (loaded from variable 'a')}}
 }
 
 
 int *getPointer();
 
 void testInitCheck() {
   int *a = getPointer();
-  // expected-note@-1 {{'a' initialized here}}
   if (a) {
     // expected-note@-1 + {{Assuming 'a' is null}}
     // expected-note@-2 + {{Taking false branch}}
     ;
   }
   *a = 1; // expected-warning{{Dereference of null pointer}}
   // expected-note@-1 {{Dereference of null pointer (loaded from variable 'a')}}
 }
 
 void testStoreCheck(int *a) {
   a = getPointer();
-  // expected-note@-1 {{Value assigned to 'a'}}
   if (a) {
     // expected-note@-1 + {{Assuming 'a' is null}}
     // expected-note@-2 + {{Taking false branch}}
     ;
   }
   *a = 1; // expected-warning{{Dereference of null pointer}}
   // expected-note@-1 {{Dereference of null pointer (loaded from variable 'a')}}
 }

clang/test/Analysis/inlining/path-notes.cpp

 void testPathNoteOnInitializer() {
   int *p = 0; // expected-note {{'p' initialized to a null pointer value}}
 
   FooWithInitializer f(p); // expected-note {{Passing null pointer value via 1st parameter 'p'}}
   // expected-note@-1 {{Calling constructor for 'FooWithInitializer'}}
 }
 
 int testNonPrintableAssignment(int **p) {
-  int *&y = *p; // expected-note {{'y' initialized here}}
+  int *&y = *p;
   y = 0;        // expected-note {{Storing null pointer value}}
   return *y; // expected-warning {{Dereference of null pointer (loaded from variable 'y')}}
              // expected-note@-1 {{Dereference of null pointer (loaded from variable 'y')}}
 }
 
 struct Base { int *x; };
 struct Derived : public Base {};
 

 
 
 
 class A {
 public:
   void bar() const {}
 };
 const A& testDeclRefExprToReferenceInGetDerefExpr(const A *ptr) {
-  const A& val = *ptr; //expected-note {{'val' initialized here}}
+  const A& val = *ptr;
 
   // This is not valid C++; if 'ptr' were null, creating 'ref' would be illegal.
   // However, this is not checked at runtime, so this branch is actually
   // possible.
   if (&val == 0) { //expected-note {{Assuming pointer value is null}}
                    // expected-note@-1 {{Taking true branch}}
     val.bar(); // expected-warning {{Called C++ object pointer is null}}
                // expected-note@-1 {{Called C++ object pointer is null}}

clang/test/Analysis/loop-widening-notes.cpp

 // RUN: %clang_analyze_cc1 -analyzer-checker=core,alpha -analyzer-max-loop 2 -analyzer-config widen-loops=true -analyzer-output=text -verify -analyzer-config eagerly-assume=false %s
 
 int *p_a;
 int bar();
 int flag_a;
 int test_for_bug_25609() {
   if (p_a == 0) // expected-note {{Assuming 'p_a' is equal to null}} 
                 // expected-note@-1 {{Taking true branch}}
     bar();
   for (int i = 0;  // expected-note {{Loop condition is true.  Entering loop body}}                    
                    // expected-note@-1 {{Loop condition is false. Execution continues on line 16}}
-       ++i,        // expected-note {{Value assigned to 'p_a'}} 
+       ++i,
        i < flag_a;
        ++i) {}
                                       
   *p_a = 25609; // no-crash expected-warning {{Dereference of null pointer (loaded from variable 'p_a')}}
                 // expected-note@-1 {{Dereference of null pointer (loaded from variable 'p_a')}}
   return *p_a;
 }
 
 int flag_b;
 int while_analyzer_output() {
   flag_b = 100;
   int num = 10;
   while (flag_b-- > 0) { // expected-note {{Loop condition is true.  Entering loop body}} 
-                         // expected-note@-1 {{Value assigned to 'num'}} 
-                         // expected-note@-2 {{Loop condition is false. Execution continues on line 30}}
+                         // expected-note@-1 {{Loop condition is false. Execution continues on line 29}}
     num = flag_b;
   }
   if (num < 0) // expected-note {{Assuming 'num' is >= 0}} 
                // expected-note@-1 {{Taking false branch}}
     flag_b = 0;
   else if (num >= 1) // expected-note {{Assuming 'num' is < 1}} 
                      // expected-note@-1 {{Taking false branch}}
     flag_b = 50;
   else
     flag_b = 100;
   return flag_b / num; // no-crash expected-warning {{Division by zero}} 
                        // expected-note@-1 {{Division by zero}}
 }
 
 int flag_c;
 int do_while_analyzer_output() {
   int num = 10;
-  do {   // expected-note {{Loop condition is true. Execution continues on line 47}} 
+  do {   // expected-note {{Loop condition is true. Execution continues on line 46}} 
          // expected-note@-1 {{Loop condition is false.  Exiting loop}}
     num--;
-  } while (flag_c-- > 0); //expected-note {{Value assigned to 'num'}}
+  } while (flag_c-- > 0);
   int local = 0;
   if (num == 0)       // expected-note {{Assuming 'num' is equal to 0}} 
                       // expected-note@-1 {{Taking true branch}}
     local = 10 / num; // no-crash expected-warning {{Division by zero}}
                       // expected-note@-1 {{Division by zero}}
   return local;
 }
 
 int flag_d;
 int test_for_loop() {
   int num = 10;
   for (int i = 0;    // expected-note {{Loop condition is true.  Entering loop body}} 
-                     // expected-note@-1 {{Loop condition is false. Execution continues on line 67}}
-       new int(10),  // expected-note {{Value assigned to 'num'}}
+                     // expected-note@-1 {{Loop condition is false. Execution continues on line 66}}
+       new int(10),
        i < flag_d;
        ++i) {         
     ++num;
   }
   if (num == 0) // expected-note {{Assuming 'num' is equal to 0}} 
                 // expected-note@-1 {{Taking true branch}}
     flag_d += 10;
   return flag_d / num; // no-crash expected-warning {{Division by zero}} 
                        // expected-note@-1 {{Division by zero}}
 }

clang/test/Analysis/null-deref-path-notes.cpp

class c {
   void f(B &, int &);
 };
 
 // Properly track the null pointer in the array field back to the default
 // constructor of 'h'.
 void c::f(B &g, int &i) {
   e(g.d[9], i); // expected-warning{{Array access (via field 'd') results in a null pointer dereference}}
                 // expected-note@-1{{Array access (via field 'd') results in a null pointer dereference}}
-  B h, a; // expected-note{{Value assigned to 'h.d'}}
+  B h, a;
   a.d == __null; // expected-note{{Assuming the condition is true}}
   a.d != h.d; // expected-note{{Assuming 'a.d' is equal to 'h.d'}}
   f(h, b); // expected-note{{Calling 'c::f'}}
 }
 }

clang/test/Analysis/null-deref-path-notes.m

 }
 
 
 @interface Subclass : Root
 @end
 
 @implementation Subclass
 - (id)initWithID:(int)newID {
-  self = [super initWithID:newID]; // expected-note{{Value assigned to 'self'}}
+  self = [super initWithID:newID];
   if (self) return self;
   // expected-note@-1 {{Assuming 'self' is nil}}
   // expected-note@-2 {{Taking false branch}}
 
   uniqueID = newID; // expected-warning{{Access to instance variable 'uniqueID' results in a dereference of a null pointer (loaded from variable 'self')}} expected-note{{Access to instance variable 'uniqueID' results in a dereference of a null pointer (loaded from variable 'self')}}
   return self;
 }
 

clang/test/Analysis/taint-diagnostic-visitor.c

int taintDiagnosticOutOfBound() {
   int index;
   int Array[] = {1, 2, 3, 4, 5};
   scanf("%d", &index); // expected-note {{Taint originated here}}
   return Array[index]; // expected-warning {{Out of bound memory access (index is tainted)}}
                        // expected-note@-1 {{Out of bound memory access (index is tainted)}}
 }
 
 int taintDiagnosticDivZero(int operand) {
-  scanf("%d", &operand); // expected-note {{Value assigned to 'operand'}}
-                         // expected-note@-1 {{Taint originated here}}
+  scanf("%d", &operand); // expected-note {{Taint originated here}}
   return 10 / operand; // expected-warning {{Division by a tainted value, possibly zero}}
                        // expected-note@-1 {{Division by a tainted value, possibly zero}}
 }
 
 void taintDiagnosticVLA() {
   int x;
-  scanf("%d", &x); // expected-note {{Value assigned to 'x'}}
-                   // expected-note@-1 {{Taint originated here}}
+  scanf("%d", &x); // expected-note {{Taint originated here}}
   int vla[x]; // expected-warning {{Declared variable-length array (VLA) has tainted size}}
               // expected-note@-1 {{Declared variable-length array (VLA) has tainted size}}
 }

clang/test/Analysis/uninit-const.c

 void doStuff_constPointerToConstPointerToConstInt(int const * const * const u){};
 void doStuff_pointerToConstPointerToConstInt(int const * const * u){};
 void doStuff_pointerToPointerToConstInt       (int const **u){};
 void doStuff_constStaticSizedArray(const int a[static 10]) {}
 void doStuff_variadic(const int *u, ...){};
 
 void f_1(void) {
   int t;
-  int* tp = &t;        // expected-note {{'tp' initialized here}}
+  int* tp = &t;
   doStuff_pointerToConstInt(tp);  // expected-warning {{1st function call argument is a pointer to uninitialized value}}
                        // expected-note@-1 {{1st function call argument is a pointer to uninitialized value}}
 }
 
 void f_1_1(void) {
   int t;
   int* tp1 = &t;
-  int* tp2 = tp1;        // expected-note {{'tp2' initialized here}}
+  int* tp2 = tp1;
   doStuff_pointerToConstInt(tp2);  // expected-warning {{1st function call argument is a pointer to uninitialized value}}
                        // expected-note@-1 {{1st function call argument is a pointer to uninitialized value}}
 }
 
 
 int *f_2_sub(int *p) {
   return p;
 }
 
 void f_2(void) {
   int t;
   int* p = f_2_sub(&t);
-  int* tp = p; // expected-note {{'tp' initialized here}}
+  int* tp = p;
   doStuff_pointerToConstInt(tp); // expected-warning {{1st function call argument is a pointer to uninitialized value}}
                       // expected-note@-1 {{1st function call argument is a pointer to uninitialized value}}
 }
 
 int z;
 void f_3(void) {
       doStuff_pointerToConstInt(&z);  // no warning
 }
 
 void f_4(void) {
       int x=5;
       doStuff_pointerToConstInt(&x);  // no warning
 }
 
 void f_5(void) {
   int ta[5];
-  int* tp = ta;        // expected-note {{'tp' initialized here}}
+  int* tp = ta;
   doStuff_pointerToConstInt(tp);  // expected-warning {{1st function call argument is a pointer to uninitialized value}}
                        // expected-note@-1 {{1st function call argument is a pointer to uninitialized value}}
 }
 
 void f_5_1(void) {
-  int ta[5];        // expected-note {{'ta' initialized here}}
+  int ta[5];
   doStuff_pointerToConstInt(ta);  // expected-warning {{1st function call argument is a pointer to uninitialized value}}
                        // expected-note@-1 {{1st function call argument is a pointer to uninitialized value}}
 }
 
 void f_6(void) {
   int ta[5] = {1,2,3,4,5};
   int* tp = ta;
   doStuff_pointerToConstInt(tp); // no-warning

 void f_8(void) {
       int g;       // expected-note {{'g' declared without an initial value}}
       doStuff2(g); // expected-warning {{1st function call argument is an uninitialized value}}
                    // expected-note@-1 {{1st function call argument is an uninitialized value}}
 }
 
 void f_9(void) {
   int  a[6];
-  int const *ptau = a;             // expected-note {{'ptau' initialized here}}
+  int const *ptau = a;
   doStuff_arrayOfConstInt(ptau);    // expected-warning {{1st function call argument is a pointer to uninitialized value}}
                                    // expected-note@-1 {{1st function call argument is a pointer to uninitialized value}}
 }
 
 void f_10(void) {
-  int  a[6];                     // expected-note {{'a' initialized here}}
+  int  a[6];
   doStuff_arrayOfConstInt(a);    // expected-warning {{1st function call argument is a pointer to uninitialized value}}
                                  // expected-note@-1 {{1st function call argument is a pointer to uninitialized value}}
 }
 
 void f_11(void) {
-  int t[10];                    //expected-note {{'t' initialized here}}
+  int t[10];
   doStuff_constStaticSizedArray(t);  // expected-warning {{1st function call argument is a pointer to uninitialized value}}
                                 // expected-note@-1 {{1st function call argument is a pointer to uninitialized value}}
 }
 
 void f_12(void) {
   int t[10] = {0,1,2,3,4,5,6,7,8,9};
   doStuff_constStaticSizedArray(t);  // no-warning
 
void f11_3(void) {
   --x; // expected-warning {{The expression is an uninitialized value. The computed value will also be garbage}}
        // expected-note@-1 {{The expression is an uninitialized value. The computed value will also be garbage}}
   clang_analyzer_warnIfReached(); // no-warning
 }
 
 int f_malloc_1(void) {
   int *ptr;
 
-  ptr = (int *)malloc(sizeof(int)); // expected-note {{Value assigned to 'ptr'}}
+  ptr = (int *)malloc(sizeof(int));
 
   doStuff_pointerToConstInt(ptr); // expected-warning {{1st function call argument is a pointer to uninitialized value}}
                        // expected-note@-1 {{1st function call argument is a pointer to uninitialized value}}
   free(ptr);
   return 0;
 }
 
 int f_malloc_2(void) {
   int *ptr;
 
   ptr = (int *)malloc(sizeof(int));
   *ptr = 25;
 
   doStuff_pointerToConstInt(ptr); // no warning
   free(ptr);
   return 0;
 }
 
 // uninit pointer, uninit val
 void f_variadic_unp_unv(void) {
   int t;
   int v;
-  int* tp = &t;           // expected-note {{'tp' initialized here}}
+  int* tp = &t;
   doStuff_variadic(tp,v);  // expected-warning {{1st function call argument is a pointer to uninitialized value}}
                           // expected-note@-1 {{1st function call argument is a pointer to uninitialized value}}
 }
 // uninit pointer, init val
 void f_variadic_unp_inv(void) {
   int t;
   int v = 3;
-  int* tp = &t;           // expected-note {{'tp' initialized here}}
+  int* tp = &t;
   doStuff_variadic(tp,v);  // expected-warning {{1st function call argument is a pointer to uninitialized value}}
                           // expected-note@-1 {{1st function call argument is a pointer to uninitialized value}}
 }
 
 // init pointer, uninit val
 void f_variadic_inp_unv(void) {
   int t=5;
   int v;                  // expected-note {{'v' declared without an initial value}}
void f_variadic_inp_inp(void) {
   doStuff_variadic(tp,vp); // no-warning
 }
 
 //uninit pointer, init pointer
 void f_variadic_unp_inp(void) {
   int t;
   int u=3;
   int *vp = &u ;
-  int *tp = &t;             // expected-note {{'tp' initialized here}}
+  int *tp = &t;
   doStuff_variadic(tp,vp); // expected-warning {{1st function call argument is a pointer to uninitialized value}}
                             // expected-note@-1 {{1st function call argument is a pointer to uninitialized value}}
 }
 
 //init pointer, uninit pointer
 void f_variadic_inp_unp(void) {
   int t=5;
   int u;
   int *vp = &u ;
   int *tp = &t;
   doStuff_variadic(tp,vp); // no-warning
 }
 
 //uninit pointer, uninit pointer
 void f_variadic_unp_unp(void) {
   int t;
   int u;
   int *vp = &u ;
-  int *tp = &t;             // expected-note {{'tp' initialized here}}
+  int *tp = &t;
   doStuff_variadic(tp,vp); // expected-warning {{1st function call argument is a pointer to uninitialized value}}
                             // expected-note@-1 {{1st function call argument is a pointer to uninitialized value}}
 }

clang/test/Analysis/uninit-const.cpp

 int& f6_1_sub(int &p) {
   return p; // expected-note{{Returning without writing to 'p'}}
             // expected-note@-1{{Returning pointer (reference to 't')}}
 }
 
 void f6_1(void) {
   int t; // expected-note{{'t' declared without an initial value}}
   int p = f6_1_sub(t); //expected-warning {{Assigned value is garbage or undefined}}
-                       //expected-note@-1 {{Passing value via 1st parameter 'p'}}
-                       //expected-note@-2 {{Calling 'f6_1_sub'}}
-                       //expected-note@-3 {{Returning from 'f6_1_sub'}}
-                       //expected-note@-4 {{Assigned value is garbage or undefined}}
+                       //expected-note@-1 {{Calling 'f6_1_sub'}}
+                       //expected-note@-2 {{Returning from 'f6_1_sub'}}
+                       //expected-note@-3 {{Assigned value is garbage or undefined}}
   int q = p;
   doStuff6(q);
 }
 
 void f6_2(void) {
   int t;       //expected-note {{'t' declared without an initial value}}
   int &p = t;
   int &s = p;
-  int &q = s;  //expected-note {{'q' initialized here}}
+  int &q = s;
   doStuff6(q); //expected-warning {{1st function call argument is an uninitialized value}}
                //expected-note@-1 {{1st function call argument is an uninitialized value}}
 }
 
 void doStuff6_3(int& q_, int *ptr_) {}
 
 void f6_3(void) {
   int *ptr;    //expected-note {{'ptr' declared without an initial value}}
doStuff6(k); // expected-warning {{1st function call argument is an uninitialized value}}
                // expected-note@-1 {{1st function call argument is an uninitialized value}}
 
 }
 
 
 
 void f5(void) {
   int t;
-  int* tp = &t;        // expected-note {{'tp' initialized here}}
+  int* tp = &t;
   doStuff_uninit(tp);  // expected-warning {{1st function call argument is a pointer to uninitialized value}}
                        // expected-note@-1 {{1st function call argument is a pointer to uninitialized value}}
 }
 
 
 void f4(void) {
       int y;        // expected-note {{'y' declared without an initial value}}
       doStuff4(y);  // expected-warning {{1st function call argument is an uninitialized value}}

clang/test/Analysis/uninit-vals.c

 
 void foo_radar12278788_fp() { return; }
 typedef int (*RetIntFuncType)();
 typedef void (*RetVoidFuncType)();
 int test_radar12278788_FP() {
   RetVoidFuncType f = foo_radar12278788_fp;
   return ((RetIntFuncType)f)(); //expected-warning {{Undefined or garbage value returned to caller}}
                                 //expected-note@-1 {{Undefined or garbage value returned to caller}}
-                                //expected-note@-2 {{Calling 'foo_radar12278788_fp'}}
-                                //expected-note@-3 {{Returning from 'foo_radar12278788_fp'}}
 }
 
 void rdar13665798() {
   ^() {
     return foo_radar12278788(); // no-warning
   }();
   ^void() {
     return foo_radar12278788(); // no-warning
   }();
   ^int() { // expected-note{{Calling anonymous block}}
     RetVoidFuncType f = foo_radar12278788_fp;
     return ((RetIntFuncType)f)(); //expected-warning {{Undefined or garbage value returned to caller}}
                                   //expected-note@-1 {{Undefined or garbage value returned to caller}}
-                                  //expected-note@-2 {{Calling 'foo_radar12278788_fp'}}
-                                  //expected-note@-3 {{Returning from 'foo_radar12278788_fp'}}
   }();
 }
 
 struct Point {
   int x, y;
 };
 
 struct Point getHalfPoint() {
   struct Point p;
   p.x = 0;
   return p;
 }
 
 void use(struct Point p); 
 
 void testUseHalfPoint() {
-  struct Point p = getHalfPoint(); // expected-note{{Calling 'getHalfPoint'}}
-                                   // expected-note@-1{{Returning from 'getHalfPoint'}}
-                                   // expected-note@-2{{'p' initialized here}}
+  struct Point p = getHalfPoint();
   use(p); // expected-warning{{uninitialized}}
           // expected-note@-1{{uninitialized}}
 }
 
 void testUseHalfPoint2() {
   struct Point p;
-  p = getHalfPoint(); // expected-note{{Calling 'getHalfPoint'}}
-                      // expected-note@-1{{Returning from 'getHalfPoint'}}
-                      // expected-note@-2{{Value assigned to 'p'}}
+  p = getHalfPoint();
   use(p); // expected-warning{{uninitialized}}
           // expected-note@-1{{uninitialized}}
 }

clang/test/Analysis/uninit-vals.m

 void test_uninit_neg() {
   struct TestUninit v1 = { 0, 0 };
   struct TestUninit v2 = test_uninit_aux();
   test_unit_aux2(v2.x + v1.y);
 }
 
 extern void test_uninit_struct_arg_aux(struct TestUninit arg);
 void test_uninit_struct_arg() {
-  struct TestUninit x; // expected-note{{'x' initialized here}}
+  struct TestUninit x;
   test_uninit_struct_arg_aux(x); // expected-warning{{Passed-by-value struct argument contains uninitialized data (e.g., field: 'x')}}
                                  // expected-note@-1{{Passed-by-value struct argument contains uninitialized data (e.g., field: 'x')}}
 }
 
 @interface Foo
 - (void) passVal:(struct TestUninit)arg;
 @end
 void testFoo(Foo *o) {
-  struct TestUninit x; // expected-note{{'x' initialized here}}
+  struct TestUninit x;
   [o passVal:x]; // expected-warning{{Passed-by-value struct argument contains uninitialized data (e.g., field: 'x')}}
                  // expected-note@-1{{Passed-by-value struct argument contains uninitialized data (e.g., field: 'x')}}
 }
 
 // Test case from <rdar://problem/7780304>.  That shows an uninitialized value
 // being used in the LHS of a compound assignment.
 void rdar_7780304() {
   typedef struct s_r7780304 { int x; } s_r7780304;
void testSmallStructBitfieldsSecondUndef() {
   clang_analyzer_eval(b.y == 2); // expected-warning{{garbage}}
                                  // expected-note@-1{{garbage}}
 }
 
 void testSmallStructBitfieldsFirstUnnamed() {
   struct {
     int : 4;
     int y : 4;
-  } a, b, c; // expected-note{{'c' initialized here}}
+  } a, b, c;
 
   a.y = 2;
 
   b = a;
   clang_analyzer_eval(b.y == 2); // expected-warning{{TRUE}}
                                  // expected-note@-1{{TRUE}}
 
   b = c; // expected-note{{Uninitialized value stored to 'b.y'}}
   clang_analyzer_eval(b.y == 2); // expected-warning{{garbage}}
                                  // expected-note@-1{{garbage}}
 }
 
 void testSmallStructBitfieldsSecondUnnamed() {
   struct {
     int x : 4;
     int : 4;
-  } a, b, c; // expected-note{{'c' initialized here}}
+  } a, b, c;
 
   a.x = 1;
 
   b = a;
   clang_analyzer_eval(b.x == 1); // expected-warning{{TRUE}}
                                  // expected-note@-1{{TRUE}}
 
   b = c; // expected-note{{Uninitialized value stored to 'b.x'}}
   clang_analyzer_eval(b.x == 1); // expected-warning{{garbage}}
                                  // expected-note@-1{{garbage}}
 }