From 31612065343bdaef0efbe81e0ef5c6ba6667cf1d Mon Sep 17 00:00:00 2001
From: Josh Berdine <jjb@fb.com>
Date: Fri, 30 Jun 2017 18:00:56 -0700
Subject: [PATCH] [quandary] Continue past unbindable return values

Summary:
In C++ it may happen that a procedure return 'variable' is an access
path that cannot be translated to Hil. For now just skip these instead
of crashing.

Reviewed By: mbouaziz

Differential Revision: D5356134

fbshipit-source-id: 977dfba
---
 infer/src/quandary/TaintAnalysis.ml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/infer/src/quandary/TaintAnalysis.ml b/infer/src/quandary/TaintAnalysis.ml
index db938a860..302acb34e 100644
--- a/infer/src/quandary/TaintAnalysis.ml
+++ b/infer/src/quandary/TaintAnalysis.ml
@@ -262,8 +262,11 @@ module Make (TaintSpecification : TaintSpec.S) = struct
 
       let get_caller_ap formal_ap =
         let apply_return ret_ap = match ret_opt with
-          | Some base_var -> AccessPath.with_base base_var ret_ap
-          | None -> failwith "Have summary for retval, but no ret id to bind it to!" in
+          | Some base_var -> Some (AccessPath.with_base base_var ret_ap)
+          | None ->
+              Logging.internal_error "Have summary for retval, but no ret id to bind it to: %a@\n"
+                AccessPath.pp ret_ap;
+              None in
         let get_actual_ap formal_index =
           Option.value_map
             ~f:(function
@@ -280,7 +283,7 @@ module Make (TaintSpecification : TaintSpec.S) = struct
         match base_var with
         | Var.ProgramVar pvar ->
             if Pvar.is_return pvar
-            then Some (apply_return formal_ap)
+            then apply_return formal_ap
             else Some formal_ap
         | Var.LogicalVar id when Ident.is_footprint id ->
             begin