From 9d877652d139f577bc43c460d8801ce5460013d7 Mon Sep 17 00:00:00 2001
From: Daiva Naudziuniene <daivan@fb.com>
Date: Mon, 28 Jun 2021 02:50:47 -0700
Subject: [PATCH] [pulse][objc][nil] Improve error message for nil insertion
 into collection and nil block call issues

Reviewed By: skcho

Differential Revision: D29391031

fbshipit-source-id: 3113d7876
---
 infer/src/pulse/PulseDiagnostic.ml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/infer/src/pulse/PulseDiagnostic.ml b/infer/src/pulse/PulseDiagnostic.ml
index 8dd0ca0bf..cc5c00701 100644
--- a/infer/src/pulse/PulseDiagnostic.ml
+++ b/infer/src/pulse/PulseDiagnostic.ml
@@ -68,13 +68,19 @@ let get_message diagnostic =
       match invalidation with
       | ConstantDereference i when IntLit.equal i IntLit.zero ->
           (* Special error message for nullptr dereference *)
-          let issue_kind_str =
-            match must_be_valid_reason with
-            | Some (Invalidation.SelfOfNonPODReturnMethod non_pod_typ) ->
+          let nil_issue_kind = function
+            | Invalidation.SelfOfNonPODReturnMethod non_pod_typ ->
                 F.asprintf "undefined behaviour caused by nil messaging of non-pod return type (%a)"
                   (Typ.pp Pp.text) non_pod_typ
-            | _ ->
-                F.sprintf "null pointer dereference"
+            | Invalidation.InsertionIntoCollection ->
+                F.sprintf "nil insertion into collection"
+            | Invalidation.BlockCall ->
+                F.sprintf "nil block call"
+          in
+          let issue_kind_str =
+            Option.value_map must_be_valid_reason
+              ~default:(F.sprintf "null pointer dereference")
+              ~f:nil_issue_kind
           in
           let pp_access_trace fmt (trace : Trace.t) =
             if same_trace then ()