From e1a2c0beb9b7b23bb35f8a96d36d965595c6da7a Mon Sep 17 00:00:00 2001
From: Avik Chaudhuri <avik@fb.com>
Date: Tue, 31 Jan 2017 14:11:33 -0800
Subject: [PATCH] locationless bool crash

Summary:
We use BoolT.t in various places. When these are part of errors, their
locationlessness causes an assertion failure.

Will follow up with a more thorough audit of the locationless Primitive
type constructor `t` (also available on NumT, StrT, ...).

Ref https://github.com/facebook/flow/issues/3147

Reviewed By: samwgoldman

Differential Revision: D4490639

fbshipit-source-id: 23f6531e24acf0bd7f8f36fbe9defd5876736ee4
---
 src/typing/statement.ml                           | 14 ++++++++------
 tests/predicates-declared/predicates-declared.exp |  5 +++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/typing/statement.ml b/src/typing/statement.ml
index 77e6f619889..d710e2f55c2 100644
--- a/src/typing/statement.ml
+++ b/src/typing/statement.ml
@@ -4401,6 +4401,7 @@ and predicates_of_condition cx e = Ast.(Expression.(
 
   (* inspect a typeof equality test *)
   let typeof_test loc sense arg typename str_loc =
+    let bool = BoolT.at loc in
     match refinable_lvalue arg with
     | Some name, t ->
         let pred = match typename with
@@ -4413,12 +4414,12 @@ and predicates_of_condition cx e = Ast.(Expression.(
         | _ -> None
         in
         begin match pred with
-        | Some pred -> result BoolT.t name t pred sense
+        | Some pred -> result bool name t pred sense
         | None ->
           Flow_js.add_output cx Flow_error.(EInvalidTypeof (str_loc, typename));
-          empty_result (BoolT.at loc)
+          empty_result bool
         end
-    | None, _ -> empty_result (BoolT.at loc)
+    | None, _ -> empty_result bool
   in
 
   let sentinel_prop_test loc ~sense ~strict expr val_t =
@@ -4635,7 +4636,7 @@ and predicates_of_condition cx e = Ast.(Expression.(
       eq_test loc ~sense:false ~strict:true left right
 
   (* Array.isArray(expr) *)
-  | _, Call {
+  | loc, Call {
       Call.callee = callee_loc, Member {
         Member._object = (_, Identifier (_, "Array") as o);
         property = Member.PropertyIdentifier (prop_loc, "isArray");
@@ -4654,12 +4655,13 @@ and predicates_of_condition cx e = Ast.(Expression.(
         Flow.flow cx (obj_t, GetPropT (reason, Named (prop_reason, "isArray"), t))
       ) in
       Hashtbl.replace (Context.type_table cx) prop_loc fn_t;
+      let bool = BoolT.at loc in
 
       match refinable_lvalue arg with
       | Some name, t ->
-          result BoolT.t name t ArrP true
+          result bool name t ArrP true
       | None, _ ->
-          empty_result BoolT.t
+          empty_result bool
     )
 
   (* test1 && test2 *)
diff --git a/tests/predicates-declared/predicates-declared.exp b/tests/predicates-declared/predicates-declared.exp
index 8a4c47e59c3..60d4d9afba0 100644
--- a/tests/predicates-declared/predicates-declared.exp
+++ b/tests/predicates-declared/predicates-declared.exp
@@ -62,8 +62,9 @@ sanity-pred-with-body.js:6
 
 sanity-return-type.js:3
   3: declare function f2(x: mixed): string %checks(Array.isArray(x));
-                                    ^^^^^^ string. This type is incompatible with
-boolean
+                                                   ^^^^^^^^^^^^^^^^ boolean. This type is incompatible with
+  3: declare function f2(x: mixed): string %checks(Array.isArray(x));
+                                    ^^^^^^ string
 
 
 Found 9 errors