[swift] Fix redundant dereferencing of Swift object pointers in conditional merge points

Reviewed By: ngorogiannis

Differential Revision: D100999013

fbshipit-source-id: 1f545ec0074377490d12d03ad684f0cc3a84f0bd

Author: dulmarod

infer/src/llvm/Llair2Textual.ml

@@ -210,12 +210,10 @@ let add_deref ~proc_state ?from_call exp loc =
   | Textual.Exp.Var id -> (
       let id_data = IdentMap.find_opt id proc_state.ProcState.ids_move in
       match id_data with
-      | Some {loaded_var= true} ->
+      | Some {loaded_var= true} | Some {deref_needed= false} ->
           ([], exp)
       | Some {deref_needed= true} ->
           add_load_instr
-      | Some {typ= Some {typ= Textual.Typ.Ptr _}} ->
-          add_load_instr
       | _ ->
           ([], exp) )
   | _ ->
@@ -235,8 +233,6 @@ let should_add_deref ~proc_state exp =
           false
       | Some {deref_needed= true} ->
           true
-      | Some {typ= Some {typ= Textual.Typ.Ptr _}} ->
-          true
       | _ ->
           false )
   | _ ->

infer/tests/codetoanalyze/swift/frontend/base.swift.sil

@@ -1707,8 +1707,7 @@ define .plain_name = "init" $s5Hello5ParamC4size7qualityAcA8TestSizeVSg_AA7Quali
       n151:*__infer_swift_type<TSa> = load &var19 @[67:30]
       n152:*__infer_swift_type<Ts12_ArrayBufferV> = load n151.__infer_swift_type<TSa>.field_0 @[67:30]
       n153:*__infer_swift_type<Ts14_BridgeStorageV> = load n152.__infer_swift_type<Ts12_ArrayBufferV>.field_0 @[67:30]
-      n150 = load n146 @[67:30]
-      store n153.__infer_swift_type<Ts14_BridgeStorageV>.field_0 <- n150 @[67:30]
+      store n153.__infer_swift_type<Ts14_BridgeStorageV>.field_0 <- n146 @[67:30]
       n157 = $sSS21_builtinStringLiteral17utf8CodeUnitCount7isASCIISSBp_BwBi1_tcfC("_", 1, 1) @[67:72]
       jmp 113::ret @[67:72]
 

infer/tests/codetoanalyze/swift/frontend/rc_delegate.swift.sil

@@ -1570,8 +1570,7 @@ define .plain_name = "delegate.modify" .method_offset = "5" __infer_swift_type<$
       store &getelementptr_offset_1 <- 13 @[0:0]
       n7 = load &getelementptr_offset_1 @[0:0]
       n8 = $builtins.llvm_nondet() @[0:0]
-      n10 = load n8 @[0:0]
-      n12 = $builtins.llvm_dynamic_call(n7, n10, n5) @[0:0]
+      n12 = $builtins.llvm_dynamic_call(n7, n8, n5) @[0:0]
       jmp 12::ret @[0:0]
 
 } @?
@@ -1908,8 +1907,7 @@ define .plain_name = "delegate.modify" .method_offset = "5" __infer_swift_type<$
       store &getelementptr_offset_1 <- 13 @[0:0]
       n7 = load &getelementptr_offset_1 @[0:0]
       n8 = $builtins.llvm_nondet() @[0:0]
-      n10 = load n8 @[0:0]
-      n12 = $builtins.llvm_dynamic_call(n7, n10, n5) @[0:0]
+      n12 = $builtins.llvm_dynamic_call(n7, n8, n5) @[0:0]
       jmp 12::ret @[0:0]
 
 } @?

infer/tests/codetoanalyze/swift/frontend/segfault.swift.sil

@@ -71,8 +71,7 @@ define .plain_name = "test_getelementptr_segfault" $s5Hello27test_getelementptr_
       jmp 33::ret @[4:9]
 
   #33::ret: @[4:9]
-      n45:*__infer_tuple_class<*__infer_swift_type<TSS>,*__infer_swift_type<TSS>> = load n40 @[4:9]
-      n46:*__infer_swift_type<TSS> = load n45.__infer_tuple_class<*__infer_swift_type<TSS>,*__infer_swift_type<TSS>>.__infer_tuple_field_0 @[4:9]
+      n46:*__infer_swift_type<TSS> = load n40.__infer_tuple_class<*__infer_swift_type<TSS>,*__infer_swift_type<TSS>>.__infer_tuple_field_0 @[4:9]
       n47:*__infer_swift_type<Ts11_StringGutsV> = load n46.__infer_swift_type<TSS>.field_0 @[4:9]
       n48 = n47.__infer_swift_type<Ts11_StringGutsV>.field_0 @[4:9]
       n51:*__infer_swift_type<Ts13_StringObjectV> = load n48 @[4:9]
@@ -92,8 +91,7 @@ define .plain_name = "test_getelementptr_segfault" $s5Hello27test_getelementptr_
       jmp 42::ret @[4:14]
 
   #42::ret: @[4:14]
-      n62:*__infer_tuple_class<*__infer_swift_type<TSS>,*__infer_swift_type<TSS>> = load n40 @[4:14]
-      n63:*__infer_swift_type<TSS> = load n62.__infer_tuple_class<*__infer_swift_type<TSS>,*__infer_swift_type<TSS>>.__infer_tuple_field_1 @[4:14]
+      n63:*__infer_swift_type<TSS> = load n40.__infer_tuple_class<*__infer_swift_type<TSS>,*__infer_swift_type<TSS>>.__infer_tuple_field_1 @[4:14]
       n64:*__infer_swift_type<Ts11_StringGutsV> = load n63.__infer_swift_type<TSS>.field_0 @[4:14]
       n65 = n64.__infer_swift_type<Ts11_StringGutsV>.field_0 @[4:14]
       n68:*__infer_swift_type<Ts13_StringObjectV> = load n65 @[4:14]