Revert D85155666

Summary: Reverts changes in D85155666 whilst we investigate a memory regression

Reviewed By: andrewjkennedy, francesco-zappa-nardelli

Differential Revision: D90175268

fbshipit-source-id: ebf88f50f746696a1063109bbcaf66106933637c

Author: Michael Thomas

hphp/hack/hhi/func_pointers.hhi

@@ -7,7 +7,7 @@
  * LICENSE file in the "hack" directory of this source tree.
  *
  */
-<<file:__EnableUnstableFeatures('class_type','open_tuples', 'type_splat')>>
+<<file:__EnableUnstableFeatures('class_type')>>
 namespace HH {
 
   // The functions in this file are defined in HHVM and known to the
@@ -65,11 +65,10 @@ namespace HH {
    *
    * See http://docs.hhvm.com/hack/reference/function/HH.invariant/
    */
-  <<__NoAutoLikes>>
-  function invariant<Targs as (mixed...)>(
+  function invariant(
     \HH\FIXME\MISSING_PARAM_TYPE $condition,
-    \HH\TypedFormatString<\PlainSprintf, Targs> $f,
-    ...Targs $f_args
+    FormatString<\PlainSprintf> $f,
+    mixed ...$f_args
   )[]: void; // becomes:
   // if (!(<condition>)) { // an Exception is thrown
   //   invariant_violation('sprintf format: %s', 'string', ...);

hphp/hack/hhi/printf.hhi

@@ -7,7 +7,7 @@
  * LICENSE file in the "hack" directory of this source tree.
  *
  */
-<<file: __EnableUnstableFeatures('open_tuples', 'type_splat')>>
+
 namespace {
 
   /**
@@ -95,21 +95,21 @@ namespace {
    * If possible, upgrade to \HH\Lib\Str\format().
    * This uses the far stricter \HH\Lib\Str\SprintfFormat type.
    */
-  <<__PHPStdLib, __NoAutoLikes>>
-  function sprintf<Targs as (mixed...)>(
-    \HH\TypedFormatString<PlainSprintf,Targs> $fmt,
-    ...Targs $fmt_args
+  <<__PHPStdLib>>
+  function sprintf(
+    \HH\FormatString<PlainSprintf> $fmt,
+    HH\FIXME\MISSING_PARAM_TYPE ...$fmt_args
   )[]: string;
   /**
    * printf uses PlainSprintf as its format string.
    * This type is very wide and will allow many incorrect calls to typecheck.
    * If possible, upgrade to \HH\Lib\Str\format().
    * This uses the far stricter \HH\Lib\Str\SprintfFormat type.
    */
-  <<__PHPStdLib, __NoAutoLikes>>
-  function printf<Targs as (mixed...)>(
-    \HH\TypedFormatString<PlainSprintf,Targs> $fmt,
-    ...Targs $fmt_args
+  <<__PHPStdLib>>
+  function printf(
+    \HH\FormatString<PlainSprintf> $fmt,
+    HH\FIXME\MISSING_PARAM_TYPE ...$fmt_args
   ): int;
 
 }
@@ -119,10 +119,9 @@ namespace HH {
   // Results in an \HH\InvariantException whose message is the result of
   // calling sprintf with the arguments given this function.
   // Equivalent to invariant(false, $fmt, ...$fmt_args).
-  <<__NoAutoLikes>>
-  function invariant_violation<Targs as (mixed...)>(
-    TypedFormatString<\PlainSprintf,Targs> $fmt,
-    ...Targs $fmt_args
+  function invariant_violation(
+    FormatString<\PlainSprintf> $fmt,
+    mixed ...$fmt_args
   )[]: noreturn;
 
 }

hphp/hack/hhi/typenames.hhi

@@ -1,9 +1,7 @@
 <?hh
-<<file: __EnableUnstableFeatures('open_tuples')>>
-namespace HH {
-  newtype FormatString<T> as TypedFormatString<T, (mixed...)> = string;
 
-  newtype TypedFormatString<T, Targs as (mixed...)> as string = string;
+namespace HH {
+  newtype FormatString<T> as string = string;
 
   <<__NoAutoDynamic>>
   newtype FunctionRef<T> as T = T;

hphp/hack/src/naming/naming_special_names.ml

@@ -30,12 +30,8 @@ module Classes = struct
 
   let cHHFormatString = "\\HH\\FormatString"
 
-  let cHHTypedFormatString = "\\HH\\TypedFormatString"
-
   let is_format_string x = String.equal x cHHFormatString
 
-  let is_typed_format_string x = String.equal x cHHTypedFormatString
-
   let cHH_BuiltinEnum = "\\HH\\BuiltinEnum"
 
   let cHH_BuiltinEnumClass = "\\HH\\BuiltinEnumClass"

hphp/hack/src/typing/typing.ml

@@ -3529,33 +3529,7 @@ end = struct
      *)
     | Null -> make_result env p Aast.Null (MakeType.null (Reason.witness p))
     | String s ->
-      let (env, expected) =
-        Env_help.expand_expected_opt
-          ~strip_supportdyn:false
-          ~pessimisable_builtin:false
-          env
-          expected
-      in
-      begin
-        match expected with
-        | Some (_pos, _ur, _, _, Tnewtype (fs, [ty; _], _))
-          when SN.Classes.is_typed_format_string fs ->
-          let (env, fpl) = Typing_exts.parse_printf_string env s p ty in
-          let tuple_ty =
-            Typing_make_type.tuple
-              (Reason.witness p)
-              (List.map fpl ~f:(fun fp -> fp.fp_type))
-          in
-          let string_ty =
-            mk
-              ( Reason.witness p,
-                Tnewtype (fs, [ty; tuple_ty], MakeType.string (Reason.witness p))
-              )
-          in
-          make_result env p (Aast.String s) string_ty
-        | _ ->
-          make_result env p (Aast.String s) (MakeType.string (Reason.witness p))
-      end
+      make_result env p (Aast.String s) (MakeType.string (Reason.witness p))
     | String2 idl ->
       let (env, tel) = string2 env idl in
       make_result env p (Aast.String2 tel) (MakeType.string (Reason.witness p))
@@ -12206,42 +12180,17 @@ end = struct
         (Aast.Binop { bop; lhs = te1; rhs = te2 })
         (MakeType.bool (Reason.logic_ret p))
     | _ ->
-      let (env, expected) =
-        match bop with
-        | Ast_defs.Dot ->
-          Env_help.expand_expected_opt
-            ~strip_supportdyn:false
-            ~pessimisable_builtin:false
-            env
-            expected
-        | _ -> (env, None)
-      in
-      let (env, expected) =
-        match expected with
-        | Some (pos, ur, _, _, Tnewtype (fs, [ty; _], bound))
-          when SN.Classes.is_typed_format_string fs ->
-          let (env, fresh_ty) = Env.fresh_type env p in
-          let expected =
-            ExpectedTy.make
-              pos
-              ur
-              (mk
-                 (Reason.concat_operand p, Tnewtype (fs, [ty; fresh_ty], bound)))
-          in
-          (env, Some expected)
-        | _ -> (env, None)
-      in
       let (env, te1, ty1) =
         Expr.expr
-          ~expected
+          ~expected:None
           ~ctxt:Expr.Context.{ default with check_defined }
           env
           e1
       in
       let (env, te2, ty2) =
         check_e2
           (Expr.expr
-             ~expected
+             ~expected:None
              ~ctxt:Expr.Context.{ default with check_defined })
           env
           e2

hphp/hack/src/typing/typing_arithmetic.ml

@@ -575,32 +575,7 @@ let binop p env bop p1 te1 ty1 p2 te2 ty2 =
     in
     let (env, err_opt1) = sub_arraykey env p1 ty1 in
     let (env, err_opt2) = sub_arraykey env p2 ty2 in
-    let r = Reason.concat_ret p in
-    let ty =
-      begin
-        (* Special case for TypedFormatString operands.
-         * If  e1 has type TypedFormatString<I,(t1,...,tn)>
-         * and e2 has type TypedFormatString<I,(u1,...,um)>
-         * then e1 . e2 has type TypedFormatString<I,(t1,...,tn,u1,...,um)>
-         *)
-        match (get_node ty1, get_node ty2) with
-        | ( Tnewtype (fs1, [ty1; tuple1], _),
-            Tnewtype (fs2, [ty2; tuple2], bound) )
-          when SN.Classes.is_typed_format_string fs1
-               && SN.Classes.is_typed_format_string fs2
-               && Typing_defs.equal_locl_ty ty1 ty2 -> begin
-          match (get_node tuple1, get_node tuple2) with
-          | ( Ttuple { t_required = req1; t_optional = []; t_extra = _ },
-              Ttuple { t_required = req2; t_optional = []; t_extra = _ } ) ->
-            mk
-              ( r,
-                Tnewtype
-                  (fs1, [ty1; Typing_make_type.tuple r (req1 @ req2)], bound) )
-          | _ -> MakeType.string r
-        end
-        | _ -> MakeType.string r
-      end
-    in
+    let ty = MakeType.string (Reason.concat_ret p) in
     make_result env te1 err_opt1 te2 err_opt2 ty
   | Ast_defs.Barbar
   | Ast_defs.Ampamp ->

hphp/hack/src/typing/typing_exts.mli

@@ -28,10 +28,3 @@ val retype_magic_func :
   Typing_defs.locl_fun_type ->
   Nast.argument list ->
   Typing_env_types.env * Typing_defs.locl_fun_type
-
-val parse_printf_string :
-  Typing_env_types.env ->
-  string ->
-  Pos.t ->
-  Typing_defs.locl_ty ->
-  Typing_env_types.env * Typing_defs.locl_fun_params

hphp/hack/test/hover/invariant.php.exp

@@ -1,7 +1,7 @@
-function invariant<Targs as (mixed...)>(
+function invariant(
   HH\FIXME\MISSING_PARAM_TYPE $condition,
-  HH\TypedFormatString<PlainSprintf, Targs> $f,
-  ...Targs $f_args
+  HH\FormatString<PlainSprintf> $f,
+  mixed $f_args...
 )[]: void
 ---
 Call `invariant_violation` if the condition is false.

hphp/hack/test/tast/pseudofunctions.php.exp

@@ -81,19 +81,17 @@ Errors:
                    (Expr
                       ((noreturn), [19:3-25],
                        (Call
-                          { func =
-                            (((function<Targs as (mixed...)>(HH\TypedFormatString<PlainSprintf, ()> $fmt, ...() $fmt_args)[]: noreturn)), [19:3-12], (Id ([19:3-12], "\\HH\\invariant_violation")));
-                            targs = [((()), ([19:3-12], Hwildcard))]; 
-                            args = [(Anormal ((HH\TypedFormatString<~PlainSprintf, ()>), [19:19-24], (String "foo")))]; 
+                          { func = (((function(HH\FormatString<PlainSprintf> $fmt, mixed $fmt_args...)[]: noreturn)), [19:3-12], (Id ([19:3-12], "\\HH\\invariant_violation"))); 
+                            targs = []; args = [(Anormal ((string), [19:19-24], (String "foo")))]; 
                             unpacked_arg = None }))))
                    ],
                  [([Pos.none], Noop)])));
              ([20:3-30],
               (Expr
                  ((noreturn), [20:3-29],
                   (Call
-                     { func = (((function<Targs as (mixed...)>(HH\TypedFormatString<PlainSprintf, ()> $fmt, ...() $fmt_args)[]: noreturn)), [20:3-22], (Id ([20:3-22], "\\HH\\invariant_violation")));
-                       targs = [((()), ([20:3-22], Hwildcard))]; args = [(Anormal ((HH\TypedFormatString<~PlainSprintf, ()>), [20:23-28], (String "foo")))]; 
+                     { func = (((function(HH\FormatString<PlainSprintf> $fmt, mixed $fmt_args...)[]: noreturn)), [20:3-22], (Id ([20:3-22], "\\HH\\invariant_violation"))); 
+                       targs = []; args = [(Anormal ((string), [20:23-28], (String "foo")))]; 
                        unpacked_arg = None }))))
              ]
            };

hphp/hack/test/typecheck/inout/pseudofunction_with_signature.php.exp

@@ -6,6 +6,10 @@ ERROR: File "pseudofunction_with_signature.php", line 9, characters 28-30:
 No class constant `T` in `dict` (Typing[4090])
   File "hackarray.hhi", line 32, characters 24-27:
   Declaration of `dict` is here
+ERROR: File "pseudofunction_with_signature.php", line 10, characters 16-23:
+Unexpected `inout` annotation for argument (Typing[4183])
+  File "printf.hhi", line 48, characters 40-41:
+  This is a normal parameter (does not have `inout`)
 ERROR: File "pseudofunction_with_signature.php", line 11, characters 11-18:
 Unexpected `inout` annotation for argument (Typing[4183])
   File "stdlib/builtins_variable.hhi", line 35, characters 35-38: