[objc] Add empty annotations that correspond to the captured variables added as formals of blocks

Summary:
We add captured as formals in ObjC blocks, but we were missing adding annotations (at least empty ones) for those new formals. This means that the annotations that we do have for the formals of blocks were not treated correctly, because the list of formals and annotations was mismatched.
This diff fixes it.

It also removes those dummy annotations for the captured in the Parameter Not Null Checked checker.

Reviewed By: skcho

Differential Revision: D32724769

fbshipit-source-id: f7a6ddab10

Author: dulmarod

infer/src/checkers/ParameterNotNullChecked.ml

@@ -191,25 +191,37 @@ end
 
 module Analyzer = AbstractInterpreter.MakeWTO (TransferFunctions)
 
-let formals_not_captured attributes =
-  let is_not_captured (formal, _) =
-    not
-      (List.exists
-         ~f:(fun ({name} : CapturedVar.t) -> Mangled.equal formal name)
-         attributes.ProcAttributes.captured )
+let formals_annotations_not_captured attributes =
+  let formals = attributes.ProcAttributes.formals in
+  let param_annotations = attributes.ProcAttributes.method_annotation.params in
+  let formals_annotations_not_captured not_captured (formal, typ) annotation =
+    if
+      not
+        (List.exists
+           ~f:(fun ({name} : CapturedVar.t) -> Mangled.equal formal name)
+           attributes.ProcAttributes.captured )
+    then ((formal, typ), annotation) :: not_captured
+    else not_captured
   in
-  List.filter ~f:is_not_captured attributes.ProcAttributes.formals
+  let annotations_not_captured_opt =
+    List.fold2 ~f:formals_annotations_not_captured ~init:[] formals param_annotations
+  in
+  match annotations_not_captured_opt with
+  | List.Or_unequal_lengths.Ok not_captured ->
+      not_captured |> List.rev |> List.unzip
+  | List.Or_unequal_lengths.Unequal_lengths ->
+      (formals, param_annotations)
 
 
-let init_block_params attributes formals_not_captured initBlockParams =
-  let add_non_nullable_block blockParams annotation (formal, _) =
+let init_block_params formals_not_captured annotations_not_captured initBlockParams =
+  let add_non_nullable_block blockParams (formal, _) annotation =
     if is_block_param formals_not_captured formal && Annotations.ia_is_nonnull annotation then
       BlockParams.add formal blockParams
     else blockParams
   in
-  let annotations = attributes.ProcAttributes.method_annotation.params in
   match
-    List.fold2 annotations formals_not_captured ~init:initBlockParams ~f:add_non_nullable_block
+    List.fold2 formals_not_captured annotations_not_captured ~init:initBlockParams
+      ~f:add_non_nullable_block
   with
   | List.Or_unequal_lengths.Ok blockParams ->
       blockParams
@@ -229,8 +241,12 @@ let init_block_param_trace_info attributes formals_not_captured traceInfo =
 
 let checker ({IntraproceduralAnalysis.proc_desc} as analysis_data') =
   let attributes = Procdesc.get_attributes proc_desc in
-  let formals_not_captured = formals_not_captured attributes in
-  let initial_blockParams = init_block_params attributes formals_not_captured BlockParams.empty in
+  let formals_not_captured, annotations_not_captured =
+    formals_annotations_not_captured attributes
+  in
+  let initial_blockParams =
+    init_block_params formals_not_captured annotations_not_captured BlockParams.empty
+  in
   let initTraceInfo = init_block_param_trace_info attributes formals_not_captured [] in
   let initial =
     Domain.singleton

infer/src/clang/cMethod_trans.ml

@@ -222,11 +222,6 @@ let create_local_procdesc ?(set_objc_accessor_attr = false) ?(record_lambda_capt
   let create_new_procdesc () =
     let all_params = Option.to_list ms.CMethodSignature.class_param @ ms.CMethodSignature.params in
     let has_added_return_param = ms.CMethodSignature.has_added_return_param in
-    let method_annotation =
-      let return = snd ms.CMethodSignature.ret_type in
-      let params = List.map ~f:(fun ({annot} : CMethodSignature.param_type) -> annot) all_params in
-      Annot.Method.{return; params}
-    in
     let formals =
       List.map ~f:(fun ({name; typ} : CMethodSignature.param_type) -> (name, typ)) all_params
     in
@@ -235,7 +230,16 @@ let create_local_procdesc ?(set_objc_accessor_attr = false) ?(record_lambda_capt
       if is_cpp_lambda_call_operator then []
       else List.map ~f:(fun {CapturedVar.name; typ} -> (name, typ)) captured_mangled
     in
+    let captured_annotations =
+      List.init (List.length captured_as_formals) ~f:(fun _ -> Annot.Item.empty)
+    in
     let formals = captured_as_formals @ formals in
+    let method_annotation =
+      let return = snd ms.CMethodSignature.ret_type in
+      let params = List.map ~f:(fun ({annot} : CMethodSignature.param_type) -> annot) all_params in
+      let all_params = captured_annotations @ params in
+      Annot.Method.{return; params= all_params}
+    in
     let const_formals =
       get_const_params_indices ~shift:(List.length captured_as_formals) all_params
     in

infer/tests/codetoanalyze/objc/parameter-not-null-checked/Blocks_as_parameters.m

@@ -94,4 +94,21 @@ - (void)uploadTaskWithRequestOk:(NSURLRequest*)urlRequest
   }];
 }
 
+typedef void (^AnnotateBlock)(const char* key, id value);
+typedef void (^AnnotateSyncBlock)(AnnotateBlock annotate);
+
+void AnnotateSync(id flowId, NS_NOESCAPE AnnotateSyncBlock block) {}
+
++ (void)startWithSessionOk:(id)session video:(id)video {
+  NSString* const videoID = @"";
+  NSString* const flowId = @"";
+
+  NSString* const entryPointType = @"";
+
+  AnnotateSync(flowId, ^(AnnotateBlock _Nonnull annotate) {
+    annotate("entry_point_type", entryPointType);
+    annotate("media_id", videoID);
+  });
+}
+
 @end