r247071 - [Static Analyzer] Objective-C Generics Checker improvements.

[Gabor Horvath via cfe-commits]

Author: xazax
Date: Tue Sep  8 16:04:14 2015
New Revision: 247071

URL: http://llvm.org/viewvc/llvm-project?rev=247071&view=rev
Log:
[Static Analyzer] Objective-C Generics Checker improvements.

Differential Revision: http://reviews.llvm.org/D12701


Modified:
    cfe/trunk/lib/StaticAnalyzer/Checkers/Checkers.td
    cfe/trunk/lib/StaticAnalyzer/Checkers/ObjCGenericsChecker.cpp
    cfe/trunk/test/Analysis/generics.m

Modified: cfe/trunk/lib/StaticAnalyzer/Checkers/Checkers.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Checkers/Checkers.td?rev=247071&r1=247070&r2=247071&view=diff
==============================================================================
--- cfe/trunk/lib/StaticAnalyzer/Checkers/Checkers.td (original)
+++ cfe/trunk/lib/StaticAnalyzer/Checkers/Checkers.td Tue Sep  8 16:04:14 2015
@@ -478,7 +478,7 @@ def DirectIvarAssignmentForAnnotatedFunc
   DescFile<"DirectIvarAssignment.cpp">;
 
 def ObjCGenericsChecker : Checker<"ObjCGenerics">,
-  HelpText<"Check for incorrect usages of parameterized types.">,
+  HelpText<"Check for type errors when using Objective-C generics">,
   DescFile<"ObjCGenericsChecker.cpp">;
 
 def NonLocalizedStringChecker : Checker<"NonLocalizedStringChecker">,

Modified: cfe/trunk/lib/StaticAnalyzer/Checkers/ObjCGenericsChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Checkers/ObjCGenericsChecker.cpp?rev=247071&r1=247070&r2=247071&view=diff
==============================================================================
--- cfe/trunk/lib/StaticAnalyzer/Checkers/ObjCGenericsChecker.cpp (original)
+++ cfe/trunk/lib/StaticAnalyzer/Checkers/ObjCGenericsChecker.cpp Tue Sep  8 16:04:14 2015
@@ -35,28 +35,22 @@ class ObjCGenericsChecker
     : public Checker<check::DeadSymbols, check::PreObjCMessage,
                      check::PostObjCMessage, check::PostStmt<CastExpr>> {
 public:
-  ProgramStateRef checkPointerEscape(ProgramStateRef State,
-                                     const InvalidatedSymbols &Escaped,
-                                     const CallEvent *Call,
-                                     PointerEscapeKind Kind) const;
-
   void checkPreObjCMessage(const ObjCMethodCall &M, CheckerContext &C) const;
   void checkPostObjCMessage(const ObjCMethodCall &M, CheckerContext &C) const;
   void checkPostStmt(const CastExpr *CE, CheckerContext &C) const;
   void checkDeadSymbols(SymbolReaper &SR, CheckerContext &C) const;
 
 private:
-  mutable std::unique_ptr<BugType> BT;
+  mutable std::unique_ptr<BugType> ObjCGenericsBugType;
   void initBugType() const {
-    if (!BT)
-      BT.reset(
+    if (!ObjCGenericsBugType)
+      ObjCGenericsBugType.reset(
           new BugType(this, "Generics", categories::CoreFoundationObjectiveC));
   }
 
   class GenericsBugVisitor : public BugReporterVisitorImpl<GenericsBugVisitor> {
   public:
     GenericsBugVisitor(SymbolRef S) : Sym(S) {}
-    ~GenericsBugVisitor() override {}
 
     void Profile(llvm::FoldingSetNodeID &ID) const override {
       static int X = 0;
@@ -74,28 +68,41 @@ private:
     SymbolRef Sym;
   };
 
-  void reportBug(const ObjCObjectPointerType *From,
-                 const ObjCObjectPointerType *To, ExplodedNode *N,
-                 SymbolRef Sym, CheckerContext &C,
-                 const Stmt *ReportedNode = nullptr) const {
-    initBugType();
-    SmallString<64> Buf;
-    llvm::raw_svector_ostream OS(Buf);
-    OS << "Incompatible pointer types assigning to '";
-    QualType::print(To, Qualifiers(), OS, C.getLangOpts(), llvm::Twine());
-    OS << "' from '";
-    QualType::print(From, Qualifiers(), OS, C.getLangOpts(), llvm::Twine());
-    OS << "'";
-    std::unique_ptr<BugReport> R(new BugReport(*BT, OS.str(), N));
-    R->markInteresting(Sym);
-    R->addVisitor(llvm::make_unique<GenericsBugVisitor>(Sym));
-    if (ReportedNode)
-      R->addRange(ReportedNode->getSourceRange());
-    C.emitReport(std::move(R));
-  }
+  void reportGenericsBug(const ObjCObjectPointerType *From,
+                         const ObjCObjectPointerType *To, ExplodedNode *N,
+                         SymbolRef Sym, CheckerContext &C,
+                         const Stmt *ReportedNode = nullptr) const;
+
+  void checkReturnType(const ObjCMessageExpr *MessageExpr,
+                       const ObjCObjectPointerType *TrackedType, SymbolRef Sym,
+                       const ObjCMethodDecl *Method,
+                       ArrayRef<QualType> TypeArgs, bool SubscriptOrProperty,
+                       CheckerContext &C) const;
 };
 } // end anonymous namespace
 
+void ObjCGenericsChecker::reportGenericsBug(const ObjCObjectPointerType *From,
+                                            const ObjCObjectPointerType *To,
+                                            ExplodedNode *N, SymbolRef Sym,
+                                            CheckerContext &C,
+                                            const Stmt *ReportedNode) const {
+  initBugType();
+  SmallString<192> Buf;
+  llvm::raw_svector_ostream OS(Buf);
+  OS << "Conversion from value of type '";
+  QualType::print(From, Qualifiers(), OS, C.getLangOpts(), llvm::Twine());
+  OS << "' to incompatible type '";
+  QualType::print(To, Qualifiers(), OS, C.getLangOpts(), llvm::Twine());
+  OS << "'";
+  std::unique_ptr<BugReport> R(
+      new BugReport(*ObjCGenericsBugType, OS.str(), N));
+  R->markInteresting(Sym);
+  R->addVisitor(llvm::make_unique<GenericsBugVisitor>(Sym));
+  if (ReportedNode)
+    R->addRange(ReportedNode->getSourceRange());
+  C.emitReport(std::move(R));
+}
+
 PathDiagnosticPiece *ObjCGenericsChecker::GenericsBugVisitor::VisitNode(
     const ExplodedNode *N, const ExplodedNode *PrevN, BugReporterContext &BRC,
     BugReport &BR) {
@@ -124,7 +131,7 @@ PathDiagnosticPiece *ObjCGenericsChecker
 
   const LangOptions &LangOpts = BRC.getASTContext().getLangOpts();
 
-  SmallString<64> Buf;
+  SmallString<256> Buf;
   llvm::raw_svector_ostream OS(Buf);
   OS << "Type '";
   QualType::print(*TrackedType, Qualifiers(), OS, LangOpts, llvm::Twine());
@@ -156,6 +163,7 @@ PathDiagnosticPiece *ObjCGenericsChecker
   return new PathDiagnosticEventPiece(Pos, OS.str(), true, nullptr);
 }
 
+/// Clean up the states stored by the checker.
 void ObjCGenericsChecker::checkDeadSymbols(SymbolReaper &SR,
                                            CheckerContext &C) const {
   if (!SR.hasDeadSymbols())
@@ -197,25 +205,99 @@ static const ObjCObjectPointerType *getM
                                               MostInformativeCandidate, C);
 }
 
-/// Get the most derived class if From that do not loose information about type
-/// parameters. To has to be a subclass of From. From has to be specialized.
+/// A downcast may loose specialization information. E. g.:
+///   MutableMap<T, U> : Map
+/// The downcast to MutableMap looses the information about the types of the
+/// Map (due to the type parameters are not being forwarded to Map), and in
+/// general there is no way to recover that information from the
+/// declaration. In order to have to most information, lets find the most
+/// derived type that has all the type parameters forwarded.
+///
+/// Get the a subclass of \p From (which has a lower bound \p To) that do not
+/// loose information about type parameters. \p To has to be a subclass of
+/// \p From. From has to be specialized.
 static const ObjCObjectPointerType *
 getMostInformativeDerivedClass(const ObjCObjectPointerType *From,
                                const ObjCObjectPointerType *To, ASTContext &C) {
   return getMostInformativeDerivedClassImpl(From, To, To, C);
 }
 
-static bool storeWhenMoreInformative(ProgramStateRef &State, SymbolRef Sym,
-                                     const ObjCObjectPointerType *const *Old,
-                                     const ObjCObjectPointerType *New,
-                                     ASTContext &C) {
-  if (!Old || C.canAssignObjCInterfaces(*Old, New)) {
-    State = State->set<TypeParamMap>(Sym, New);
+/// Inputs:
+///   \param StaticLowerBound Static lower bound for a symbol. The dynamic lower
+///   bound might be the subclass of this type.
+///   \param StaticUpperBound A static upper bound for a symbol.
+///   \p StaticLowerBound expected to be the subclass of \p StaticUpperBound.
+///   \param Current The type that was inferred for a symbol in a previous
+///   context. Might be null when this is the first time that inference happens.
+/// Precondition:
+///   \p StaticLowerBound or \p StaticUpperBound is specialized. If \p Current
+///   is not null, it is specialized.
+/// Possible cases:
+///   (1) The \p Current is null and \p StaticLowerBound <: \p StaticUpperBound
+///   (2) \p StaticLowerBound <: \p Current <: \p StaticUpperBound
+///   (3) \p Current <: \p StaticLowerBound <: \p StaticUpperBound
+///   (4) \p StaticLowerBound <: \p StaticUpperBound <: \p Current
+/// Effect:
+///   Use getMostInformativeDerivedClass with the upper and lower bound of the
+///   set {\p StaticLowerBound, \p Current, \p StaticUpperBound}. The computed
+///   lower bound must be specialized. If the result differs from \p Current or
+///   \p Current is null, store the result.
+static bool
+storeWhenMoreInformative(ProgramStateRef &State, SymbolRef Sym,
+                         const ObjCObjectPointerType *const *Current,
+                         const ObjCObjectPointerType *StaticLowerBound,
+                         const ObjCObjectPointerType *StaticUpperBound,
+                         ASTContext &C) {
+  // Precondition
+  assert(StaticUpperBound->isSpecialized() ||
+         StaticLowerBound->isSpecialized());
+  assert(!Current || (*Current)->isSpecialized());
+
+  // Case (1)
+  if (!Current) {
+    if (StaticUpperBound->isUnspecialized()) {
+      State = State->set<TypeParamMap>(Sym, StaticLowerBound);
+      return true;
+    }
+    // Upper bound is specialized.
+    const ObjCObjectPointerType *WithMostInfo =
+        getMostInformativeDerivedClass(StaticUpperBound, StaticLowerBound, C);
+    State = State->set<TypeParamMap>(Sym, WithMostInfo);
+    return true;
+  }
+
+  // Case (3)
+  if (C.canAssignObjCInterfaces(StaticLowerBound, *Current)) {
+    return false;
+  }
+
+  // Case (4)
+  if (C.canAssignObjCInterfaces(*Current, StaticUpperBound)) {
+    // The type arguments might not be forwarded at any point of inheritance.
+    const ObjCObjectPointerType *WithMostInfo =
+        getMostInformativeDerivedClass(*Current, StaticUpperBound, C);
+    WithMostInfo =
+        getMostInformativeDerivedClass(WithMostInfo, StaticLowerBound, C);
+    if (WithMostInfo == *Current)
+      return false;
+    State = State->set<TypeParamMap>(Sym, WithMostInfo);
+    return true;
+  }
+
+  // Case (2)
+  const ObjCObjectPointerType *WithMostInfo =
+      getMostInformativeDerivedClass(*Current, StaticLowerBound, C);
+  if (WithMostInfo != *Current) {
+    State = State->set<TypeParamMap>(Sym, WithMostInfo);
     return true;
   }
+
   return false;
 }
 
+/// Type inference based on static type information that is available for the
+/// cast and the tracked type information for the given symbol. When the tracked
+/// symbol and the destination type of the cast are unrelated, report an error.
 void ObjCGenericsChecker::checkPostStmt(const CastExpr *CE,
                                         CheckerContext &C) const {
   if (CE->getCastKind() != CK_BitCast)
@@ -240,10 +322,10 @@ void ObjCGenericsChecker::checkPostStmt(
   OrigObjectPtrType = OrigObjectPtrType->stripObjCKindOfTypeAndQuals(ASTCtxt);
   DestObjectPtrType = DestObjectPtrType->stripObjCKindOfTypeAndQuals(ASTCtxt);
 
-  const ObjCObjectType *OrigObjectType = OrigObjectPtrType->getObjectType();
-  const ObjCObjectType *DestObjectType = DestObjectPtrType->getObjectType();
-
-  if (OrigObjectType->isUnspecialized() && DestObjectType->isUnspecialized())
+  // TODO: erase tracked information when there is a cast to unrelated type
+  //       and everything is unspecialized statically.
+  if (OrigObjectPtrType->isUnspecialized() &&
+      DestObjectPtrType->isUnspecialized())
     return;
 
   ProgramStateRef State = C.getState();
@@ -259,26 +341,9 @@ void ObjCGenericsChecker::checkPostStmt(
   const ObjCObjectPointerType *const *TrackedType =
       State->get<TypeParamMap>(Sym);
 
-  // If OrigObjectType could convert to DestObjectType, this could be an
-  // implicit cast. Do not treat that cast as explicit in that case.
-  if (isa<ExplicitCastExpr>(CE) && !OrigToDest) {
-    if (DestToOrig) {
-      // Trust explicit downcasts.
-      // However a downcast may also lose information. E. g.:
-      //   MutableMap<T, U> : Map
-      // The downcast to MutableMap loses the information about the types of the
-      // Map (due to the type parameters are not being forwarded to Map), and in
-      // general there is no way to recover that information from the
-      // declaration. In order to have to most information, lets find the most
-      // derived type that has all the type parameters forwarded.
-      const ObjCObjectPointerType *WithMostInfo =
-          getMostInformativeDerivedClass(OrigObjectPtrType, DestObjectPtrType,
-                                         C.getASTContext());
-      if (storeWhenMoreInformative(State, Sym, TrackedType, WithMostInfo,
-                                   ASTCtxt))
-        C.addTransition(State);
-      return;
-    }
+  // Downcasts and upcasts handled in an uniform way regardless of being
+  // explicit. Explicit casts however can happen between mismatched types.
+  if (isa<ExplicitCastExpr>(CE) && !OrigToDest && !DestToOrig) {
     // Mismatched types. If the DestType specialized, store it. Forget the
     // tracked type otherwise.
     if (DestObjectPtrType->isSpecialized()) {
@@ -291,22 +356,6 @@ void ObjCGenericsChecker::checkPostStmt(
     return;
   }
 
-  // Handle implicit casts and explicit upcasts.
-
-  if (DestObjectType->isUnspecialized()) {
-    assert(OrigObjectType->isSpecialized());
-    // In case we already have some type information for this symbol from a
-    // Specialized -> Specialized conversion, do not record the OrigType,
-    // because it might contain less type information than the tracked type.
-    if (!TrackedType) {
-      State = State->set<TypeParamMap>(Sym, OrigObjectPtrType);
-      C.addTransition(State);
-    }
-    return;
-  }
-
-  // The destination type is specialized.
-
   // The tracked type should be the sub or super class of the static destination
   // type. When an (implicit) upcast or a downcast happens according to static
   // types, and there is no subtyping relationship between the tracked and the
@@ -315,27 +364,23 @@ void ObjCGenericsChecker::checkPostStmt(
       !ASTCtxt.canAssignObjCInterfaces(DestObjectPtrType, *TrackedType) &&
       !ASTCtxt.canAssignObjCInterfaces(*TrackedType, DestObjectPtrType)) {
     static CheckerProgramPointTag IllegalConv(this, "IllegalConversion");
-    ExplodedNode *N = C.addTransition(State, C.getPredecessor(), &IllegalConv);
-    reportBug(*TrackedType, DestObjectPtrType, N, Sym, C);
+    ExplodedNode *N = C.addTransition(State, &IllegalConv);
+    reportGenericsBug(*TrackedType, DestObjectPtrType, N, Sym, C);
     return;
   }
 
-  if (OrigToDest && !DestToOrig) {
-    // When upcast happens, store the type with the most information about the
-    // type parameters.
-    const ObjCObjectPointerType *WithMostInfo = getMostInformativeDerivedClass(
-        DestObjectPtrType, OrigObjectPtrType, ASTCtxt);
-    if (storeWhenMoreInformative(State, Sym, TrackedType, WithMostInfo,
-                                 ASTCtxt))
-      C.addTransition(State);
-    return;
-  }
+  // Handle downcasts and upcasts.
 
-  // Downcast happens.
+  const ObjCObjectPointerType *LowerBound = DestObjectPtrType;
+  const ObjCObjectPointerType *UpperBound = OrigObjectPtrType;
+  if (OrigToDest && !DestToOrig)
+    std::swap(LowerBound, UpperBound);
 
-  // Trust tracked type on unspecialized value -> specialized implicit
-  // downcasts.
-  if (storeWhenMoreInformative(State, Sym, TrackedType, DestObjectPtrType,
+  // The id type is not a real bound. Eliminate it.
+  LowerBound = LowerBound->isObjCIdType() ? UpperBound : LowerBound;
+  UpperBound = UpperBound->isObjCIdType() ? LowerBound : UpperBound;
+
+  if (storeWhenMoreInformative(State, Sym, TrackedType, LowerBound, UpperBound,
                                ASTCtxt)) {
     C.addTransition(State);
   }
@@ -350,9 +395,9 @@ static const Expr *stripCastsAndSugar(co
   return E;
 }
 
-// This callback is used to infer the types for Class variables. This info is
-// used later to validate messages that sent to classes. Class variables are
-// initialized with by invoking the 'class' method on a class.
+/// This callback is used to infer the types for Class variables. This info is
+/// used later to validate messages that sent to classes. Class variables are
+/// initialized with by invoking the 'class' method on a class.
 void ObjCGenericsChecker::checkPostObjCMessage(const ObjCMethodCall &M,
                                                CheckerContext &C) const {
   const ObjCMessageExpr *MessageExpr = M.getOriginExpr();
@@ -387,8 +432,7 @@ void ObjCGenericsChecker::checkPostObjCM
 
 static bool isObjCTypeParamDependent(QualType Type) {
   // It is illegal to typedef parameterized types inside an interface. Therfore
-  // an
-  // Objective-C type can only be dependent on a type parameter when the type
+  // an Objective-C type can only be dependent on a type parameter when the type
   // parameter structurally present in the type itself.
   class IsObjCTypeParamDependentTypeVisitor
       : public RecursiveASTVisitor<IsObjCTypeParamDependentTypeVisitor> {
@@ -401,22 +445,20 @@ static bool isObjCTypeParamDependent(Qua
       }
       return true;
     }
-    bool getResult() { return Result; }
 
-  private:
     bool Result;
   };
 
   IsObjCTypeParamDependentTypeVisitor Visitor;
   Visitor.TraverseType(Type);
-  return Visitor.getResult();
+  return Visitor.Result;
 }
 
-// A method might not be available in the interface indicated by the static
-// type. However it might be available in the tracked type. In order to properly
-// substitute the type parameters we need the declaration context of the method.
-// The more specialized the enclosing class of the method is, the more likely
-// that the parameter substitution will be successful.
+/// A method might not be available in the interface indicated by the static
+/// type. However it might be available in the tracked type. In order to
+/// properly substitute the type parameters we need the declaration context of
+/// the method. The more specialized the enclosing class of the method is, the
+/// more likely that the parameter substitution will be successful.
 static const ObjCMethodDecl *
 findMethodDecl(const ObjCMessageExpr *MessageExpr,
                const ObjCObjectPointerType *TrackedType, ASTContext &ASTCtxt) {
@@ -449,8 +491,57 @@ findMethodDecl(const ObjCMessageExpr *Me
   return Method ? Method : MessageExpr->getMethodDecl();
 }
 
-// When the receiver has a tracked type, use that type to validate the
-// argumments of the message expression and the return value.
+/// Validate that the return type of a message expression is used correctly.
+void ObjCGenericsChecker::checkReturnType(
+    const ObjCMessageExpr *MessageExpr,
+    const ObjCObjectPointerType *TrackedType, SymbolRef Sym,
+    const ObjCMethodDecl *Method, ArrayRef<QualType> TypeArgs,
+    bool SubscriptOrProperty, CheckerContext &C) const {
+  QualType StaticResultType = Method->getReturnType();
+  ASTContext &ASTCtxt = C.getASTContext();
+  // Check whether the result type was a type parameter.
+  bool IsDeclaredAsInstanceType =
+      StaticResultType == ASTCtxt.getObjCInstanceType();
+  if (!isObjCTypeParamDependent(StaticResultType) && !IsDeclaredAsInstanceType)
+    return;
+
+  QualType ResultType = Method->getReturnType().substObjCTypeArgs(
+      ASTCtxt, TypeArgs, ObjCSubstitutionContext::Result);
+  if (IsDeclaredAsInstanceType)
+    ResultType = QualType(TrackedType, 0);
+
+  const Stmt *Parent =
+      C.getCurrentAnalysisDeclContext()->getParentMap().getParent(MessageExpr);
+  if (SubscriptOrProperty) {
+    // Properties and subscripts are not direct parents.
+    Parent =
+        C.getCurrentAnalysisDeclContext()->getParentMap().getParent(Parent);
+  }
+
+  const auto *ImplicitCast = dyn_cast_or_null<ImplicitCastExpr>(Parent);
+  if (!ImplicitCast || ImplicitCast->getCastKind() != CK_BitCast)
+    return;
+
+  const auto *ExprTypeAboveCast =
+      ImplicitCast->getType()->getAs<ObjCObjectPointerType>();
+  const auto *ResultPtrType = ResultType->getAs<ObjCObjectPointerType>();
+
+  if (!ExprTypeAboveCast || !ResultPtrType)
+    return;
+
+  // Only warn on unrelated types to avoid too many false positives on
+  // downcasts.
+  if (!ASTCtxt.canAssignObjCInterfaces(ExprTypeAboveCast, ResultPtrType) &&
+      !ASTCtxt.canAssignObjCInterfaces(ResultPtrType, ExprTypeAboveCast)) {
+    static CheckerProgramPointTag Tag(this, "ReturnTypeMismatch");
+    ExplodedNode *N = C.addTransition(C.getState(), &Tag);
+    reportGenericsBug(ResultPtrType, ExprTypeAboveCast, N, Sym, C);
+    return;
+  }
+}
+
+/// When the receiver has a tracked type, use that type to validate the
+/// argumments of the message expression and the return value.
 void ObjCGenericsChecker::checkPreObjCMessage(const ObjCMethodCall &M,
                                               CheckerContext &C) const {
   ProgramStateRef State = C.getState();
@@ -516,51 +607,14 @@ void ObjCGenericsChecker::checkPreObjCMe
     if (!ASTCtxt.canAssignObjCInterfaces(ParamObjectPtrType,
                                          ArgObjectPtrType)) {
       static CheckerProgramPointTag Tag(this, "ArgTypeMismatch");
-      ExplodedNode *N = C.addTransition(State, C.getPredecessor(), &Tag);
-      reportBug(ArgObjectPtrType, ParamObjectPtrType, N, Sym, C, Arg);
+      ExplodedNode *N = C.addTransition(State, &Tag);
+      reportGenericsBug(ArgObjectPtrType, ParamObjectPtrType, N, Sym, C, Arg);
       return;
     }
   }
-  QualType StaticResultType = Method->getReturnType();
-  // Check whether the result type was a type parameter.
-  bool IsDeclaredAsInstanceType =
-      StaticResultType == ASTCtxt.getObjCInstanceType();
-  if (!isObjCTypeParamDependent(StaticResultType) && !IsDeclaredAsInstanceType)
-    return;
-
-  QualType ResultType = Method->getReturnType().substObjCTypeArgs(
-      ASTCtxt, *TypeArgs, ObjCSubstitutionContext::Result);
-  if (IsDeclaredAsInstanceType)
-    ResultType = QualType(*TrackedType, 0);
-
-  const Stmt *Parent =
-      C.getCurrentAnalysisDeclContext()->getParentMap().getParent(MessageExpr);
-  if (M.getMessageKind() != OCM_Message) {
-    // Properties and subscripts are not direct parents.
-    Parent =
-        C.getCurrentAnalysisDeclContext()->getParentMap().getParent(Parent);
-  }
-
-  const auto *ImplicitCast = dyn_cast_or_null<ImplicitCastExpr>(Parent);
-  if (!ImplicitCast || ImplicitCast->getCastKind() != CK_BitCast)
-    return;
-
-  const auto *ExprTypeAboveCast =
-      ImplicitCast->getType()->getAs<ObjCObjectPointerType>();
-  const auto *ResultPtrType = ResultType->getAs<ObjCObjectPointerType>();
 
-  if (!ExprTypeAboveCast || !ResultPtrType)
-    return;
-
-  // Only warn on unrelated types to avoid too many false positives on
-  // downcasts.
-  if (!ASTCtxt.canAssignObjCInterfaces(ExprTypeAboveCast, ResultPtrType) &&
-      !ASTCtxt.canAssignObjCInterfaces(ResultPtrType, ExprTypeAboveCast)) {
-    static CheckerProgramPointTag Tag(this, "ReturnTypeMismatch");
-    ExplodedNode *N = C.addTransition(State, C.getPredecessor(), &Tag);
-    reportBug(ResultPtrType, ExprTypeAboveCast, N, Sym, C);
-    return;
-  }
+  checkReturnType(MessageExpr, *TrackedType, Sym, Method, *TypeArgs,
+                  M.getMessageKind() != OCM_Message, C);
 }
 
 /// Register checker.

Modified: cfe/trunk/test/Analysis/generics.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/generics.m?rev=247071&r1=247070&r2=247071&view=diff
==============================================================================
--- cfe/trunk/test/Analysis/generics.m (original)
+++ cfe/trunk/test/Analysis/generics.m Tue Sep  8 16:04:14 2015
@@ -87,38 +87,38 @@ void withMutArrMutableString(MutableArra
 void incompatibleTypesErased(NSArray *a, NSArray<NSString *> *b,
                              NSArray<NSNumber *> *c) {
   a = b;
-  c = a; // expected-warning  {{Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'}}
-  [a contains: [[NSNumber alloc] init]]; // expected-warning {{Incompatible}}
+  c = a; // expected-warning  {{Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'}}
+  [a contains: [[NSNumber alloc] init]]; // expected-warning {{Conversion}}
   [a contains: [[NSString alloc] init]];
-  doStuff(a); // expected-warning {{Incompatible}}
+  doStuff(a); // expected-warning {{Conversion}}
 }
 
 void crossProceduralErasedTypes() {
-  NSArray<NSString *> *a = getTypedStuff(); // expected-warning {{Incompatible}}
+  NSArray<NSString *> *a = getTypedStuff(); // expected-warning {{Conversion}}
 }
 
 void incompatibleTypesErasedReverseConversion(NSArray *a,
                                               NSArray<NSString *> *b) {
   b = a;
-  [a contains: [[NSNumber alloc] init]]; // expected-warning {{Incompatible}}
+  [a contains: [[NSNumber alloc] init]]; // expected-warning {{Conversion}}
   [a contains: [[NSString alloc] init]];
-  doStuff(a); // expected-warning {{Incompatible}}
+  doStuff(a); // expected-warning {{Conversion}}
 }
 
 void idErasedIncompatibleTypesReverseConversion(id a, NSArray<NSString *> *b) {
   b = a;
-  [a contains: [[NSNumber alloc] init]]; // expected-warning {{Incompatible}}
+  [a contains: [[NSNumber alloc] init]]; // expected-warning {{Conversion}}
   [a contains: [[NSString alloc] init]];
-  doStuff(a); // expected-warning {{Incompatible}}
+  doStuff(a); // expected-warning {{Conversion}}
 }
 
 void idErasedIncompatibleTypes(id a, NSArray<NSString *> *b,
                                NSArray<NSNumber *> *c) {
   a = b;
-  c = a; // expected-warning {{Incompatible}}
-  [a contains: [[NSNumber alloc] init]]; // expected-warning {{Incompatible}}
+  c = a; // expected-warning {{Conversion}}
+  [a contains: [[NSNumber alloc] init]]; // expected-warning {{Conversion}}
   [a contains: [[NSString alloc] init]];
-  doStuff(a); // expected-warning {{Incompatible}}
+  doStuff(a); // expected-warning {{Conversion}}
 }
 
 void pathSensitiveInference(MutableArray *m, MutableArray<NSString *> *a,
@@ -130,19 +130,19 @@ void pathSensitiveInference(MutableArray
     m = b;
     [m contains: [[NSMutableString alloc] init]];
   }
-  [m addObject: [[NSString alloc] init]]; // expected-warning {{Incompatible}}
+  [m addObject: [[NSString alloc] init]]; // expected-warning {{Conversion}}
   [m addObject: [[NSMutableString alloc] init]];
 }
 
 void verifyAPIusage(id a, MutableArray<NSString *> *b) {
   b = a;
-  doStuff(a); // expected-warning {{Incompatible}}
+  doStuff(a); // expected-warning {{Conversion}}
 }
 
 void trustExplicitCasts(MutableArray *a,
                         MutableArray<NSMutableString *> *b) {
   b = (MutableArray<NSMutableString *> *)a;
-  [a addObject: [[NSString alloc] init]]; // expected-warning {{Incompatible}}
+  [a addObject: [[NSString alloc] init]]; // expected-warning {{Conversion}}
 }
 
 void subtypeOfGeneric(id d, MyMutableStringArray *a,
@@ -150,7 +150,7 @@ void subtypeOfGeneric(id d, MyMutableStr
                        MutableArray<NSNumber *> *c) {
   d = a;
   b = d;
-  c = d; // expected-warning {{Incompatible}}
+  c = d; // expected-warning {{Conversion}}
 }
 
 void genericSubtypeOfGeneric(id d, ExceptionalArray<NSString *> *a,
@@ -158,9 +158,9 @@ void genericSubtypeOfGeneric(id d, Excep
                              MutableArray<NSNumber *> *c) {
   d = a;
   [d contains: [[NSString alloc] init]];
-  [d contains: [[NSNumber alloc] init]]; // expected-warning {{Incompatible}}
+  [d contains: [[NSNumber alloc] init]]; // expected-warning {{Conversion}}
   b = d;
-  c = d; // expected-warning {{Incompatible}}
+  c = d; // expected-warning {{Conversion}}
 }
 
 void genericSubtypeOfGenericReverse(id d, ExceptionalArray<NSString *> *a,
@@ -168,41 +168,59 @@ void genericSubtypeOfGenericReverse(id d
                                     MutableArray<NSNumber *> *c) {
   a = d;
   [d contains: [[NSString alloc] init]];
-  [d contains: [[NSNumber alloc] init]]; // expected-warning {{Incompatible}}
+  [d contains: [[NSNumber alloc] init]]; // expected-warning {{Conversion}}
   b = d;
-  c = d; // expected-warning {{Incompatible}}
+  c = d; // expected-warning {{Conversion}}
 }
 
 void inferenceFromAPI(id a) {
   // Here the type parameter is invariant. There should be a warning every time
   // when the type parameter changes during the conversions.
   withMutArrString(a);
-  withMutArrMutableString(a); // expected-warning {{Incompatible}}
+  withMutArrMutableString(a); // expected-warning {{Conversion}}
 }
 
 void inferenceFromAPI2(id a) {
   withMutArrMutableString(a);
-  withMutArrString(a); // expected-warning {{Incompatible}}
+  withMutArrString(a); // expected-warning {{Conversion}}
 }
 
 void inferenceFromAPIWithLegacyTypes(LegacyMutableArray *a) {
   withMutArrMutableString(a);
-  withMutArrString(a); // expected-warning {{Incompatible}}
+  withMutArrString(a); // expected-warning {{Conversion}}
 }
 
 void inferenceFromAPIWithLegacyTypes2(LegacySpecialMutableArray *a) {
   withMutArrString(a);
-  withMutArrMutableString(a); // expected-warning {{Incompatible}}
+  withMutArrMutableString(a); // expected-warning {{Conversion}}
+}
+
+void inferenceFromAPIWithLegacyTypes3(__kindof NSArray<NSString *> *a) {
+  LegacyMutableArray *b = a;
+  withMutArrString(b);
+  withMutArrMutableString(b); // expected-warning {{Conversion}}
 }
 
 void inferenceFromAPIWithBuggyTypes(BuggyMutableArray<NSMutableString *> *a) {
   withMutArrString(a);
-  withMutArrMutableString(a); // expected-warning {{Incompatible}}
+  withMutArrMutableString(a); // expected-warning {{Conversion}}
 }
 
 void InferenceFromAPIWithBuggyTypes2(BuggySpecialMutableArray<NSMutableString *> *a) {
   withMutArrMutableString(a);
-  withMutArrString(a); // expected-warning {{Incompatible}}
+  withMutArrString(a); // expected-warning {{Conversion}}
+}
+
+void InferenceFromAPIWithBuggyTypes3(MutableArray<NSMutableString *> *a) {
+  id b = a;
+  withMutArrMutableString((BuggyMutableArray<NSMutableString *> *)b);
+  withMutArrString(b); // expected-warning {{Conversion}}
+}
+
+void InferenceFromAPIWithBuggyTypes4(__kindof NSArray<NSString *> *a) {
+  BuggyMutableArray<NSMutableString *> *b = a;
+  withMutArrString(b);
+  withMutArrMutableString(b); // expected-warning {{Conversion}}
 }
 
 NSArray<NSString *> *getStrings();
@@ -215,13 +233,13 @@ void enforceDynamicRulesInsteadOfStatic(
 
 void workWithProperties(NSArray<NSNumber *> *a) {
   NSArray *b = a;
-  NSString *str = [b getObjAtIndex: 0]; // expected-warning {{Incompatible}}
+  NSString *str = [b getObjAtIndex: 0]; // expected-warning {{Conversion}}
   NSNumber *num = [b getObjAtIndex: 0];
-  str = [b firstObject]; // expected-warning {{Incompatible}}
+  str = [b firstObject]; // expected-warning {{Conversion}}
   num = [b firstObject];
-  str = b.firstObject; // expected-warning {{Incompatible}}
+  str = b.firstObject; // expected-warning {{Conversion}}
   num = b.firstObject;
-  str = b[0]; // expected-warning {{Incompatible}}
+  str = b[0]; // expected-warning {{Conversion}}
   num = b[0];
 }
 
@@ -230,7 +248,7 @@ void findMethodDeclInTrackedType(id m, N
   a = b;
   if (getUnknown() == 5) {
     m = a;  
-    [m addObject: [[NSString alloc] init]]; // expected-warning {{Incompatible}}
+    [m addObject: [[NSString alloc] init]]; // expected-warning {{Conversion}}
   } else {
     m = b;
     [m addObject: [[NSMutableString alloc] init]];
@@ -241,7 +259,7 @@ void findMethodDeclInTrackedType2(__kind
                                   MutableArray<NSMutableString *> *b) {
   a = b;
   if (getUnknown() == 5) {
-    [a addObject: [[NSString alloc] init]]; // expected-warning {{Incompatible}}
+    [a addObject: [[NSString alloc] init]]; // expected-warning {{Conversion}}
   } else {
     [a addObject: [[NSMutableString alloc] init]];
   }
@@ -256,7 +274,7 @@ void testUnannotatedLiterals() {
 void testAnnotatedLiterals() {
   NSArray<NSString *> *arr = @[@"A", @"B"];
   NSArray *arr2 = arr;
-  [arr2 contains: [[NSNumber alloc] init]]; // expected-warning {{Incompatible}}
+  [arr2 contains: [[NSNumber alloc] init]]; // expected-warning {{Conversion}}
 }
 
 void nonExistentMethodDoesNotCrash(id a, MutableArray<NSMutableString *> *b) {
@@ -266,13 +284,13 @@ void nonExistentMethodDoesNotCrash(id a,
 
 void trackedClassVariables() {
   Class c = [NSArray<NSString *> class];
-  NSArray<NSNumber *> *a = [c getEmpty]; // expected-warning {{Incompatible}}
-  a = [c getEmpty2]; // expected-warning {{Incompatible}}
+  NSArray<NSNumber *> *a = [c getEmpty]; // expected-warning {{Conversion}}
+  a = [c getEmpty2]; // expected-warning {{Conversion}}
 }
 
 void nestedCollections(NSArray<NSArray<NSNumber *> *> *mat, NSArray<NSString *> *row) {
   id temp = row;
-  [mat contains: temp]; // expected-warning {{Incompatible}}
+  [mat contains: temp]; // expected-warning {{Conversion}}
 }
 
 void testMistmatchedTypeCast(MutableArray<NSMutableString *> *a) {
@@ -283,7 +301,6 @@ void testMistmatchedTypeCast(MutableArra
   [c addObject: [[NSString alloc] init]];
 }
 
-// CHECK:  <key>diagnostics</key>
 // CHECK:  <array>
 // CHECK:   <dict>
 // CHECK:    <key>path</key>
@@ -410,12 +427,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -520,12 +537,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:      <string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:      <string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -664,12 +681,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -914,12 +931,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSArray<NSString *> *' from 'NSArray<NSNumber *> *'</string>
+// CHECK:      <string>Conversion from value of type 'NSArray<NSNumber *> *' to incompatible type 'NSArray<NSString *> *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSArray<NSString *> *' from 'NSArray<NSNumber *> *'</string>
+// CHECK:      <string>Conversion from value of type 'NSArray<NSNumber *> *' to incompatible type 'NSArray<NSString *> *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSArray<NSString *> *' from 'NSArray<NSNumber *> *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSArray<NSNumber *> *' to incompatible type 'NSArray<NSString *> *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -1024,12 +1041,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:      <string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:      <string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -1168,12 +1185,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -1278,12 +1295,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:      <string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:      <string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -1422,12 +1439,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -1566,12 +1583,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -1676,12 +1693,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:      <string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:      <string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -1820,12 +1837,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -1998,12 +2015,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSMutableString *' from 'NSString *'</string>
+// CHECK:      <string>Conversion from value of type 'NSString *' to incompatible type 'NSMutableString *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSMutableString *' from 'NSString *'</string>
+// CHECK:      <string>Conversion from value of type 'NSString *' to incompatible type 'NSMutableString *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSMutableString *' from 'NSString *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSString *' to incompatible type 'NSMutableString *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -2142,12 +2159,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'MutableArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'MutableArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'MutableArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'MutableArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'MutableArray<NSString *> *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'MutableArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -2252,12 +2269,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSMutableString *' from 'NSString *'</string>
+// CHECK:      <string>Conversion from value of type 'NSString *' to incompatible type 'NSMutableString *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSMutableString *' from 'NSString *'</string>
+// CHECK:      <string>Conversion from value of type 'NSString *' to incompatible type 'NSMutableString *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSMutableString *' from 'NSString *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSString *' to incompatible type 'NSMutableString *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -2430,12 +2447,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'MutableArray<NSNumber *> *' from 'MutableArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'MutableArray<NSString *> *' to incompatible type 'MutableArray<NSNumber *> *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'MutableArray<NSNumber *> *' from 'MutableArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'MutableArray<NSString *> *' to incompatible type 'MutableArray<NSNumber *> *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'MutableArray<NSNumber *> *' from 'MutableArray<NSString *> *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'MutableArray<NSString *> *' to incompatible type 'MutableArray<NSNumber *> *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -2540,12 +2557,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:      <string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:      <string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -2684,12 +2701,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'MutableArray<NSNumber *> *' from 'ExceptionalArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'ExceptionalArray<NSString *> *' to incompatible type 'MutableArray<NSNumber *> *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'MutableArray<NSNumber *> *' from 'ExceptionalArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'ExceptionalArray<NSString *> *' to incompatible type 'MutableArray<NSNumber *> *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'MutableArray<NSNumber *> *' from 'ExceptionalArray<NSString *> *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'ExceptionalArray<NSString *> *' to incompatible type 'MutableArray<NSNumber *> *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -2794,12 +2811,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:      <string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:      <string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -2938,12 +2955,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'MutableArray<NSNumber *> *' from 'ExceptionalArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'ExceptionalArray<NSString *> *' to incompatible type 'MutableArray<NSNumber *> *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'MutableArray<NSNumber *> *' from 'ExceptionalArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'ExceptionalArray<NSString *> *' to incompatible type 'MutableArray<NSNumber *> *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'MutableArray<NSNumber *> *' from 'ExceptionalArray<NSString *> *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'ExceptionalArray<NSString *> *' to incompatible type 'MutableArray<NSNumber *> *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -3082,12 +3099,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'MutableArray<NSMutableString *> *' from 'MutableArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'MutableArray<NSString *> *' to incompatible type 'MutableArray<NSMutableString *> *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'MutableArray<NSMutableString *> *' from 'MutableArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'MutableArray<NSString *> *' to incompatible type 'MutableArray<NSMutableString *> *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'MutableArray<NSMutableString *> *' from 'MutableArray<NSString *> *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'MutableArray<NSString *> *' to incompatible type 'MutableArray<NSMutableString *> *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -3226,12 +3243,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'MutableArray<NSString *> *' from 'MutableArray<NSMutableString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'MutableArray<NSMutableString *> *' to incompatible type 'MutableArray<NSString *> *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'MutableArray<NSString *> *' from 'MutableArray<NSMutableString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'MutableArray<NSMutableString *> *' to incompatible type 'MutableArray<NSString *> *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'MutableArray<NSString *> *' from 'MutableArray<NSMutableString *> *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'MutableArray<NSMutableString *> *' to incompatible type 'MutableArray<NSString *> *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -3370,12 +3387,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'MutableArray<NSString *> *' from 'MutableArray<NSMutableString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'MutableArray<NSMutableString *> *' to incompatible type 'MutableArray<NSString *> *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'MutableArray<NSString *> *' from 'MutableArray<NSMutableString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'MutableArray<NSMutableString *> *' to incompatible type 'MutableArray<NSString *> *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'MutableArray<NSString *> *' from 'MutableArray<NSMutableString *> *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'MutableArray<NSMutableString *> *' to incompatible type 'MutableArray<NSString *> *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -3514,12 +3531,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'MutableArray<NSMutableString *> *' from 'MutableArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'MutableArray<NSString *> *' to incompatible type 'MutableArray<NSMutableString *> *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'MutableArray<NSMutableString *> *' from 'MutableArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'MutableArray<NSString *> *' to incompatible type 'MutableArray<NSMutableString *> *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'MutableArray<NSMutableString *> *' from 'MutableArray<NSString *> *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'MutableArray<NSString *> *' to incompatible type 'MutableArray<NSMutableString *> *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -3541,7 +3558,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <key>location</key>
 // CHECK:      <dict>
 // CHECK:       <key>line</key><integer>199</integer>
-// CHECK:       <key>col</key><integer>20</integer>
+// CHECK:       <key>col</key><integer>27</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
 // CHECK:      <key>ranges</key>
@@ -3549,21 +3566,21 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:        <array>
 // CHECK:         <dict>
 // CHECK:          <key>line</key><integer>199</integer>
-// CHECK:          <key>col</key><integer>20</integer>
+// CHECK:          <key>col</key><integer>27</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
 // CHECK:          <key>line</key><integer>199</integer>
-// CHECK:          <key>col</key><integer>20</integer>
+// CHECK:          <key>col</key><integer>27</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:        </array>
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Type 'MutableArray<NSString *> *' is inferred from implicit cast (from 'BuggyMutableArray<NSMutableString *> *' to 'MutableArray<NSString *> *')</string>
+// CHECK:      <string>Type 'NSArray<NSString *> *' is inferred from implicit cast (from '__kindof NSArray<NSString *> *' to 'LegacyMutableArray *')</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Type 'MutableArray<NSString *> *' is inferred from implicit cast (from 'BuggyMutableArray<NSMutableString *> *' to 'MutableArray<NSString *> *')</string>
+// CHECK:      <string>Type 'NSArray<NSString *> *' is inferred from implicit cast (from '__kindof NSArray<NSString *> *' to 'LegacyMutableArray *')</string>
 // CHECK:     </dict>
 // CHECK:     <dict>
 // CHECK:      <key>kind</key><string>control</string>
@@ -3579,7 +3596,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:           </dict>
 // CHECK:           <dict>
 // CHECK:            <key>line</key><integer>199</integer>
-// CHECK:            <key>col</key><integer>18</integer>
+// CHECK:            <key>col</key><integer>20</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:          </array>
@@ -3592,7 +3609,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:           </dict>
 // CHECK:           <dict>
 // CHECK:            <key>line</key><integer>200</integer>
-// CHECK:            <key>col</key><integer>25</integer>
+// CHECK:            <key>col</key><integer>18</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:          </array>
@@ -3600,6 +3617,35 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:       </array>
 // CHECK:     </dict>
 // CHECK:     <dict>
+// CHECK:      <key>kind</key><string>event</string>
+// CHECK:      <key>location</key>
+// CHECK:      <dict>
+// CHECK:       <key>line</key><integer>200</integer>
+// CHECK:       <key>col</key><integer>20</integer>
+// CHECK:       <key>file</key><integer>0</integer>
+// CHECK:      </dict>
+// CHECK:      <key>ranges</key>
+// CHECK:      <array>
+// CHECK:        <array>
+// CHECK:         <dict>
+// CHECK:          <key>line</key><integer>200</integer>
+// CHECK:          <key>col</key><integer>20</integer>
+// CHECK:          <key>file</key><integer>0</integer>
+// CHECK:         </dict>
+// CHECK:         <dict>
+// CHECK:          <key>line</key><integer>200</integer>
+// CHECK:          <key>col</key><integer>20</integer>
+// CHECK:          <key>file</key><integer>0</integer>
+// CHECK:         </dict>
+// CHECK:        </array>
+// CHECK:      </array>
+// CHECK:      <key>depth</key><integer>0</integer>
+// CHECK:      <key>extended_message</key>
+// CHECK:      <string>Type 'MutableArray<NSString *> *' is inferred from implicit cast (from 'LegacyMutableArray *' to 'MutableArray<NSString *> *')</string>
+// CHECK:      <key>message</key>
+// CHECK:      <string>Type 'MutableArray<NSString *> *' is inferred from implicit cast (from 'LegacyMutableArray *' to 'MutableArray<NSString *> *')</string>
+// CHECK:     </dict>
+// CHECK:     <dict>
 // CHECK:      <key>kind</key><string>control</string>
 // CHECK:      <key>edges</key>
 // CHECK:       <array>
@@ -3613,6 +3659,40 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:           </dict>
 // CHECK:           <dict>
 // CHECK:            <key>line</key><integer>200</integer>
+// CHECK:            <key>col</key><integer>18</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:          </array>
+// CHECK:         <key>end</key>
+// CHECK:          <array>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>201</integer>
+// CHECK:            <key>col</key><integer>3</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>201</integer>
+// CHECK:            <key>col</key><integer>25</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:          </array>
+// CHECK:        </dict>
+// CHECK:       </array>
+// CHECK:     </dict>
+// CHECK:     <dict>
+// CHECK:      <key>kind</key><string>control</string>
+// CHECK:      <key>edges</key>
+// CHECK:       <array>
+// CHECK:        <dict>
+// CHECK:         <key>start</key>
+// CHECK:          <array>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>201</integer>
+// CHECK:            <key>col</key><integer>3</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>201</integer>
 // CHECK:            <key>col</key><integer>25</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -3620,12 +3700,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>end</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>200</integer>
+// CHECK:            <key>line</key><integer>201</integer>
 // CHECK:            <key>col</key><integer>27</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>200</integer>
+// CHECK:            <key>line</key><integer>201</integer>
 // CHECK:            <key>col</key><integer>27</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -3637,7 +3717,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <key>kind</key><string>event</string>
 // CHECK:      <key>location</key>
 // CHECK:      <dict>
-// CHECK:       <key>line</key><integer>200</integer>
+// CHECK:       <key>line</key><integer>201</integer>
 // CHECK:       <key>col</key><integer>27</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
@@ -3645,12 +3725,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <array>
 // CHECK:        <array>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>200</integer>
+// CHECK:          <key>line</key><integer>201</integer>
 // CHECK:          <key>col</key><integer>27</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>200</integer>
+// CHECK:          <key>line</key><integer>201</integer>
 // CHECK:          <key>col</key><integer>27</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
@@ -3658,21 +3738,21 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'MutableArray<NSMutableString *> *' from 'MutableArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'MutableArray<NSString *> *' to incompatible type 'MutableArray<NSMutableString *> *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'MutableArray<NSMutableString *> *' from 'MutableArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'MutableArray<NSString *> *' to incompatible type 'MutableArray<NSMutableString *> *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'MutableArray<NSMutableString *> *' from 'MutableArray<NSString *> *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'MutableArray<NSString *> *' to incompatible type 'MutableArray<NSMutableString *> *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
 // CHECK:   <key>issue_context_kind</key><string>function</string>
-// CHECK:   <key>issue_context</key><string>inferenceFromAPIWithBuggyTypes</string>
-// CHECK:   <key>issue_hash</key><string>2</string>
+// CHECK:   <key>issue_context</key><string>inferenceFromAPIWithLegacyTypes3</string>
+// CHECK:   <key>issue_hash</key><string>3</string>
 // CHECK:   <key>location</key>
 // CHECK:   <dict>
-// CHECK:    <key>line</key><integer>200</integer>
+// CHECK:    <key>line</key><integer>201</integer>
 // CHECK:    <key>col</key><integer>27</integer>
 // CHECK:    <key>file</key><integer>0</integer>
 // CHECK:   </dict>
@@ -3684,30 +3764,30 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <key>kind</key><string>event</string>
 // CHECK:      <key>location</key>
 // CHECK:      <dict>
-// CHECK:       <key>line</key><integer>204</integer>
-// CHECK:       <key>col</key><integer>27</integer>
+// CHECK:       <key>line</key><integer>205</integer>
+// CHECK:       <key>col</key><integer>20</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
 // CHECK:      <key>ranges</key>
 // CHECK:      <array>
 // CHECK:        <array>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>204</integer>
-// CHECK:          <key>col</key><integer>27</integer>
+// CHECK:          <key>line</key><integer>205</integer>
+// CHECK:          <key>col</key><integer>20</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>204</integer>
-// CHECK:          <key>col</key><integer>27</integer>
+// CHECK:          <key>line</key><integer>205</integer>
+// CHECK:          <key>col</key><integer>20</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:        </array>
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Type 'MutableArray<NSMutableString *> *' is inferred from implicit cast (from 'BuggySpecialMutableArray<NSMutableString *> *' to 'MutableArray<NSMutableString *> *')</string>
+// CHECK:      <string>Type 'MutableArray<NSString *> *' is inferred from implicit cast (from 'BuggyMutableArray<NSMutableString *> *' to 'MutableArray<NSString *> *')</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Type 'MutableArray<NSMutableString *> *' is inferred from implicit cast (from 'BuggySpecialMutableArray<NSMutableString *> *' to 'MutableArray<NSMutableString *> *')</string>
+// CHECK:      <string>Type 'MutableArray<NSString *> *' is inferred from implicit cast (from 'BuggyMutableArray<NSMutableString *> *' to 'MutableArray<NSString *> *')</string>
 // CHECK:     </dict>
 // CHECK:     <dict>
 // CHECK:      <key>kind</key><string>control</string>
@@ -3717,26 +3797,26 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>start</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>204</integer>
+// CHECK:            <key>line</key><integer>205</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>204</integer>
-// CHECK:            <key>col</key><integer>25</integer>
+// CHECK:            <key>line</key><integer>205</integer>
+// CHECK:            <key>col</key><integer>18</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:          </array>
 // CHECK:         <key>end</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>205</integer>
+// CHECK:            <key>line</key><integer>206</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>205</integer>
-// CHECK:            <key>col</key><integer>18</integer>
+// CHECK:            <key>line</key><integer>206</integer>
+// CHECK:            <key>col</key><integer>25</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:          </array>
@@ -3751,26 +3831,26 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>start</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>205</integer>
+// CHECK:            <key>line</key><integer>206</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>205</integer>
-// CHECK:            <key>col</key><integer>18</integer>
+// CHECK:            <key>line</key><integer>206</integer>
+// CHECK:            <key>col</key><integer>25</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:          </array>
 // CHECK:         <key>end</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>205</integer>
-// CHECK:            <key>col</key><integer>20</integer>
+// CHECK:            <key>line</key><integer>206</integer>
+// CHECK:            <key>col</key><integer>27</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>205</integer>
-// CHECK:            <key>col</key><integer>20</integer>
+// CHECK:            <key>line</key><integer>206</integer>
+// CHECK:            <key>col</key><integer>27</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:          </array>
@@ -3781,43 +3861,43 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <key>kind</key><string>event</string>
 // CHECK:      <key>location</key>
 // CHECK:      <dict>
-// CHECK:       <key>line</key><integer>205</integer>
-// CHECK:       <key>col</key><integer>20</integer>
+// CHECK:       <key>line</key><integer>206</integer>
+// CHECK:       <key>col</key><integer>27</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
 // CHECK:      <key>ranges</key>
 // CHECK:      <array>
 // CHECK:        <array>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>205</integer>
-// CHECK:          <key>col</key><integer>20</integer>
+// CHECK:          <key>line</key><integer>206</integer>
+// CHECK:          <key>col</key><integer>27</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>205</integer>
-// CHECK:          <key>col</key><integer>20</integer>
+// CHECK:          <key>line</key><integer>206</integer>
+// CHECK:          <key>col</key><integer>27</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:        </array>
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'MutableArray<NSString *> *' from 'MutableArray<NSMutableString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'MutableArray<NSString *> *' to incompatible type 'MutableArray<NSMutableString *> *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'MutableArray<NSString *> *' from 'MutableArray<NSMutableString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'MutableArray<NSString *> *' to incompatible type 'MutableArray<NSMutableString *> *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'MutableArray<NSString *> *' from 'MutableArray<NSMutableString *> *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'MutableArray<NSString *> *' to incompatible type 'MutableArray<NSMutableString *> *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
 // CHECK:   <key>issue_context_kind</key><string>function</string>
-// CHECK:   <key>issue_context</key><string>InferenceFromAPIWithBuggyTypes2</string>
+// CHECK:   <key>issue_context</key><string>inferenceFromAPIWithBuggyTypes</string>
 // CHECK:   <key>issue_hash</key><string>2</string>
 // CHECK:   <key>location</key>
 // CHECK:   <dict>
-// CHECK:    <key>line</key><integer>205</integer>
-// CHECK:    <key>col</key><integer>20</integer>
+// CHECK:    <key>line</key><integer>206</integer>
+// CHECK:    <key>col</key><integer>27</integer>
 // CHECK:    <key>file</key><integer>0</integer>
 // CHECK:   </dict>
 // CHECK:   </dict>
@@ -3828,30 +3908,30 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <key>kind</key><string>event</string>
 // CHECK:      <key>location</key>
 // CHECK:      <dict>
-// CHECK:       <key>line</key><integer>217</integer>
-// CHECK:       <key>col</key><integer>16</integer>
+// CHECK:       <key>line</key><integer>210</integer>
+// CHECK:       <key>col</key><integer>27</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
 // CHECK:      <key>ranges</key>
 // CHECK:      <array>
 // CHECK:        <array>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>217</integer>
-// CHECK:          <key>col</key><integer>16</integer>
+// CHECK:          <key>line</key><integer>210</integer>
+// CHECK:          <key>col</key><integer>27</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>217</integer>
-// CHECK:          <key>col</key><integer>16</integer>
+// CHECK:          <key>line</key><integer>210</integer>
+// CHECK:          <key>col</key><integer>27</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:        </array>
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Type 'NSArray<NSNumber *> *' is inferred from implicit cast (from 'NSArray<NSNumber *> *' to 'NSArray *')</string>
+// CHECK:      <string>Type 'MutableArray<NSMutableString *> *' is inferred from implicit cast (from 'BuggySpecialMutableArray<NSMutableString *> *' to 'MutableArray<NSMutableString *> *')</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Type 'NSArray<NSNumber *> *' is inferred from implicit cast (from 'NSArray<NSNumber *> *' to 'NSArray *')</string>
+// CHECK:      <string>Type 'MutableArray<NSMutableString *> *' is inferred from implicit cast (from 'BuggySpecialMutableArray<NSMutableString *> *' to 'MutableArray<NSMutableString *> *')</string>
 // CHECK:     </dict>
 // CHECK:     <dict>
 // CHECK:      <key>kind</key><string>control</string>
@@ -3861,26 +3941,26 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>start</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>217</integer>
+// CHECK:            <key>line</key><integer>210</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>217</integer>
-// CHECK:            <key>col</key><integer>9</integer>
+// CHECK:            <key>line</key><integer>210</integer>
+// CHECK:            <key>col</key><integer>25</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:          </array>
 // CHECK:         <key>end</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>218</integer>
+// CHECK:            <key>line</key><integer>211</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>218</integer>
-// CHECK:            <key>col</key><integer>10</integer>
+// CHECK:            <key>line</key><integer>211</integer>
+// CHECK:            <key>col</key><integer>18</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:          </array>
@@ -3895,26 +3975,26 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>start</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>218</integer>
+// CHECK:            <key>line</key><integer>211</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>218</integer>
-// CHECK:            <key>col</key><integer>10</integer>
+// CHECK:            <key>line</key><integer>211</integer>
+// CHECK:            <key>col</key><integer>18</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:          </array>
 // CHECK:         <key>end</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>218</integer>
-// CHECK:            <key>col</key><integer>19</integer>
+// CHECK:            <key>line</key><integer>211</integer>
+// CHECK:            <key>col</key><integer>20</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>218</integer>
-// CHECK:            <key>col</key><integer>19</integer>
+// CHECK:            <key>line</key><integer>211</integer>
+// CHECK:            <key>col</key><integer>20</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:          </array>
@@ -3925,43 +4005,43 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <key>kind</key><string>event</string>
 // CHECK:      <key>location</key>
 // CHECK:      <dict>
-// CHECK:       <key>line</key><integer>218</integer>
-// CHECK:       <key>col</key><integer>19</integer>
+// CHECK:       <key>line</key><integer>211</integer>
+// CHECK:       <key>col</key><integer>20</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
 // CHECK:      <key>ranges</key>
 // CHECK:      <array>
 // CHECK:        <array>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>218</integer>
-// CHECK:          <key>col</key><integer>19</integer>
+// CHECK:          <key>line</key><integer>211</integer>
+// CHECK:          <key>col</key><integer>20</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>218</integer>
-// CHECK:          <key>col</key><integer>38</integer>
+// CHECK:          <key>line</key><integer>211</integer>
+// CHECK:          <key>col</key><integer>20</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:        </array>
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:      <string>Conversion from value of type 'MutableArray<NSMutableString *> *' to incompatible type 'MutableArray<NSString *> *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:      <string>Conversion from value of type 'MutableArray<NSMutableString *> *' to incompatible type 'MutableArray<NSString *> *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'MutableArray<NSMutableString *> *' to incompatible type 'MutableArray<NSString *> *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
 // CHECK:   <key>issue_context_kind</key><string>function</string>
-// CHECK:   <key>issue_context</key><string>workWithProperties</string>
+// CHECK:   <key>issue_context</key><string>InferenceFromAPIWithBuggyTypes2</string>
 // CHECK:   <key>issue_hash</key><string>2</string>
 // CHECK:   <key>location</key>
 // CHECK:   <dict>
-// CHECK:    <key>line</key><integer>218</integer>
-// CHECK:    <key>col</key><integer>19</integer>
+// CHECK:    <key>line</key><integer>211</integer>
+// CHECK:    <key>col</key><integer>20</integer>
 // CHECK:    <key>file</key><integer>0</integer>
 // CHECK:   </dict>
 // CHECK:   </dict>
@@ -3972,30 +4052,30 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <key>kind</key><string>event</string>
 // CHECK:      <key>location</key>
 // CHECK:      <dict>
-// CHECK:       <key>line</key><integer>217</integer>
-// CHECK:       <key>col</key><integer>16</integer>
+// CHECK:       <key>line</key><integer>215</integer>
+// CHECK:       <key>col</key><integer>10</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
 // CHECK:      <key>ranges</key>
 // CHECK:      <array>
 // CHECK:        <array>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>217</integer>
-// CHECK:          <key>col</key><integer>16</integer>
+// CHECK:          <key>line</key><integer>215</integer>
+// CHECK:          <key>col</key><integer>10</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>217</integer>
-// CHECK:          <key>col</key><integer>16</integer>
+// CHECK:          <key>line</key><integer>215</integer>
+// CHECK:          <key>col</key><integer>10</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:        </array>
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Type 'NSArray<NSNumber *> *' is inferred from implicit cast (from 'NSArray<NSNumber *> *' to 'NSArray *')</string>
+// CHECK:      <string>Type 'MutableArray<NSMutableString *> *' is inferred from implicit cast (from 'MutableArray<NSMutableString *> *' to 'id')</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Type 'NSArray<NSNumber *> *' is inferred from implicit cast (from 'NSArray<NSNumber *> *' to 'NSArray *')</string>
+// CHECK:      <string>Type 'MutableArray<NSMutableString *> *' is inferred from implicit cast (from 'MutableArray<NSMutableString *> *' to 'id')</string>
 // CHECK:     </dict>
 // CHECK:     <dict>
 // CHECK:      <key>kind</key><string>control</string>
@@ -4005,26 +4085,26 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>start</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>217</integer>
+// CHECK:            <key>line</key><integer>215</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>217</integer>
-// CHECK:            <key>col</key><integer>9</integer>
+// CHECK:            <key>line</key><integer>215</integer>
+// CHECK:            <key>col</key><integer>4</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:          </array>
 // CHECK:         <key>end</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>220</integer>
+// CHECK:            <key>line</key><integer>217</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>220</integer>
-// CHECK:            <key>col</key><integer>5</integer>
+// CHECK:            <key>line</key><integer>217</integer>
+// CHECK:            <key>col</key><integer>18</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:          </array>
@@ -4039,26 +4119,26 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>start</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>220</integer>
+// CHECK:            <key>line</key><integer>217</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>220</integer>
-// CHECK:            <key>col</key><integer>5</integer>
+// CHECK:            <key>line</key><integer>217</integer>
+// CHECK:            <key>col</key><integer>18</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:          </array>
 // CHECK:         <key>end</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>220</integer>
-// CHECK:            <key>col</key><integer>9</integer>
+// CHECK:            <key>line</key><integer>217</integer>
+// CHECK:            <key>col</key><integer>20</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>220</integer>
-// CHECK:            <key>col</key><integer>9</integer>
+// CHECK:            <key>line</key><integer>217</integer>
+// CHECK:            <key>col</key><integer>20</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:          </array>
@@ -4069,43 +4149,43 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <key>kind</key><string>event</string>
 // CHECK:      <key>location</key>
 // CHECK:      <dict>
-// CHECK:       <key>line</key><integer>220</integer>
-// CHECK:       <key>col</key><integer>9</integer>
+// CHECK:       <key>line</key><integer>217</integer>
+// CHECK:       <key>col</key><integer>20</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
 // CHECK:      <key>ranges</key>
 // CHECK:      <array>
 // CHECK:        <array>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>220</integer>
-// CHECK:          <key>col</key><integer>9</integer>
+// CHECK:          <key>line</key><integer>217</integer>
+// CHECK:          <key>col</key><integer>20</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>220</integer>
-// CHECK:          <key>col</key><integer>23</integer>
+// CHECK:          <key>line</key><integer>217</integer>
+// CHECK:          <key>col</key><integer>20</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:        </array>
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:      <string>Conversion from value of type 'MutableArray<NSMutableString *> *' to incompatible type 'MutableArray<NSString *> *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:      <string>Conversion from value of type 'MutableArray<NSMutableString *> *' to incompatible type 'MutableArray<NSString *> *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'MutableArray<NSMutableString *> *' to incompatible type 'MutableArray<NSString *> *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
 // CHECK:   <key>issue_context_kind</key><string>function</string>
-// CHECK:   <key>issue_context</key><string>workWithProperties</string>
-// CHECK:   <key>issue_hash</key><string>4</string>
+// CHECK:   <key>issue_context</key><string>InferenceFromAPIWithBuggyTypes3</string>
+// CHECK:   <key>issue_hash</key><string>3</string>
 // CHECK:   <key>location</key>
 // CHECK:   <dict>
-// CHECK:    <key>line</key><integer>220</integer>
-// CHECK:    <key>col</key><integer>9</integer>
+// CHECK:    <key>line</key><integer>217</integer>
+// CHECK:    <key>col</key><integer>20</integer>
 // CHECK:    <key>file</key><integer>0</integer>
 // CHECK:   </dict>
 // CHECK:   </dict>
@@ -4116,30 +4196,30 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <key>kind</key><string>event</string>
 // CHECK:      <key>location</key>
 // CHECK:      <dict>
-// CHECK:       <key>line</key><integer>217</integer>
-// CHECK:       <key>col</key><integer>16</integer>
+// CHECK:       <key>line</key><integer>221</integer>
+// CHECK:       <key>col</key><integer>45</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
 // CHECK:      <key>ranges</key>
 // CHECK:      <array>
 // CHECK:        <array>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>217</integer>
-// CHECK:          <key>col</key><integer>16</integer>
+// CHECK:          <key>line</key><integer>221</integer>
+// CHECK:          <key>col</key><integer>45</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>217</integer>
-// CHECK:          <key>col</key><integer>16</integer>
+// CHECK:          <key>line</key><integer>221</integer>
+// CHECK:          <key>col</key><integer>45</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:        </array>
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Type 'NSArray<NSNumber *> *' is inferred from implicit cast (from 'NSArray<NSNumber *> *' to 'NSArray *')</string>
+// CHECK:      <string>Type 'NSArray<NSString *> *' is inferred from implicit cast (from '__kindof NSArray<NSString *> *' to 'BuggyMutableArray<NSMutableString *> *')</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Type 'NSArray<NSNumber *> *' is inferred from implicit cast (from 'NSArray<NSNumber *> *' to 'NSArray *')</string>
+// CHECK:      <string>Type 'NSArray<NSString *> *' is inferred from implicit cast (from '__kindof NSArray<NSString *> *' to 'BuggyMutableArray<NSMutableString *> *')</string>
 // CHECK:     </dict>
 // CHECK:     <dict>
 // CHECK:      <key>kind</key><string>control</string>
@@ -4149,13 +4229,13 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>start</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>217</integer>
+// CHECK:            <key>line</key><integer>221</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>217</integer>
-// CHECK:            <key>col</key><integer>9</integer>
+// CHECK:            <key>line</key><integer>221</integer>
+// CHECK:            <key>col</key><integer>19</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:          </array>
@@ -4168,7 +4248,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:           </dict>
 // CHECK:           <dict>
 // CHECK:            <key>line</key><integer>222</integer>
-// CHECK:            <key>col</key><integer>5</integer>
+// CHECK:            <key>col</key><integer>18</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:          </array>
@@ -4176,6 +4256,35 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:       </array>
 // CHECK:     </dict>
 // CHECK:     <dict>
+// CHECK:      <key>kind</key><string>event</string>
+// CHECK:      <key>location</key>
+// CHECK:      <dict>
+// CHECK:       <key>line</key><integer>222</integer>
+// CHECK:       <key>col</key><integer>20</integer>
+// CHECK:       <key>file</key><integer>0</integer>
+// CHECK:      </dict>
+// CHECK:      <key>ranges</key>
+// CHECK:      <array>
+// CHECK:        <array>
+// CHECK:         <dict>
+// CHECK:          <key>line</key><integer>222</integer>
+// CHECK:          <key>col</key><integer>20</integer>
+// CHECK:          <key>file</key><integer>0</integer>
+// CHECK:         </dict>
+// CHECK:         <dict>
+// CHECK:          <key>line</key><integer>222</integer>
+// CHECK:          <key>col</key><integer>20</integer>
+// CHECK:          <key>file</key><integer>0</integer>
+// CHECK:         </dict>
+// CHECK:        </array>
+// CHECK:      </array>
+// CHECK:      <key>depth</key><integer>0</integer>
+// CHECK:      <key>extended_message</key>
+// CHECK:      <string>Type 'MutableArray<NSString *> *' is inferred from implicit cast (from 'BuggyMutableArray<NSMutableString *> *' to 'MutableArray<NSString *> *')</string>
+// CHECK:      <key>message</key>
+// CHECK:      <string>Type 'MutableArray<NSString *> *' is inferred from implicit cast (from 'BuggyMutableArray<NSMutableString *> *' to 'MutableArray<NSString *> *')</string>
+// CHECK:     </dict>
+// CHECK:     <dict>
 // CHECK:      <key>kind</key><string>control</string>
 // CHECK:      <key>edges</key>
 // CHECK:       <array>
@@ -4189,20 +4298,20 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:           </dict>
 // CHECK:           <dict>
 // CHECK:            <key>line</key><integer>222</integer>
-// CHECK:            <key>col</key><integer>5</integer>
+// CHECK:            <key>col</key><integer>18</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:          </array>
 // CHECK:         <key>end</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>222</integer>
-// CHECK:            <key>col</key><integer>11</integer>
+// CHECK:            <key>line</key><integer>223</integer>
+// CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>222</integer>
-// CHECK:            <key>col</key><integer>21</integer>
+// CHECK:            <key>line</key><integer>223</integer>
+// CHECK:            <key>col</key><integer>25</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:          </array>
@@ -4210,10 +4319,476 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:       </array>
 // CHECK:     </dict>
 // CHECK:     <dict>
-// CHECK:      <key>kind</key><string>event</string>
-// CHECK:      <key>location</key>
-// CHECK:      <dict>
-// CHECK:       <key>line</key><integer>222</integer>
+// CHECK:      <key>kind</key><string>control</string>
+// CHECK:      <key>edges</key>
+// CHECK:       <array>
+// CHECK:        <dict>
+// CHECK:         <key>start</key>
+// CHECK:          <array>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>223</integer>
+// CHECK:            <key>col</key><integer>3</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>223</integer>
+// CHECK:            <key>col</key><integer>25</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:          </array>
+// CHECK:         <key>end</key>
+// CHECK:          <array>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>223</integer>
+// CHECK:            <key>col</key><integer>27</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>223</integer>
+// CHECK:            <key>col</key><integer>27</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:          </array>
+// CHECK:        </dict>
+// CHECK:       </array>
+// CHECK:     </dict>
+// CHECK:     <dict>
+// CHECK:      <key>kind</key><string>event</string>
+// CHECK:      <key>location</key>
+// CHECK:      <dict>
+// CHECK:       <key>line</key><integer>223</integer>
+// CHECK:       <key>col</key><integer>27</integer>
+// CHECK:       <key>file</key><integer>0</integer>
+// CHECK:      </dict>
+// CHECK:      <key>ranges</key>
+// CHECK:      <array>
+// CHECK:        <array>
+// CHECK:         <dict>
+// CHECK:          <key>line</key><integer>223</integer>
+// CHECK:          <key>col</key><integer>27</integer>
+// CHECK:          <key>file</key><integer>0</integer>
+// CHECK:         </dict>
+// CHECK:         <dict>
+// CHECK:          <key>line</key><integer>223</integer>
+// CHECK:          <key>col</key><integer>27</integer>
+// CHECK:          <key>file</key><integer>0</integer>
+// CHECK:         </dict>
+// CHECK:        </array>
+// CHECK:      </array>
+// CHECK:      <key>depth</key><integer>0</integer>
+// CHECK:      <key>extended_message</key>
+// CHECK:      <string>Conversion from value of type 'MutableArray<NSString *> *' to incompatible type 'MutableArray<NSMutableString *> *'</string>
+// CHECK:      <key>message</key>
+// CHECK:      <string>Conversion from value of type 'MutableArray<NSString *> *' to incompatible type 'MutableArray<NSMutableString *> *'</string>
+// CHECK:     </dict>
+// CHECK:    </array>
+// CHECK:    <key>description</key><string>Conversion from value of type 'MutableArray<NSString *> *' to incompatible type 'MutableArray<NSMutableString *> *'</string>
+// CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
+// CHECK:    <key>type</key><string>Generics</string>
+// CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
+// CHECK:   <key>issue_context_kind</key><string>function</string>
+// CHECK:   <key>issue_context</key><string>InferenceFromAPIWithBuggyTypes4</string>
+// CHECK:   <key>issue_hash</key><string>3</string>
+// CHECK:   <key>location</key>
+// CHECK:   <dict>
+// CHECK:    <key>line</key><integer>223</integer>
+// CHECK:    <key>col</key><integer>27</integer>
+// CHECK:    <key>file</key><integer>0</integer>
+// CHECK:   </dict>
+// CHECK:   </dict>
+// CHECK:   <dict>
+// CHECK:    <key>path</key>
+// CHECK:    <array>
+// CHECK:     <dict>
+// CHECK:      <key>kind</key><string>event</string>
+// CHECK:      <key>location</key>
+// CHECK:      <dict>
+// CHECK:       <key>line</key><integer>235</integer>
+// CHECK:       <key>col</key><integer>16</integer>
+// CHECK:       <key>file</key><integer>0</integer>
+// CHECK:      </dict>
+// CHECK:      <key>ranges</key>
+// CHECK:      <array>
+// CHECK:        <array>
+// CHECK:         <dict>
+// CHECK:          <key>line</key><integer>235</integer>
+// CHECK:          <key>col</key><integer>16</integer>
+// CHECK:          <key>file</key><integer>0</integer>
+// CHECK:         </dict>
+// CHECK:         <dict>
+// CHECK:          <key>line</key><integer>235</integer>
+// CHECK:          <key>col</key><integer>16</integer>
+// CHECK:          <key>file</key><integer>0</integer>
+// CHECK:         </dict>
+// CHECK:        </array>
+// CHECK:      </array>
+// CHECK:      <key>depth</key><integer>0</integer>
+// CHECK:      <key>extended_message</key>
+// CHECK:      <string>Type 'NSArray<NSNumber *> *' is inferred from implicit cast (from 'NSArray<NSNumber *> *' to 'NSArray *')</string>
+// CHECK:      <key>message</key>
+// CHECK:      <string>Type 'NSArray<NSNumber *> *' is inferred from implicit cast (from 'NSArray<NSNumber *> *' to 'NSArray *')</string>
+// CHECK:     </dict>
+// CHECK:     <dict>
+// CHECK:      <key>kind</key><string>control</string>
+// CHECK:      <key>edges</key>
+// CHECK:       <array>
+// CHECK:        <dict>
+// CHECK:         <key>start</key>
+// CHECK:          <array>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>235</integer>
+// CHECK:            <key>col</key><integer>3</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>235</integer>
+// CHECK:            <key>col</key><integer>9</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:          </array>
+// CHECK:         <key>end</key>
+// CHECK:          <array>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>236</integer>
+// CHECK:            <key>col</key><integer>3</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>236</integer>
+// CHECK:            <key>col</key><integer>10</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:          </array>
+// CHECK:        </dict>
+// CHECK:       </array>
+// CHECK:     </dict>
+// CHECK:     <dict>
+// CHECK:      <key>kind</key><string>control</string>
+// CHECK:      <key>edges</key>
+// CHECK:       <array>
+// CHECK:        <dict>
+// CHECK:         <key>start</key>
+// CHECK:          <array>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>236</integer>
+// CHECK:            <key>col</key><integer>3</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>236</integer>
+// CHECK:            <key>col</key><integer>10</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:          </array>
+// CHECK:         <key>end</key>
+// CHECK:          <array>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>236</integer>
+// CHECK:            <key>col</key><integer>19</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>236</integer>
+// CHECK:            <key>col</key><integer>19</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:          </array>
+// CHECK:        </dict>
+// CHECK:       </array>
+// CHECK:     </dict>
+// CHECK:     <dict>
+// CHECK:      <key>kind</key><string>event</string>
+// CHECK:      <key>location</key>
+// CHECK:      <dict>
+// CHECK:       <key>line</key><integer>236</integer>
+// CHECK:       <key>col</key><integer>19</integer>
+// CHECK:       <key>file</key><integer>0</integer>
+// CHECK:      </dict>
+// CHECK:      <key>ranges</key>
+// CHECK:      <array>
+// CHECK:        <array>
+// CHECK:         <dict>
+// CHECK:          <key>line</key><integer>236</integer>
+// CHECK:          <key>col</key><integer>19</integer>
+// CHECK:          <key>file</key><integer>0</integer>
+// CHECK:         </dict>
+// CHECK:         <dict>
+// CHECK:          <key>line</key><integer>236</integer>
+// CHECK:          <key>col</key><integer>38</integer>
+// CHECK:          <key>file</key><integer>0</integer>
+// CHECK:         </dict>
+// CHECK:        </array>
+// CHECK:      </array>
+// CHECK:      <key>depth</key><integer>0</integer>
+// CHECK:      <key>extended_message</key>
+// CHECK:      <string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
+// CHECK:      <key>message</key>
+// CHECK:      <string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
+// CHECK:     </dict>
+// CHECK:    </array>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
+// CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
+// CHECK:    <key>type</key><string>Generics</string>
+// CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
+// CHECK:   <key>issue_context_kind</key><string>function</string>
+// CHECK:   <key>issue_context</key><string>workWithProperties</string>
+// CHECK:   <key>issue_hash</key><string>2</string>
+// CHECK:   <key>location</key>
+// CHECK:   <dict>
+// CHECK:    <key>line</key><integer>236</integer>
+// CHECK:    <key>col</key><integer>19</integer>
+// CHECK:    <key>file</key><integer>0</integer>
+// CHECK:   </dict>
+// CHECK:   </dict>
+// CHECK:   <dict>
+// CHECK:    <key>path</key>
+// CHECK:    <array>
+// CHECK:     <dict>
+// CHECK:      <key>kind</key><string>event</string>
+// CHECK:      <key>location</key>
+// CHECK:      <dict>
+// CHECK:       <key>line</key><integer>235</integer>
+// CHECK:       <key>col</key><integer>16</integer>
+// CHECK:       <key>file</key><integer>0</integer>
+// CHECK:      </dict>
+// CHECK:      <key>ranges</key>
+// CHECK:      <array>
+// CHECK:        <array>
+// CHECK:         <dict>
+// CHECK:          <key>line</key><integer>235</integer>
+// CHECK:          <key>col</key><integer>16</integer>
+// CHECK:          <key>file</key><integer>0</integer>
+// CHECK:         </dict>
+// CHECK:         <dict>
+// CHECK:          <key>line</key><integer>235</integer>
+// CHECK:          <key>col</key><integer>16</integer>
+// CHECK:          <key>file</key><integer>0</integer>
+// CHECK:         </dict>
+// CHECK:        </array>
+// CHECK:      </array>
+// CHECK:      <key>depth</key><integer>0</integer>
+// CHECK:      <key>extended_message</key>
+// CHECK:      <string>Type 'NSArray<NSNumber *> *' is inferred from implicit cast (from 'NSArray<NSNumber *> *' to 'NSArray *')</string>
+// CHECK:      <key>message</key>
+// CHECK:      <string>Type 'NSArray<NSNumber *> *' is inferred from implicit cast (from 'NSArray<NSNumber *> *' to 'NSArray *')</string>
+// CHECK:     </dict>
+// CHECK:     <dict>
+// CHECK:      <key>kind</key><string>control</string>
+// CHECK:      <key>edges</key>
+// CHECK:       <array>
+// CHECK:        <dict>
+// CHECK:         <key>start</key>
+// CHECK:          <array>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>235</integer>
+// CHECK:            <key>col</key><integer>3</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>235</integer>
+// CHECK:            <key>col</key><integer>9</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:          </array>
+// CHECK:         <key>end</key>
+// CHECK:          <array>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>238</integer>
+// CHECK:            <key>col</key><integer>3</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>238</integer>
+// CHECK:            <key>col</key><integer>5</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:          </array>
+// CHECK:        </dict>
+// CHECK:       </array>
+// CHECK:     </dict>
+// CHECK:     <dict>
+// CHECK:      <key>kind</key><string>control</string>
+// CHECK:      <key>edges</key>
+// CHECK:       <array>
+// CHECK:        <dict>
+// CHECK:         <key>start</key>
+// CHECK:          <array>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>238</integer>
+// CHECK:            <key>col</key><integer>3</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>238</integer>
+// CHECK:            <key>col</key><integer>5</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:          </array>
+// CHECK:         <key>end</key>
+// CHECK:          <array>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>238</integer>
+// CHECK:            <key>col</key><integer>9</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>238</integer>
+// CHECK:            <key>col</key><integer>9</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:          </array>
+// CHECK:        </dict>
+// CHECK:       </array>
+// CHECK:     </dict>
+// CHECK:     <dict>
+// CHECK:      <key>kind</key><string>event</string>
+// CHECK:      <key>location</key>
+// CHECK:      <dict>
+// CHECK:       <key>line</key><integer>238</integer>
+// CHECK:       <key>col</key><integer>9</integer>
+// CHECK:       <key>file</key><integer>0</integer>
+// CHECK:      </dict>
+// CHECK:      <key>ranges</key>
+// CHECK:      <array>
+// CHECK:        <array>
+// CHECK:         <dict>
+// CHECK:          <key>line</key><integer>238</integer>
+// CHECK:          <key>col</key><integer>9</integer>
+// CHECK:          <key>file</key><integer>0</integer>
+// CHECK:         </dict>
+// CHECK:         <dict>
+// CHECK:          <key>line</key><integer>238</integer>
+// CHECK:          <key>col</key><integer>23</integer>
+// CHECK:          <key>file</key><integer>0</integer>
+// CHECK:         </dict>
+// CHECK:        </array>
+// CHECK:      </array>
+// CHECK:      <key>depth</key><integer>0</integer>
+// CHECK:      <key>extended_message</key>
+// CHECK:      <string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
+// CHECK:      <key>message</key>
+// CHECK:      <string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
+// CHECK:     </dict>
+// CHECK:    </array>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
+// CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
+// CHECK:    <key>type</key><string>Generics</string>
+// CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
+// CHECK:   <key>issue_context_kind</key><string>function</string>
+// CHECK:   <key>issue_context</key><string>workWithProperties</string>
+// CHECK:   <key>issue_hash</key><string>4</string>
+// CHECK:   <key>location</key>
+// CHECK:   <dict>
+// CHECK:    <key>line</key><integer>238</integer>
+// CHECK:    <key>col</key><integer>9</integer>
+// CHECK:    <key>file</key><integer>0</integer>
+// CHECK:   </dict>
+// CHECK:   </dict>
+// CHECK:   <dict>
+// CHECK:    <key>path</key>
+// CHECK:    <array>
+// CHECK:     <dict>
+// CHECK:      <key>kind</key><string>event</string>
+// CHECK:      <key>location</key>
+// CHECK:      <dict>
+// CHECK:       <key>line</key><integer>235</integer>
+// CHECK:       <key>col</key><integer>16</integer>
+// CHECK:       <key>file</key><integer>0</integer>
+// CHECK:      </dict>
+// CHECK:      <key>ranges</key>
+// CHECK:      <array>
+// CHECK:        <array>
+// CHECK:         <dict>
+// CHECK:          <key>line</key><integer>235</integer>
+// CHECK:          <key>col</key><integer>16</integer>
+// CHECK:          <key>file</key><integer>0</integer>
+// CHECK:         </dict>
+// CHECK:         <dict>
+// CHECK:          <key>line</key><integer>235</integer>
+// CHECK:          <key>col</key><integer>16</integer>
+// CHECK:          <key>file</key><integer>0</integer>
+// CHECK:         </dict>
+// CHECK:        </array>
+// CHECK:      </array>
+// CHECK:      <key>depth</key><integer>0</integer>
+// CHECK:      <key>extended_message</key>
+// CHECK:      <string>Type 'NSArray<NSNumber *> *' is inferred from implicit cast (from 'NSArray<NSNumber *> *' to 'NSArray *')</string>
+// CHECK:      <key>message</key>
+// CHECK:      <string>Type 'NSArray<NSNumber *> *' is inferred from implicit cast (from 'NSArray<NSNumber *> *' to 'NSArray *')</string>
+// CHECK:     </dict>
+// CHECK:     <dict>
+// CHECK:      <key>kind</key><string>control</string>
+// CHECK:      <key>edges</key>
+// CHECK:       <array>
+// CHECK:        <dict>
+// CHECK:         <key>start</key>
+// CHECK:          <array>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>235</integer>
+// CHECK:            <key>col</key><integer>3</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>235</integer>
+// CHECK:            <key>col</key><integer>9</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:          </array>
+// CHECK:         <key>end</key>
+// CHECK:          <array>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>240</integer>
+// CHECK:            <key>col</key><integer>3</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>240</integer>
+// CHECK:            <key>col</key><integer>5</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:          </array>
+// CHECK:        </dict>
+// CHECK:       </array>
+// CHECK:     </dict>
+// CHECK:     <dict>
+// CHECK:      <key>kind</key><string>control</string>
+// CHECK:      <key>edges</key>
+// CHECK:       <array>
+// CHECK:        <dict>
+// CHECK:         <key>start</key>
+// CHECK:          <array>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>240</integer>
+// CHECK:            <key>col</key><integer>3</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>240</integer>
+// CHECK:            <key>col</key><integer>5</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:          </array>
+// CHECK:         <key>end</key>
+// CHECK:          <array>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>240</integer>
+// CHECK:            <key>col</key><integer>11</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:           <dict>
+// CHECK:            <key>line</key><integer>240</integer>
+// CHECK:            <key>col</key><integer>21</integer>
+// CHECK:            <key>file</key><integer>0</integer>
+// CHECK:           </dict>
+// CHECK:          </array>
+// CHECK:        </dict>
+// CHECK:       </array>
+// CHECK:     </dict>
+// CHECK:     <dict>
+// CHECK:      <key>kind</key><string>event</string>
+// CHECK:      <key>location</key>
+// CHECK:      <dict>
+// CHECK:       <key>line</key><integer>240</integer>
 // CHECK:       <key>col</key><integer>11</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
@@ -4221,12 +4796,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <array>
 // CHECK:        <array>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>222</integer>
+// CHECK:          <key>line</key><integer>240</integer>
 // CHECK:          <key>col</key><integer>11</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>222</integer>
+// CHECK:          <key>line</key><integer>240</integer>
 // CHECK:          <key>col</key><integer>21</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
@@ -4234,12 +4809,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:      <string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:      <string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -4248,7 +4823,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:   <key>issue_hash</key><string>6</string>
 // CHECK:   <key>location</key>
 // CHECK:   <dict>
-// CHECK:    <key>line</key><integer>222</integer>
+// CHECK:    <key>line</key><integer>240</integer>
 // CHECK:    <key>col</key><integer>11</integer>
 // CHECK:    <key>file</key><integer>0</integer>
 // CHECK:   </dict>
@@ -4260,7 +4835,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <key>kind</key><string>event</string>
 // CHECK:      <key>location</key>
 // CHECK:      <dict>
-// CHECK:       <key>line</key><integer>217</integer>
+// CHECK:       <key>line</key><integer>235</integer>
 // CHECK:       <key>col</key><integer>16</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
@@ -4268,12 +4843,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <array>
 // CHECK:        <array>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>217</integer>
+// CHECK:          <key>line</key><integer>235</integer>
 // CHECK:          <key>col</key><integer>16</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>217</integer>
+// CHECK:          <key>line</key><integer>235</integer>
 // CHECK:          <key>col</key><integer>16</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
@@ -4293,12 +4868,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>start</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>217</integer>
+// CHECK:            <key>line</key><integer>235</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>217</integer>
+// CHECK:            <key>line</key><integer>235</integer>
 // CHECK:            <key>col</key><integer>9</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -4306,12 +4881,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>end</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>224</integer>
+// CHECK:            <key>line</key><integer>242</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>224</integer>
+// CHECK:            <key>line</key><integer>242</integer>
 // CHECK:            <key>col</key><integer>5</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -4327,12 +4902,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>start</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>224</integer>
+// CHECK:            <key>line</key><integer>242</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>224</integer>
+// CHECK:            <key>line</key><integer>242</integer>
 // CHECK:            <key>col</key><integer>5</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -4340,12 +4915,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>end</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>224</integer>
+// CHECK:            <key>line</key><integer>242</integer>
 // CHECK:            <key>col</key><integer>9</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>224</integer>
+// CHECK:            <key>line</key><integer>242</integer>
 // CHECK:            <key>col</key><integer>9</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -4357,7 +4932,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <key>kind</key><string>event</string>
 // CHECK:      <key>location</key>
 // CHECK:      <dict>
-// CHECK:       <key>line</key><integer>224</integer>
+// CHECK:       <key>line</key><integer>242</integer>
 // CHECK:       <key>col</key><integer>9</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
@@ -4365,12 +4940,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <array>
 // CHECK:        <array>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>224</integer>
+// CHECK:          <key>line</key><integer>242</integer>
 // CHECK:          <key>col</key><integer>9</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>224</integer>
+// CHECK:          <key>line</key><integer>242</integer>
 // CHECK:          <key>col</key><integer>9</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
@@ -4378,12 +4953,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:      <string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:      <string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -4392,7 +4967,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:   <key>issue_hash</key><string>8</string>
 // CHECK:   <key>location</key>
 // CHECK:   <dict>
-// CHECK:    <key>line</key><integer>224</integer>
+// CHECK:    <key>line</key><integer>242</integer>
 // CHECK:    <key>col</key><integer>9</integer>
 // CHECK:    <key>file</key><integer>0</integer>
 // CHECK:   </dict>
@@ -4404,7 +4979,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <key>kind</key><string>event</string>
 // CHECK:      <key>location</key>
 // CHECK:      <dict>
-// CHECK:       <key>line</key><integer>230</integer>
+// CHECK:       <key>line</key><integer>248</integer>
 // CHECK:       <key>col</key><integer>7</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
@@ -4412,12 +4987,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <array>
 // CHECK:        <array>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>230</integer>
+// CHECK:          <key>line</key><integer>248</integer>
 // CHECK:          <key>col</key><integer>7</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>230</integer>
+// CHECK:          <key>line</key><integer>248</integer>
 // CHECK:          <key>col</key><integer>7</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
@@ -4437,12 +5012,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>start</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>230</integer>
+// CHECK:            <key>line</key><integer>248</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>230</integer>
+// CHECK:            <key>line</key><integer>248</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -4450,12 +5025,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>end</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>231</integer>
+// CHECK:            <key>line</key><integer>249</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>231</integer>
+// CHECK:            <key>line</key><integer>249</integer>
 // CHECK:            <key>col</key><integer>4</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -4471,12 +5046,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>start</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>231</integer>
+// CHECK:            <key>line</key><integer>249</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>231</integer>
+// CHECK:            <key>line</key><integer>249</integer>
 // CHECK:            <key>col</key><integer>4</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -4484,12 +5059,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>end</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>232</integer>
+// CHECK:            <key>line</key><integer>250</integer>
 // CHECK:            <key>col</key><integer>5</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>232</integer>
+// CHECK:            <key>line</key><integer>250</integer>
 // CHECK:            <key>col</key><integer>5</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -4505,12 +5080,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>start</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>232</integer>
+// CHECK:            <key>line</key><integer>250</integer>
 // CHECK:            <key>col</key><integer>5</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>232</integer>
+// CHECK:            <key>line</key><integer>250</integer>
 // CHECK:            <key>col</key><integer>5</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -4518,12 +5093,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>end</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>233</integer>
+// CHECK:            <key>line</key><integer>251</integer>
 // CHECK:            <key>col</key><integer>5</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>233</integer>
+// CHECK:            <key>line</key><integer>251</integer>
 // CHECK:            <key>col</key><integer>5</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -4535,7 +5110,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <key>kind</key><string>event</string>
 // CHECK:      <key>location</key>
 // CHECK:      <dict>
-// CHECK:       <key>line</key><integer>233</integer>
+// CHECK:       <key>line</key><integer>251</integer>
 // CHECK:       <key>col</key><integer>5</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
@@ -4543,12 +5118,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <array>
 // CHECK:        <array>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>233</integer>
+// CHECK:          <key>line</key><integer>251</integer>
 // CHECK:          <key>col</key><integer>19</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>233</integer>
+// CHECK:          <key>line</key><integer>251</integer>
 // CHECK:          <key>col</key><integer>41</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
@@ -4556,12 +5131,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSMutableString *' from 'NSString *'</string>
+// CHECK:      <string>Conversion from value of type 'NSString *' to incompatible type 'NSMutableString *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSMutableString *' from 'NSString *'</string>
+// CHECK:      <string>Conversion from value of type 'NSString *' to incompatible type 'NSMutableString *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSMutableString *' from 'NSString *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSString *' to incompatible type 'NSMutableString *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -4570,7 +5145,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:   <key>issue_hash</key><string>4</string>
 // CHECK:   <key>location</key>
 // CHECK:   <dict>
-// CHECK:    <key>line</key><integer>233</integer>
+// CHECK:    <key>line</key><integer>251</integer>
 // CHECK:    <key>col</key><integer>5</integer>
 // CHECK:    <key>file</key><integer>0</integer>
 // CHECK:   </dict>
@@ -4582,7 +5157,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <key>kind</key><string>event</string>
 // CHECK:      <key>location</key>
 // CHECK:      <dict>
-// CHECK:       <key>line</key><integer>242</integer>
+// CHECK:       <key>line</key><integer>260</integer>
 // CHECK:       <key>col</key><integer>7</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
@@ -4590,12 +5165,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <array>
 // CHECK:        <array>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>242</integer>
+// CHECK:          <key>line</key><integer>260</integer>
 // CHECK:          <key>col</key><integer>7</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>242</integer>
+// CHECK:          <key>line</key><integer>260</integer>
 // CHECK:          <key>col</key><integer>7</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
@@ -4615,12 +5190,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>start</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>242</integer>
+// CHECK:            <key>line</key><integer>260</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>242</integer>
+// CHECK:            <key>line</key><integer>260</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -4628,12 +5203,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>end</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>243</integer>
+// CHECK:            <key>line</key><integer>261</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>243</integer>
+// CHECK:            <key>line</key><integer>261</integer>
 // CHECK:            <key>col</key><integer>4</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -4649,12 +5224,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>start</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>243</integer>
+// CHECK:            <key>line</key><integer>261</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>243</integer>
+// CHECK:            <key>line</key><integer>261</integer>
 // CHECK:            <key>col</key><integer>4</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -4662,12 +5237,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>end</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>244</integer>
+// CHECK:            <key>line</key><integer>262</integer>
 // CHECK:            <key>col</key><integer>5</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>244</integer>
+// CHECK:            <key>line</key><integer>262</integer>
 // CHECK:            <key>col</key><integer>5</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -4679,7 +5254,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <key>kind</key><string>event</string>
 // CHECK:      <key>location</key>
 // CHECK:      <dict>
-// CHECK:       <key>line</key><integer>244</integer>
+// CHECK:       <key>line</key><integer>262</integer>
 // CHECK:       <key>col</key><integer>5</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
@@ -4687,12 +5262,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <array>
 // CHECK:        <array>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>244</integer>
+// CHECK:          <key>line</key><integer>262</integer>
 // CHECK:          <key>col</key><integer>19</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>244</integer>
+// CHECK:          <key>line</key><integer>262</integer>
 // CHECK:          <key>col</key><integer>41</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
@@ -4700,12 +5275,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSMutableString *' from 'NSString *'</string>
+// CHECK:      <string>Conversion from value of type 'NSString *' to incompatible type 'NSMutableString *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSMutableString *' from 'NSString *'</string>
+// CHECK:      <string>Conversion from value of type 'NSString *' to incompatible type 'NSMutableString *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSMutableString *' from 'NSString *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSString *' to incompatible type 'NSMutableString *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -4714,7 +5289,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:   <key>issue_hash</key><string>3</string>
 // CHECK:   <key>location</key>
 // CHECK:   <dict>
-// CHECK:    <key>line</key><integer>244</integer>
+// CHECK:    <key>line</key><integer>262</integer>
 // CHECK:    <key>col</key><integer>5</integer>
 // CHECK:    <key>file</key><integer>0</integer>
 // CHECK:   </dict>
@@ -4726,7 +5301,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <key>kind</key><string>event</string>
 // CHECK:      <key>location</key>
 // CHECK:      <dict>
-// CHECK:       <key>line</key><integer>257</integer>
+// CHECK:       <key>line</key><integer>275</integer>
 // CHECK:       <key>col</key><integer>30</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
@@ -4734,12 +5309,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <array>
 // CHECK:        <array>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>257</integer>
+// CHECK:          <key>line</key><integer>275</integer>
 // CHECK:          <key>col</key><integer>30</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>257</integer>
+// CHECK:          <key>line</key><integer>275</integer>
 // CHECK:          <key>col</key><integer>42</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
@@ -4759,12 +5334,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>start</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>257</integer>
+// CHECK:            <key>line</key><integer>275</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>257</integer>
+// CHECK:            <key>line</key><integer>275</integer>
 // CHECK:            <key>col</key><integer>9</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -4772,12 +5347,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>end</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>259</integer>
+// CHECK:            <key>line</key><integer>277</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>259</integer>
+// CHECK:            <key>line</key><integer>277</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -4789,7 +5364,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <key>kind</key><string>event</string>
 // CHECK:      <key>location</key>
 // CHECK:      <dict>
-// CHECK:       <key>line</key><integer>259</integer>
+// CHECK:       <key>line</key><integer>277</integer>
 // CHECK:       <key>col</key><integer>3</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
@@ -4797,12 +5372,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <array>
 // CHECK:        <array>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>259</integer>
+// CHECK:          <key>line</key><integer>277</integer>
 // CHECK:          <key>col</key><integer>19</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>259</integer>
+// CHECK:          <key>line</key><integer>277</integer>
 // CHECK:          <key>col</key><integer>41</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
@@ -4810,12 +5385,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:      <string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:      <string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSString *' from 'NSNumber *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSNumber *' to incompatible type 'NSString *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -4824,7 +5399,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:   <key>issue_hash</key><string>3</string>
 // CHECK:   <key>location</key>
 // CHECK:   <dict>
-// CHECK:    <key>line</key><integer>259</integer>
+// CHECK:    <key>line</key><integer>277</integer>
 // CHECK:    <key>col</key><integer>3</integer>
 // CHECK:    <key>file</key><integer>0</integer>
 // CHECK:   </dict>
@@ -4836,7 +5411,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <key>kind</key><string>event</string>
 // CHECK:      <key>location</key>
 // CHECK:      <dict>
-// CHECK:       <key>line</key><integer>268</integer>
+// CHECK:       <key>line</key><integer>286</integer>
 // CHECK:       <key>col</key><integer>13</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
@@ -4844,12 +5419,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <array>
 // CHECK:        <array>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>268</integer>
+// CHECK:          <key>line</key><integer>286</integer>
 // CHECK:          <key>col</key><integer>13</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>268</integer>
+// CHECK:          <key>line</key><integer>286</integer>
 // CHECK:          <key>col</key><integer>39</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
@@ -4869,12 +5444,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>start</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>268</integer>
+// CHECK:            <key>line</key><integer>286</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>268</integer>
+// CHECK:            <key>line</key><integer>286</integer>
 // CHECK:            <key>col</key><integer>7</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -4882,12 +5457,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>end</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>269</integer>
+// CHECK:            <key>line</key><integer>287</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>269</integer>
+// CHECK:            <key>line</key><integer>287</integer>
 // CHECK:            <key>col</key><integer>9</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -4903,12 +5478,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>start</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>269</integer>
+// CHECK:            <key>line</key><integer>287</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>269</integer>
+// CHECK:            <key>line</key><integer>287</integer>
 // CHECK:            <key>col</key><integer>9</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -4916,12 +5491,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>end</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>269</integer>
+// CHECK:            <key>line</key><integer>287</integer>
 // CHECK:            <key>col</key><integer>28</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>269</integer>
+// CHECK:            <key>line</key><integer>287</integer>
 // CHECK:            <key>col</key><integer>28</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -4933,7 +5508,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <key>kind</key><string>event</string>
 // CHECK:      <key>location</key>
 // CHECK:      <dict>
-// CHECK:       <key>line</key><integer>269</integer>
+// CHECK:       <key>line</key><integer>287</integer>
 // CHECK:       <key>col</key><integer>28</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
@@ -4941,12 +5516,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <array>
 // CHECK:        <array>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>269</integer>
+// CHECK:          <key>line</key><integer>287</integer>
 // CHECK:          <key>col</key><integer>28</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>269</integer>
+// CHECK:          <key>line</key><integer>287</integer>
 // CHECK:          <key>col</key><integer>39</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
@@ -4954,12 +5529,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -4968,7 +5543,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:   <key>issue_hash</key><string>2</string>
 // CHECK:   <key>location</key>
 // CHECK:   <dict>
-// CHECK:    <key>line</key><integer>269</integer>
+// CHECK:    <key>line</key><integer>287</integer>
 // CHECK:    <key>col</key><integer>28</integer>
 // CHECK:    <key>file</key><integer>0</integer>
 // CHECK:   </dict>
@@ -4980,7 +5555,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <key>kind</key><string>event</string>
 // CHECK:      <key>location</key>
 // CHECK:      <dict>
-// CHECK:       <key>line</key><integer>268</integer>
+// CHECK:       <key>line</key><integer>286</integer>
 // CHECK:       <key>col</key><integer>13</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
@@ -4988,12 +5563,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <array>
 // CHECK:        <array>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>268</integer>
+// CHECK:          <key>line</key><integer>286</integer>
 // CHECK:          <key>col</key><integer>13</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>268</integer>
+// CHECK:          <key>line</key><integer>286</integer>
 // CHECK:          <key>col</key><integer>39</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
@@ -5013,12 +5588,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>start</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>268</integer>
+// CHECK:            <key>line</key><integer>286</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>268</integer>
+// CHECK:            <key>line</key><integer>286</integer>
 // CHECK:            <key>col</key><integer>7</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -5026,12 +5601,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>end</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>270</integer>
+// CHECK:            <key>line</key><integer>288</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>270</integer>
+// CHECK:            <key>line</key><integer>288</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -5047,12 +5622,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>start</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>270</integer>
+// CHECK:            <key>line</key><integer>288</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>270</integer>
+// CHECK:            <key>line</key><integer>288</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -5060,12 +5635,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>end</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>270</integer>
+// CHECK:            <key>line</key><integer>288</integer>
 // CHECK:            <key>col</key><integer>7</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>270</integer>
+// CHECK:            <key>line</key><integer>288</integer>
 // CHECK:            <key>col</key><integer>7</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -5077,7 +5652,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <key>kind</key><string>event</string>
 // CHECK:      <key>location</key>
 // CHECK:      <dict>
-// CHECK:       <key>line</key><integer>270</integer>
+// CHECK:       <key>line</key><integer>288</integer>
 // CHECK:       <key>col</key><integer>7</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
@@ -5085,12 +5660,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <array>
 // CHECK:        <array>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>270</integer>
+// CHECK:          <key>line</key><integer>288</integer>
 // CHECK:          <key>col</key><integer>7</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>270</integer>
+// CHECK:          <key>line</key><integer>288</integer>
 // CHECK:          <key>col</key><integer>19</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
@@ -5098,12 +5673,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -5112,7 +5687,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:   <key>issue_hash</key><string>3</string>
 // CHECK:   <key>location</key>
 // CHECK:   <dict>
-// CHECK:    <key>line</key><integer>270</integer>
+// CHECK:    <key>line</key><integer>288</integer>
 // CHECK:    <key>col</key><integer>7</integer>
 // CHECK:    <key>file</key><integer>0</integer>
 // CHECK:   </dict>
@@ -5124,7 +5699,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <key>kind</key><string>event</string>
 // CHECK:      <key>location</key>
 // CHECK:      <dict>
-// CHECK:       <key>line</key><integer>274</integer>
+// CHECK:       <key>line</key><integer>292</integer>
 // CHECK:       <key>col</key><integer>13</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
@@ -5132,12 +5707,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <array>
 // CHECK:        <array>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>274</integer>
+// CHECK:          <key>line</key><integer>292</integer>
 // CHECK:          <key>col</key><integer>13</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>274</integer>
+// CHECK:          <key>line</key><integer>292</integer>
 // CHECK:          <key>col</key><integer>15</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
@@ -5157,12 +5732,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>start</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>274</integer>
+// CHECK:            <key>line</key><integer>292</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>274</integer>
+// CHECK:            <key>line</key><integer>292</integer>
 // CHECK:            <key>col</key><integer>4</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -5170,12 +5745,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>end</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>275</integer>
+// CHECK:            <key>line</key><integer>293</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>275</integer>
+// CHECK:            <key>line</key><integer>293</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -5191,12 +5766,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>start</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>275</integer>
+// CHECK:            <key>line</key><integer>293</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>275</integer>
+// CHECK:            <key>line</key><integer>293</integer>
 // CHECK:            <key>col</key><integer>3</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -5204,12 +5779,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:         <key>end</key>
 // CHECK:          <array>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>275</integer>
+// CHECK:            <key>line</key><integer>293</integer>
 // CHECK:            <key>col</key><integer>18</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
 // CHECK:           <dict>
-// CHECK:            <key>line</key><integer>275</integer>
+// CHECK:            <key>line</key><integer>293</integer>
 // CHECK:            <key>col</key><integer>21</integer>
 // CHECK:            <key>file</key><integer>0</integer>
 // CHECK:           </dict>
@@ -5221,7 +5796,7 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <key>kind</key><string>event</string>
 // CHECK:      <key>location</key>
 // CHECK:      <dict>
-// CHECK:       <key>line</key><integer>275</integer>
+// CHECK:       <key>line</key><integer>293</integer>
 // CHECK:       <key>col</key><integer>18</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
@@ -5229,12 +5804,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      <array>
 // CHECK:        <array>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>275</integer>
+// CHECK:          <key>line</key><integer>293</integer>
 // CHECK:          <key>col</key><integer>18</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
 // CHECK:         <dict>
-// CHECK:          <key>line</key><integer>275</integer>
+// CHECK:          <key>line</key><integer>293</integer>
 // CHECK:          <key>col</key><integer>21</integer>
 // CHECK:          <key>file</key><integer>0</integer>
 // CHECK:         </dict>
@@ -5242,12 +5817,12 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:      </array>
 // CHECK:      <key>depth</key><integer>0</integer>
 // CHECK:      <key>extended_message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:      <key>message</key>
-// CHECK:      <string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:      <string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:     </dict>
 // CHECK:    </array>
-// CHECK:    <key>description</key><string>Incompatible pointer types assigning to 'NSArray<NSNumber *> *' from 'NSArray<NSString *> *'</string>
+// CHECK:    <key>description</key><string>Conversion from value of type 'NSArray<NSString *> *' to incompatible type 'NSArray<NSNumber *> *'</string>
 // CHECK:    <key>category</key><string>Core Foundation/Objective-C</string>
 // CHECK:    <key>type</key><string>Generics</string>
 // CHECK:    <key>check_name</key><string>alpha.osx.cocoa.ObjCGenerics</string>
@@ -5256,10 +5831,9 @@ void testMistmatchedTypeCast(MutableArra
 // CHECK:   <key>issue_hash</key><string>2</string>
 // CHECK:   <key>location</key>
 // CHECK:   <dict>
-// CHECK:    <key>line</key><integer>275</integer>
+// CHECK:    <key>line</key><integer>293</integer>
 // CHECK:    <key>col</key><integer>18</integer>
 // CHECK:    <key>file</key><integer>0</integer>
 // CHECK:   </dict>
 // CHECK:   </dict>
 // CHECK:  </array>
-