From dd9a10f07ad08dd04751b10b64c621589a527dc4 Mon Sep 17 00:00:00 2001 From: Jan Oravec Date: Fri, 20 Jul 2018 13:50:40 -0700 Subject: [PATCH] Remove non-MSRV implementation and interp-only options Summary: MSRV works just fine, so remove the legacy implementation. Also, remove options that force interpreting of FCallM/RetM opcodes. This was used only for testing purposes and the inout implementation is considered to be stable now. It will be soon merged into FCall anyway. Reviewed By: paulbiss, alexeyt Differential Revision: D8924869 fbshipit-source-id: 0e9d6d713766542efa46ebc0cf8146e8cc8b43ad --- hphp/compiler/analysis/emitter.cpp | 1 - hphp/compiler/option.cpp | 3 - hphp/hack/src/hhbc/emit_body.ml | 3 +- hphp/hack/src/hhbc/emit_expression.ml | 8 +- hphp/hack/src/hhbc/emit_inout_function.ml | 22 +-- hphp/hack/src/hhbc/emit_inout_helpers.ml | 33 +--- hphp/hack/src/hhbc/hhbc_options.ml | 8 - hphp/hack/src/hhbc/try_finally_rewriter.ml | 7 +- hphp/hhbbc/main.cpp | 2 - hphp/runtime/base/execution-context.cpp | 6 +- hphp/runtime/base/runtime-option.h | 5 - hphp/runtime/base/unit-cache.cpp | 1 - hphp/runtime/vm/event-hook.cpp | 57 +++---- hphp/runtime/vm/interp-helpers.h | 1 - hphp/runtime/vm/jit/irgen-call.cpp | 12 -- hphp/runtime/vm/jit/irgen-func-prologue.cpp | 2 +- hphp/runtime/vm/jit/irgen-ret.cpp | 5 - hphp/runtime/vm/repo-global-data.h | 7 - hphp/test/one_bit_refcount_failing_slow | 4 +- .../inout/{tuple/tests => }/abstract-method.php | 0 .../{tuple/tests => }/abstract-method.php.expect | 0 .../tests => }/abstract-method.php.hphp_opts | 0 .../{tuple/tests => }/abstract-method.php.opts | 0 .../slow/inout/{tuple/tests => }/autoloader.php | 0 .../inout/{tuple/tests => }/autoloader.php.expectf | 0 .../slow/inout/{tuple/tests => }/bad-abstract.php | 0 .../{tuple/tests => }/bad-abstract.php.expectf | 0 .../{tuple/tests => }/bad-async-generator.php | 0 .../tests => }/bad-async-generator.php.expectf | 0 .../slow/inout/{tuple/tests => }/bad-async.php | 0 .../inout/{tuple/tests => }/bad-async.php.expectf | 0 .../slow/inout/{tuple/tests => }/bad-call-1.php | 0 .../{tuple/tests => }/bad-call-1.php.expectregex | 0 .../slow/inout/{tuple/tests => }/bad-call-10.php | 0 .../{tuple/tests => }/bad-call-10.php.expectf | 0 .../slow/inout/{tuple/tests => }/bad-call-11.php | 0 .../{tuple/tests => }/bad-call-11.php.expectf | 0 .../slow/inout/{tuple/tests => }/bad-call-12.php | 0 .../{tuple/tests => }/bad-call-12.php.expectf | 0 .../slow/inout/{tuple/tests => }/bad-call-13.php | 0 .../{tuple/tests => }/bad-call-13.php.expectf | 0 .../slow/inout/{tuple/tests => }/bad-call-14.php | 0 .../{tuple/tests => }/bad-call-14.php.expectf | 0 .../slow/inout/{tuple/tests => }/bad-call-15.php | 0 .../{tuple/tests => }/bad-call-15.php.expectf | 0 .../slow/inout/{tuple/tests => }/bad-call-2.php | 0 .../{tuple/tests => }/bad-call-2.php.expectregex | 0 .../slow/inout/{tuple/tests => }/bad-call-3.php | 0 .../{tuple/tests => }/bad-call-3.php.expectregex | 0 .../slow/inout/{tuple/tests => }/bad-call-4.php | 0 .../{tuple/tests => }/bad-call-4.php.expectregex | 0 .../slow/inout/{tuple/tests => }/bad-call-5.php | 0 .../{tuple/tests => }/bad-call-5.php.expectregex | 0 .../slow/inout/{tuple/tests => }/bad-call-6.php | 0 .../{tuple/tests => }/bad-call-6.php.expectregex | 0 .../slow/inout/{tuple/tests => }/bad-call-7.php | 0 .../{tuple/tests => }/bad-call-7.php.expectregex | 0 .../slow/inout/{tuple/tests => }/bad-call-8.php | 0 .../{tuple/tests => }/bad-call-8.php.expectregex | 0 .../slow/inout/{tuple/tests => }/bad-call-9.php | 0 .../{tuple/tests => }/bad-call-9.php.expectregex | 0 .../slow/inout/{tuple/tests => }/bad-class.php | 0 .../{tuple/tests => }/bad-class.php.expectregex | 0 .../inout/{tuple/tests => }/bad-constructor.php | 0 .../{tuple/tests => }/bad-constructor.php.expectf | 0 .../slow/inout/{tuple/tests => }/bad-decl-1.php | 0 .../{tuple/tests => }/bad-decl-1.php.expectregex | 0 .../slow/inout/{tuple/tests => }/bad-decl-2.php | 0 .../{tuple/tests => }/bad-decl-2.php.expectregex | 0 .../test/slow/inout/{tuple/tests => }/bad-func.php | 0 .../{tuple/tests => }/bad-func.php.expectregex | 0 .../slow/inout/{tuple/tests => }/bad-generator.php | 0 .../{tuple/tests => }/bad-generator.php.expectf | 0 .../slow/inout/{tuple/tests => }/bad-interface.php | 0 .../{tuple/tests => }/bad-interface.php.expectf | 0 .../slow/inout/{tuple/tests => }/bad-memoize.php | 0 .../{tuple/tests => }/bad-memoize.php.expectf | 0 .../inout/{tuple/tests => }/bad-mixed-mode-1.php | 0 .../{tuple/tests => }/bad-mixed-mode-1.php.expectf | 0 .../inout/{tuple/tests => }/bad-mixed-mode-2.php | 0 .../{tuple/tests => }/bad-mixed-mode-2.php.expectf | 0 .../{tuple/tests => }/bad-named-constructor.php | 0 .../tests => }/bad-named-constructor.php.expectf | 0 .../slow/inout/{tuple/tests => }/bad-parent-1.php | 0 .../{tuple/tests => }/bad-parent-1.php.expectf | 0 .../slow/inout/{tuple/tests => }/bad-parent-2.php | 0 .../{tuple/tests => }/bad-parent-2.php.expectf | 0 .../slow/inout/{tuple/tests => }/bad-parent-3.php | 0 .../{tuple/tests => }/bad-parent-3.php.expectf | 0 .../slow/inout/{tuple/tests => }/bad-parent-4.php | 0 .../{tuple/tests => }/bad-parent-4.php.expectf | 0 .../slow/inout/{tuple/tests => }/bad-parent-5.php | 0 .../{tuple/tests => }/bad-parent-5.php.expectf | 0 .../slow/inout/{tuple/tests => }/bad-parent-6.php | 0 .../{tuple/tests => }/bad-parent-6.php.expectf | 0 .../slow/inout/{tuple/tests => }/bad-trait-1.php | 0 .../{tuple/tests => }/bad-trait-1.php.expectf | 0 .../slow/inout/{tuple/tests => }/bad-trait-2.php | 0 .../{tuple/tests => }/bad-trait-2.php.expectf | 0 .../slow/inout/{tuple/tests => }/bad-trait-3.php | 0 .../{tuple/tests => }/bad-trait-3.php.expectf | 0 .../inout/{tuple/tests => }/builtin-interop.php | 0 .../{tuple/tests => }/builtin-interop.php.expect | 0 .../slow/inout/{tuple/tests => }/call-dynamic.php | 0 .../{tuple/tests => }/call-dynamic.php.expect | 0 .../slow/inout/{tuple/tests => }/call-static.php | 0 .../inout/{tuple/tests => }/call-static.php.expect | 0 hphp/test/slow/inout/{tuple/tests => }/closure.php | 0 .../inout/{tuple/tests => }/closure.php.expect | 0 .../slow/inout/{tuple/tests => }/complex-expr.php | 0 .../{tuple/tests => }/complex-expr.php.expect | 0 .../test/slow/inout/{tuple/tests => }/def-func.php | 0 .../inout/{tuple/tests => }/def-func.php.expect | 0 .../inout/{tuple/tests => }/double-array-get.php | 0 .../{tuple/tests => }/double-array-get.php.expect | 0 .../inout/{tuple/tests => }/fb-intercept-argc.php | 0 .../{tuple/tests => }/fb-intercept-argc.php.expect | 0 .../tests => }/fb-intercept-argc.php.hphp_opts | 0 .../{tuple/tests => }/fb-intercept-argc.php.opts | 0 .../{tuple/tests => }/fb-intercept-bad-handler.php | 0 .../fb-intercept-bad-handler.php.expectf | 0 .../fb-intercept-bad-handler.php.hphp_opts | 0 .../tests => }/fb-intercept-bad-handler.php.opts | 0 .../inout/{tuple/tests => }/fb-intercept-reffy.php | 0 .../tests => }/fb-intercept-reffy.php.expect | 0 .../tests => }/fb-intercept-reffy.php.hphp_opts | 0 .../{tuple/tests => }/fb-intercept-reffy.php.opts | 0 .../{tuple/tests => }/fb-intercept-wrapper.php | 0 .../tests => }/fb-intercept-wrapper.php.expect | 0 .../tests => }/fb-intercept-wrapper.php.hphp_opts | 0 .../tests => }/fb-intercept-wrapper.php.opts | 0 .../slow/inout/{tuple/tests => }/fb-intercept.php | 0 .../{tuple/tests => }/fb-intercept.php.expect | 0 .../{tuple/tests => }/fb-intercept.php.hphp_opts | 0 .../inout/{tuple/tests => }/fb-intercept.php.opts | 0 .../{tuple/tests => }/func-interop-dynamic.php | 0 .../tests => }/func-interop-dynamic.php.expect | 0 .../{tuple/tests => }/func-interop-static.php | 0 .../tests => }/func-interop-static.php.expect | 0 .../slow/inout/{tuple/tests => }/inout-decl.php | 0 .../inout/{tuple/tests => }/inout-decl.php.expect | 0 .../{tuple/tests => }/inout_param_mixed_hint.php | 0 .../tests => }/inout_param_mixed_hint.php.expect | 0 .../tests => }/inout_param_soft_mixed_hint.php | 0 .../inout_param_soft_mixed_hint.php.expect | 0 hphp/test/slow/inout/interp-callm/config.ini | 2 - .../inout/interp-callm/tests/abstract-method.php | 19 --- .../interp-callm/tests/abstract-method.php.expect | 1 - .../tests/abstract-method.php.hphp_opts | 1 - .../interp-callm/tests/abstract-method.php.opts | 1 - .../slow/inout/interp-callm/tests/autoloader.php | 38 ----- .../interp-callm/tests/autoloader.php.expectf | 1 - .../slow/inout/interp-callm/tests/bad-abstract.php | 9 -- .../interp-callm/tests/bad-abstract.php.expectf | 1 - .../interp-callm/tests/bad-async-generator.php | 5 - .../tests/bad-async-generator.php.expectf | 1 - .../slow/inout/interp-callm/tests/bad-async.php | 3 - .../inout/interp-callm/tests/bad-async.php.expectf | 1 - .../slow/inout/interp-callm/tests/bad-call-1.php | 3 - .../interp-callm/tests/bad-call-1.php.expectregex | 1 - .../slow/inout/interp-callm/tests/bad-call-10.php | 10 -- .../interp-callm/tests/bad-call-10.php.expectf | 1 - .../slow/inout/interp-callm/tests/bad-call-11.php | 10 -- .../interp-callm/tests/bad-call-11.php.expectf | 1 - .../slow/inout/interp-callm/tests/bad-call-12.php | 10 -- .../interp-callm/tests/bad-call-12.php.expectf | 1 - .../slow/inout/interp-callm/tests/bad-call-13.php | 5 - .../interp-callm/tests/bad-call-13.php.expectf | 1 - .../slow/inout/interp-callm/tests/bad-call-14.php | 10 -- .../interp-callm/tests/bad-call-14.php.expectf | 1 - .../slow/inout/interp-callm/tests/bad-call-15.php | 11 -- .../interp-callm/tests/bad-call-15.php.expectf | 1 - .../slow/inout/interp-callm/tests/bad-call-2.php | 3 - .../interp-callm/tests/bad-call-2.php.expectregex | 1 - .../slow/inout/interp-callm/tests/bad-call-3.php | 3 - .../interp-callm/tests/bad-call-3.php.expectregex | 1 - .../slow/inout/interp-callm/tests/bad-call-4.php | 3 - .../interp-callm/tests/bad-call-4.php.expectregex | 1 - .../slow/inout/interp-callm/tests/bad-call-5.php | 3 - .../interp-callm/tests/bad-call-5.php.expectregex | 1 - .../slow/inout/interp-callm/tests/bad-call-6.php | 3 - .../interp-callm/tests/bad-call-6.php.expectregex | 1 - .../slow/inout/interp-callm/tests/bad-call-7.php | 3 - .../interp-callm/tests/bad-call-7.php.expectregex | 1 - .../slow/inout/interp-callm/tests/bad-call-8.php | 3 - .../interp-callm/tests/bad-call-8.php.expectregex | 1 - .../slow/inout/interp-callm/tests/bad-call-9.php | 3 - .../interp-callm/tests/bad-call-9.php.expectregex | 1 - .../slow/inout/interp-callm/tests/bad-class.php | 3 - .../interp-callm/tests/bad-class.php.expectregex | 1 - .../inout/interp-callm/tests/bad-constructor.php | 5 - .../interp-callm/tests/bad-constructor.php.expectf | 1 - .../slow/inout/interp-callm/tests/bad-decl-1.php | 3 - .../interp-callm/tests/bad-decl-1.php.expectregex | 1 - .../slow/inout/interp-callm/tests/bad-decl-2.php | 3 - .../interp-callm/tests/bad-decl-2.php.expectregex | 1 - .../slow/inout/interp-callm/tests/bad-func.php | 3 - .../interp-callm/tests/bad-func.php.expectregex | 1 - .../inout/interp-callm/tests/bad-generator.php | 5 - .../interp-callm/tests/bad-generator.php.expectf | 1 - .../inout/interp-callm/tests/bad-interface.php | 9 -- .../interp-callm/tests/bad-interface.php.expectf | 1 - .../slow/inout/interp-callm/tests/bad-memoize.php | 4 - .../interp-callm/tests/bad-memoize.php.expectf | 1 - .../inout/interp-callm/tests/bad-mixed-mode-1.php | 4 - .../tests/bad-mixed-mode-1.php.expectf | 1 - .../inout/interp-callm/tests/bad-mixed-mode-2.php | 4 - .../tests/bad-mixed-mode-2.php.expectf | 1 - .../interp-callm/tests/bad-named-constructor.php | 5 - .../tests/bad-named-constructor.php.expectf | 1 - .../slow/inout/interp-callm/tests/bad-parent-1.php | 9 -- .../interp-callm/tests/bad-parent-1.php.expectf | 1 - .../slow/inout/interp-callm/tests/bad-parent-2.php | 9 -- .../interp-callm/tests/bad-parent-2.php.expectf | 1 - .../slow/inout/interp-callm/tests/bad-parent-3.php | 9 -- .../interp-callm/tests/bad-parent-3.php.expectf | 1 - .../slow/inout/interp-callm/tests/bad-parent-4.php | 9 -- .../interp-callm/tests/bad-parent-4.php.expectf | 1 - .../slow/inout/interp-callm/tests/bad-parent-5.php | 9 -- .../interp-callm/tests/bad-parent-5.php.expectf | 1 - .../slow/inout/interp-callm/tests/bad-parent-6.php | 9 -- .../interp-callm/tests/bad-parent-6.php.expectf | 1 - .../slow/inout/interp-callm/tests/bad-trait-1.php | 13 -- .../interp-callm/tests/bad-trait-1.php.expectf | 1 - .../slow/inout/interp-callm/tests/bad-trait-2.php | 9 -- .../interp-callm/tests/bad-trait-2.php.expectf | 1 - .../slow/inout/interp-callm/tests/bad-trait-3.php | 9 -- .../interp-callm/tests/bad-trait-3.php.expectf | 1 - .../inout/interp-callm/tests/builtin-interop.php | 18 --- .../interp-callm/tests/builtin-interop.php.expect | 1 - .../slow/inout/interp-callm/tests/call-dynamic.php | 32 ---- .../interp-callm/tests/call-dynamic.php.expect | 1 - .../slow/inout/interp-callm/tests/call-static.php | 76 --------- .../interp-callm/tests/call-static.php.expect | 1 - .../test/slow/inout/interp-callm/tests/closure.php | 20 --- .../inout/interp-callm/tests/closure.php.expect | 1 - .../slow/inout/interp-callm/tests/complex-expr.php | 100 ------------ .../interp-callm/tests/complex-expr.php.expect | 1 - .../slow/inout/interp-callm/tests/def-func.php | 22 --- .../inout/interp-callm/tests/def-func.php.expect | 1 - .../inout/interp-callm/tests/double-array-get.php | 9 -- .../interp-callm/tests/double-array-get.php.expect | 1 - .../inout/interp-callm/tests/fb-intercept-argc.php | 52 ------ .../tests/fb-intercept-argc.php.expect | 1 - .../tests/fb-intercept-argc.php.hphp_opts | 1 - .../interp-callm/tests/fb-intercept-argc.php.opts | 1 - .../tests/fb-intercept-bad-handler.php | 35 ----- .../tests/fb-intercept-bad-handler.php.expectf | 1 - .../tests/fb-intercept-bad-handler.php.hphp_opts | 1 - .../tests/fb-intercept-bad-handler.php.opts | 1 - .../interp-callm/tests/fb-intercept-reffy.php | 35 ----- .../tests/fb-intercept-reffy.php.expect | 1 - .../tests/fb-intercept-reffy.php.hphp_opts | 1 - .../interp-callm/tests/fb-intercept-reffy.php.opts | 1 - .../interp-callm/tests/fb-intercept-wrapper.php | 35 ----- .../tests/fb-intercept-wrapper.php.expect | 1 - .../tests/fb-intercept-wrapper.php.hphp_opts | 1 - .../tests/fb-intercept-wrapper.php.opts | 1 - .../slow/inout/interp-callm/tests/fb-intercept.php | 35 ----- .../interp-callm/tests/fb-intercept.php.expect | 1 - .../interp-callm/tests/fb-intercept.php.hphp_opts | 1 - .../inout/interp-callm/tests/fb-intercept.php.opts | 1 - .../interp-callm/tests/func-interop-dynamic.php | 39 ----- .../tests/func-interop-dynamic.php.expect | 1 - .../interp-callm/tests/func-interop-static.php | 39 ----- .../tests/func-interop-static.php.expect | 1 - .../slow/inout/interp-callm/tests/inout-decl.php | 92 ----------- .../inout/interp-callm/tests/inout-decl.php.expect | 1 - .../interp-callm/tests/inout_param_mixed_hint.php | 13 -- .../tests/inout_param_mixed_hint.php.expect | 1 - .../tests/inout_param_soft_mixed_hint.php | 13 -- .../tests/inout_param_soft_mixed_hint.php.expect | 1 - .../inout/interp-callm/tests/invalid-index.php | 75 --------- .../interp-callm/tests/invalid-index.php.expectf | 1 - .../inout/interp-callm/tests/method-dynamic.php | 70 --------- .../interp-callm/tests/method-dynamic.php.expect | 1 - .../interp-callm/tests/method-interop-dynamic.php | 116 -------------- .../tests/method-interop-dynamic.php.expectf | 1 - .../tests/method-interop-dynamic.php.hphp_opts | 1 - .../tests/method-interop-dynamic.php.opts | 1 - .../interp-callm/tests/method-interop-static.php | 77 --------- .../tests/method-interop-static.php.expectf | 1 - .../tests/method-interop-static.php.hphp_opts | 1 - .../tests/method-interop-static.php.opts | 1 - .../inout/interp-callm/tests/method-static.php | 36 ----- .../interp-callm/tests/method-static.php.expect | 1 - .../slow/inout/interp-callm/tests/msrv-error.php | 11 -- .../interp-callm/tests/msrv-error.php.expectf | 1 - .../inout/interp-callm/tests/msrv-error.php.skipif | 1 - .../inout/interp-callm/tests/msrv-unpack-error.php | 11 -- .../tests/msrv-unpack-error.php.expectf | 1 - .../tests/msrv-unpack-error.php.skipif | 1 - .../inout/interp-callm/tests/out-type-hints.php | 27 ---- .../interp-callm/tests/out-type-hints.php.expect | 1 - .../slow/inout/interp-callm/tests/reffy-magic.php | 21 --- .../interp-callm/tests/reffy-magic.php.expect | 1 - hphp/test/slow/inout/interp-callm/tests/shadow.php | 38 ----- .../inout/interp-callm/tests/shadow.php.expect | 1 - .../slow/inout/interp-callm/tests/side-effects.php | 174 --------------------- .../interp-callm/tests/side-effects.php.expect | 1 - .../slow/inout/interp-callm/tests/trait-magic.php | 77 --------- .../interp-callm/tests/trait-magic.php.expect | 1 - .../interp-callm/tests/trait-magic.php.hphp_opts | 1 - .../inout/interp-callm/tests/trait-magic.php.opts | 1 - .../inout/interp-callm/tests/variadic-builtin.php | 17 -- .../interp-callm/tests/variadic-builtin.php.expect | 1 - .../inout/interp-callm/tests/variadic-inout.php | 29 ---- .../interp-callm/tests/variadic-inout.php.expect | 1 - hphp/test/slow/inout/interp-callm/tests/xhp.php | 12 -- .../slow/inout/interp-callm/tests/xhp.php.expect | 1 - hphp/test/slow/inout/interp-retm/config.ini | 2 - .../inout/interp-retm/tests/abstract-method.php | 19 --- .../interp-retm/tests/abstract-method.php.expect | 1 - .../tests/abstract-method.php.hphp_opts | 1 - .../interp-retm/tests/abstract-method.php.opts | 1 - .../slow/inout/interp-retm/tests/autoloader.php | 38 ----- .../inout/interp-retm/tests/autoloader.php.expectf | 1 - .../slow/inout/interp-retm/tests/bad-abstract.php | 9 -- .../interp-retm/tests/bad-abstract.php.expectf | 1 - .../interp-retm/tests/bad-async-generator.php | 5 - .../tests/bad-async-generator.php.expectf | 1 - .../slow/inout/interp-retm/tests/bad-async.php | 3 - .../inout/interp-retm/tests/bad-async.php.expectf | 1 - .../slow/inout/interp-retm/tests/bad-call-1.php | 3 - .../interp-retm/tests/bad-call-1.php.expectregex | 1 - .../slow/inout/interp-retm/tests/bad-call-10.php | 10 -- .../interp-retm/tests/bad-call-10.php.expectf | 1 - .../slow/inout/interp-retm/tests/bad-call-11.php | 10 -- .../interp-retm/tests/bad-call-11.php.expectf | 1 - .../slow/inout/interp-retm/tests/bad-call-12.php | 10 -- .../interp-retm/tests/bad-call-12.php.expectf | 1 - .../slow/inout/interp-retm/tests/bad-call-13.php | 5 - .../interp-retm/tests/bad-call-13.php.expectf | 1 - .../slow/inout/interp-retm/tests/bad-call-14.php | 10 -- .../interp-retm/tests/bad-call-14.php.expectf | 1 - .../slow/inout/interp-retm/tests/bad-call-15.php | 11 -- .../interp-retm/tests/bad-call-15.php.expectf | 1 - .../slow/inout/interp-retm/tests/bad-call-2.php | 3 - .../interp-retm/tests/bad-call-2.php.expectregex | 1 - .../slow/inout/interp-retm/tests/bad-call-3.php | 3 - .../interp-retm/tests/bad-call-3.php.expectregex | 1 - .../slow/inout/interp-retm/tests/bad-call-4.php | 3 - .../interp-retm/tests/bad-call-4.php.expectregex | 1 - .../slow/inout/interp-retm/tests/bad-call-5.php | 3 - .../interp-retm/tests/bad-call-5.php.expectregex | 1 - .../slow/inout/interp-retm/tests/bad-call-6.php | 3 - .../interp-retm/tests/bad-call-6.php.expectregex | 1 - .../slow/inout/interp-retm/tests/bad-call-7.php | 3 - .../interp-retm/tests/bad-call-7.php.expectregex | 1 - .../slow/inout/interp-retm/tests/bad-call-8.php | 3 - .../interp-retm/tests/bad-call-8.php.expectregex | 1 - .../slow/inout/interp-retm/tests/bad-call-9.php | 3 - .../interp-retm/tests/bad-call-9.php.expectregex | 1 - .../slow/inout/interp-retm/tests/bad-class.php | 3 - .../interp-retm/tests/bad-class.php.expectregex | 1 - .../inout/interp-retm/tests/bad-constructor.php | 5 - .../interp-retm/tests/bad-constructor.php.expectf | 1 - .../slow/inout/interp-retm/tests/bad-decl-1.php | 3 - .../interp-retm/tests/bad-decl-1.php.expectregex | 1 - .../slow/inout/interp-retm/tests/bad-decl-2.php | 3 - .../interp-retm/tests/bad-decl-2.php.expectregex | 1 - .../test/slow/inout/interp-retm/tests/bad-func.php | 3 - .../interp-retm/tests/bad-func.php.expectregex | 1 - .../slow/inout/interp-retm/tests/bad-generator.php | 5 - .../interp-retm/tests/bad-generator.php.expectf | 1 - .../slow/inout/interp-retm/tests/bad-interface.php | 9 -- .../interp-retm/tests/bad-interface.php.expectf | 1 - .../slow/inout/interp-retm/tests/bad-memoize.php | 4 - .../interp-retm/tests/bad-memoize.php.expectf | 1 - .../inout/interp-retm/tests/bad-mixed-mode-1.php | 4 - .../interp-retm/tests/bad-mixed-mode-1.php.expectf | 1 - .../inout/interp-retm/tests/bad-mixed-mode-2.php | 4 - .../interp-retm/tests/bad-mixed-mode-2.php.expectf | 1 - .../interp-retm/tests/bad-named-constructor.php | 5 - .../tests/bad-named-constructor.php.expectf | 1 - .../slow/inout/interp-retm/tests/bad-parent-1.php | 9 -- .../interp-retm/tests/bad-parent-1.php.expectf | 1 - .../slow/inout/interp-retm/tests/bad-parent-2.php | 9 -- .../interp-retm/tests/bad-parent-2.php.expectf | 1 - .../slow/inout/interp-retm/tests/bad-parent-3.php | 9 -- .../interp-retm/tests/bad-parent-3.php.expectf | 1 - .../slow/inout/interp-retm/tests/bad-parent-4.php | 9 -- .../interp-retm/tests/bad-parent-4.php.expectf | 1 - .../slow/inout/interp-retm/tests/bad-parent-5.php | 9 -- .../interp-retm/tests/bad-parent-5.php.expectf | 1 - .../slow/inout/interp-retm/tests/bad-parent-6.php | 9 -- .../interp-retm/tests/bad-parent-6.php.expectf | 1 - .../slow/inout/interp-retm/tests/bad-trait-1.php | 13 -- .../interp-retm/tests/bad-trait-1.php.expectf | 1 - .../slow/inout/interp-retm/tests/bad-trait-2.php | 9 -- .../interp-retm/tests/bad-trait-2.php.expectf | 1 - .../slow/inout/interp-retm/tests/bad-trait-3.php | 9 -- .../interp-retm/tests/bad-trait-3.php.expectf | 1 - .../inout/interp-retm/tests/builtin-interop.php | 18 --- .../interp-retm/tests/builtin-interop.php.expect | 1 - .../slow/inout/interp-retm/tests/call-dynamic.php | 32 ---- .../interp-retm/tests/call-dynamic.php.expect | 1 - .../slow/inout/interp-retm/tests/call-static.php | 76 --------- .../inout/interp-retm/tests/call-static.php.expect | 1 - hphp/test/slow/inout/interp-retm/tests/closure.php | 20 --- .../inout/interp-retm/tests/closure.php.expect | 1 - .../slow/inout/interp-retm/tests/complex-expr.php | 100 ------------ .../interp-retm/tests/complex-expr.php.expect | 1 - .../test/slow/inout/interp-retm/tests/def-func.php | 22 --- .../inout/interp-retm/tests/def-func.php.expect | 1 - .../inout/interp-retm/tests/double-array-get.php | 9 -- .../interp-retm/tests/double-array-get.php.expect | 1 - .../inout/interp-retm/tests/fb-intercept-argc.php | 52 ------ .../interp-retm/tests/fb-intercept-argc.php.expect | 1 - .../tests/fb-intercept-argc.php.hphp_opts | 1 - .../interp-retm/tests/fb-intercept-argc.php.opts | 1 - .../interp-retm/tests/fb-intercept-bad-handler.php | 35 ----- .../tests/fb-intercept-bad-handler.php.expectf | 1 - .../tests/fb-intercept-bad-handler.php.hphp_opts | 1 - .../tests/fb-intercept-bad-handler.php.opts | 1 - .../inout/interp-retm/tests/fb-intercept-reffy.php | 35 ----- .../tests/fb-intercept-reffy.php.expect | 1 - .../tests/fb-intercept-reffy.php.hphp_opts | 1 - .../interp-retm/tests/fb-intercept-reffy.php.opts | 1 - .../interp-retm/tests/fb-intercept-wrapper.php | 35 ----- .../tests/fb-intercept-wrapper.php.expect | 1 - .../tests/fb-intercept-wrapper.php.hphp_opts | 1 - .../tests/fb-intercept-wrapper.php.opts | 1 - .../slow/inout/interp-retm/tests/fb-intercept.php | 35 ----- .../interp-retm/tests/fb-intercept.php.expect | 1 - .../interp-retm/tests/fb-intercept.php.hphp_opts | 1 - .../inout/interp-retm/tests/fb-intercept.php.opts | 1 - .../interp-retm/tests/func-interop-dynamic.php | 39 ----- .../tests/func-interop-dynamic.php.expect | 1 - .../interp-retm/tests/func-interop-static.php | 39 ----- .../tests/func-interop-static.php.expect | 1 - .../slow/inout/interp-retm/tests/inout-decl.php | 92 ----------- .../inout/interp-retm/tests/inout-decl.php.expect | 1 - .../interp-retm/tests/inout_param_mixed_hint.php | 13 -- .../tests/inout_param_mixed_hint.php.expect | 1 - .../tests/inout_param_soft_mixed_hint.php | 13 -- .../tests/inout_param_soft_mixed_hint.php.expect | 1 - .../slow/inout/interp-retm/tests/invalid-index.php | 75 --------- .../interp-retm/tests/invalid-index.php.expectf | 1 - .../inout/interp-retm/tests/method-dynamic.php | 70 --------- .../interp-retm/tests/method-dynamic.php.expect | 1 - .../interp-retm/tests/method-interop-dynamic.php | 116 -------------- .../tests/method-interop-dynamic.php.expectf | 1 - .../tests/method-interop-dynamic.php.hphp_opts | 1 - .../tests/method-interop-dynamic.php.opts | 1 - .../interp-retm/tests/method-interop-static.php | 77 --------- .../tests/method-interop-static.php.expectf | 1 - .../tests/method-interop-static.php.hphp_opts | 1 - .../tests/method-interop-static.php.opts | 1 - .../slow/inout/interp-retm/tests/method-static.php | 36 ----- .../interp-retm/tests/method-static.php.expect | 1 - .../slow/inout/interp-retm/tests/msrv-error.php | 11 -- .../inout/interp-retm/tests/msrv-error.php.expectf | 1 - .../inout/interp-retm/tests/msrv-error.php.skipif | 1 - .../inout/interp-retm/tests/msrv-unpack-error.php | 11 -- .../tests/msrv-unpack-error.php.expectf | 1 - .../interp-retm/tests/msrv-unpack-error.php.skipif | 1 - .../inout/interp-retm/tests/out-type-hints.php | 27 ---- .../interp-retm/tests/out-type-hints.php.expect | 1 - .../slow/inout/interp-retm/tests/reffy-magic.php | 21 --- .../inout/interp-retm/tests/reffy-magic.php.expect | 1 - hphp/test/slow/inout/interp-retm/tests/shadow.php | 38 ----- .../slow/inout/interp-retm/tests/shadow.php.expect | 1 - .../slow/inout/interp-retm/tests/side-effects.php | 174 --------------------- .../interp-retm/tests/side-effects.php.expect | 1 - .../slow/inout/interp-retm/tests/trait-magic.php | 77 --------- .../inout/interp-retm/tests/trait-magic.php.expect | 1 - .../interp-retm/tests/trait-magic.php.hphp_opts | 1 - .../inout/interp-retm/tests/trait-magic.php.opts | 1 - .../inout/interp-retm/tests/variadic-builtin.php | 17 -- .../interp-retm/tests/variadic-builtin.php.expect | 1 - .../inout/interp-retm/tests/variadic-inout.php | 29 ---- .../interp-retm/tests/variadic-inout.php.expect | 1 - hphp/test/slow/inout/interp-retm/tests/xhp.php | 12 -- .../slow/inout/interp-retm/tests/xhp.php.expect | 1 - .../slow/inout/{tuple/tests => }/invalid-index.php | 0 .../{tuple/tests => }/invalid-index.php.expectf | 0 hphp/test/slow/inout/make_suite.sh | 44 ------ .../inout/{tuple/tests => }/method-dynamic.php | 0 .../{tuple/tests => }/method-dynamic.php.expect | 0 .../{tuple/tests => }/method-interop-dynamic.php | 0 .../tests => }/method-interop-dynamic.php.expectf | 0 .../method-interop-dynamic.php.hphp_opts | 0 .../tests => }/method-interop-dynamic.php.opts | 0 .../{tuple/tests => }/method-interop-static.php | 0 .../tests => }/method-interop-static.php.expectf | 0 .../tests => }/method-interop-static.php.hphp_opts | 0 .../tests => }/method-interop-static.php.opts | 0 .../slow/inout/{tuple/tests => }/method-static.php | 0 .../{tuple/tests => }/method-static.php.expect | 0 .../slow/inout/{tuple/tests => }/msrv-error.php | 0 .../inout/{tuple/tests => }/msrv-error.php.expectf | 0 .../inout/{tuple/tests => }/msrv-unpack-error.php | 0 .../tests => }/msrv-unpack-error.php.expectf | 0 hphp/test/slow/inout/msrv/config.ini | 1 - hphp/test/slow/inout/msrv/hphp_config.ini | 1 - .../test/slow/inout/msrv/tests/abstract-method.php | 19 --- .../inout/msrv/tests/abstract-method.php.expect | 1 - .../inout/msrv/tests/abstract-method.php.hphp_opts | 1 - .../slow/inout/msrv/tests/abstract-method.php.opts | 1 - hphp/test/slow/inout/msrv/tests/autoloader.php | 38 ----- .../slow/inout/msrv/tests/autoloader.php.expectf | 1 - hphp/test/slow/inout/msrv/tests/bad-abstract.php | 9 -- .../slow/inout/msrv/tests/bad-abstract.php.expectf | 1 - .../slow/inout/msrv/tests/bad-async-generator.php | 5 - .../msrv/tests/bad-async-generator.php.expectf | 1 - hphp/test/slow/inout/msrv/tests/bad-async.php | 3 - .../slow/inout/msrv/tests/bad-async.php.expectf | 1 - hphp/test/slow/inout/msrv/tests/bad-call-1.php | 3 - .../inout/msrv/tests/bad-call-1.php.expectregex | 1 - hphp/test/slow/inout/msrv/tests/bad-call-10.php | 10 -- .../slow/inout/msrv/tests/bad-call-10.php.expectf | 1 - hphp/test/slow/inout/msrv/tests/bad-call-11.php | 10 -- .../slow/inout/msrv/tests/bad-call-11.php.expectf | 1 - hphp/test/slow/inout/msrv/tests/bad-call-12.php | 10 -- .../slow/inout/msrv/tests/bad-call-12.php.expectf | 1 - hphp/test/slow/inout/msrv/tests/bad-call-13.php | 5 - .../slow/inout/msrv/tests/bad-call-13.php.expectf | 1 - hphp/test/slow/inout/msrv/tests/bad-call-14.php | 10 -- .../slow/inout/msrv/tests/bad-call-14.php.expectf | 1 - hphp/test/slow/inout/msrv/tests/bad-call-15.php | 11 -- .../slow/inout/msrv/tests/bad-call-15.php.expectf | 1 - hphp/test/slow/inout/msrv/tests/bad-call-2.php | 3 - .../inout/msrv/tests/bad-call-2.php.expectregex | 1 - hphp/test/slow/inout/msrv/tests/bad-call-3.php | 3 - .../inout/msrv/tests/bad-call-3.php.expectregex | 1 - hphp/test/slow/inout/msrv/tests/bad-call-4.php | 3 - .../inout/msrv/tests/bad-call-4.php.expectregex | 1 - hphp/test/slow/inout/msrv/tests/bad-call-5.php | 3 - .../inout/msrv/tests/bad-call-5.php.expectregex | 1 - hphp/test/slow/inout/msrv/tests/bad-call-6.php | 3 - .../inout/msrv/tests/bad-call-6.php.expectregex | 1 - hphp/test/slow/inout/msrv/tests/bad-call-7.php | 3 - .../inout/msrv/tests/bad-call-7.php.expectregex | 1 - hphp/test/slow/inout/msrv/tests/bad-call-8.php | 3 - .../inout/msrv/tests/bad-call-8.php.expectregex | 1 - hphp/test/slow/inout/msrv/tests/bad-call-9.php | 3 - .../inout/msrv/tests/bad-call-9.php.expectregex | 1 - hphp/test/slow/inout/msrv/tests/bad-class.php | 3 - .../inout/msrv/tests/bad-class.php.expectregex | 1 - .../test/slow/inout/msrv/tests/bad-constructor.php | 5 - .../inout/msrv/tests/bad-constructor.php.expectf | 1 - hphp/test/slow/inout/msrv/tests/bad-decl-1.php | 3 - .../inout/msrv/tests/bad-decl-1.php.expectregex | 1 - hphp/test/slow/inout/msrv/tests/bad-decl-2.php | 3 - .../inout/msrv/tests/bad-decl-2.php.expectregex | 1 - hphp/test/slow/inout/msrv/tests/bad-func.php | 3 - .../slow/inout/msrv/tests/bad-func.php.expectregex | 1 - hphp/test/slow/inout/msrv/tests/bad-generator.php | 5 - .../inout/msrv/tests/bad-generator.php.expectf | 1 - hphp/test/slow/inout/msrv/tests/bad-interface.php | 9 -- .../inout/msrv/tests/bad-interface.php.expectf | 1 - hphp/test/slow/inout/msrv/tests/bad-memoize.php | 4 - .../slow/inout/msrv/tests/bad-memoize.php.expectf | 1 - .../slow/inout/msrv/tests/bad-mixed-mode-1.php | 4 - .../inout/msrv/tests/bad-mixed-mode-1.php.expectf | 1 - .../slow/inout/msrv/tests/bad-mixed-mode-2.php | 4 - .../inout/msrv/tests/bad-mixed-mode-2.php.expectf | 1 - .../inout/msrv/tests/bad-named-constructor.php | 5 - .../msrv/tests/bad-named-constructor.php.expectf | 1 - hphp/test/slow/inout/msrv/tests/bad-parent-1.php | 9 -- .../slow/inout/msrv/tests/bad-parent-1.php.expectf | 1 - hphp/test/slow/inout/msrv/tests/bad-parent-2.php | 9 -- .../slow/inout/msrv/tests/bad-parent-2.php.expectf | 1 - hphp/test/slow/inout/msrv/tests/bad-parent-3.php | 9 -- .../slow/inout/msrv/tests/bad-parent-3.php.expectf | 1 - hphp/test/slow/inout/msrv/tests/bad-parent-4.php | 9 -- .../slow/inout/msrv/tests/bad-parent-4.php.expectf | 1 - hphp/test/slow/inout/msrv/tests/bad-parent-5.php | 9 -- .../slow/inout/msrv/tests/bad-parent-5.php.expectf | 1 - hphp/test/slow/inout/msrv/tests/bad-parent-6.php | 9 -- .../slow/inout/msrv/tests/bad-parent-6.php.expectf | 1 - hphp/test/slow/inout/msrv/tests/bad-trait-1.php | 13 -- .../slow/inout/msrv/tests/bad-trait-1.php.expectf | 1 - hphp/test/slow/inout/msrv/tests/bad-trait-2.php | 9 -- .../slow/inout/msrv/tests/bad-trait-2.php.expectf | 1 - hphp/test/slow/inout/msrv/tests/bad-trait-3.php | 9 -- .../slow/inout/msrv/tests/bad-trait-3.php.expectf | 1 - .../test/slow/inout/msrv/tests/builtin-interop.php | 18 --- .../inout/msrv/tests/builtin-interop.php.expect | 1 - hphp/test/slow/inout/msrv/tests/call-dynamic.php | 32 ---- .../slow/inout/msrv/tests/call-dynamic.php.expect | 1 - hphp/test/slow/inout/msrv/tests/call-static.php | 76 --------- .../slow/inout/msrv/tests/call-static.php.expect | 1 - hphp/test/slow/inout/msrv/tests/closure.php | 20 --- hphp/test/slow/inout/msrv/tests/closure.php.expect | 1 - hphp/test/slow/inout/msrv/tests/complex-expr.php | 100 ------------ .../slow/inout/msrv/tests/complex-expr.php.expect | 1 - hphp/test/slow/inout/msrv/tests/def-func.php | 22 --- .../test/slow/inout/msrv/tests/def-func.php.expect | 1 - .../slow/inout/msrv/tests/double-array-get.php | 9 -- .../inout/msrv/tests/double-array-get.php.expect | 1 - .../slow/inout/msrv/tests/fb-intercept-argc.php | 52 ------ .../inout/msrv/tests/fb-intercept-argc.php.expect | 1 - .../msrv/tests/fb-intercept-argc.php.hphp_opts | 1 - .../inout/msrv/tests/fb-intercept-argc.php.opts | 1 - .../inout/msrv/tests/fb-intercept-bad-handler.php | 35 ----- .../tests/fb-intercept-bad-handler.php.expectf | 1 - .../tests/fb-intercept-bad-handler.php.hphp_opts | 1 - .../msrv/tests/fb-intercept-bad-handler.php.opts | 1 - .../slow/inout/msrv/tests/fb-intercept-reffy.php | 35 ----- .../inout/msrv/tests/fb-intercept-reffy.php.expect | 1 - .../msrv/tests/fb-intercept-reffy.php.hphp_opts | 1 - .../inout/msrv/tests/fb-intercept-reffy.php.opts | 1 - .../slow/inout/msrv/tests/fb-intercept-wrapper.php | 35 ----- .../msrv/tests/fb-intercept-wrapper.php.expect | 1 - .../msrv/tests/fb-intercept-wrapper.php.hphp_opts | 1 - .../inout/msrv/tests/fb-intercept-wrapper.php.opts | 1 - hphp/test/slow/inout/msrv/tests/fb-intercept.php | 35 ----- .../slow/inout/msrv/tests/fb-intercept.php.expect | 1 - .../inout/msrv/tests/fb-intercept.php.hphp_opts | 1 - .../slow/inout/msrv/tests/fb-intercept.php.opts | 1 - .../slow/inout/msrv/tests/func-interop-dynamic.php | 39 ----- .../msrv/tests/func-interop-dynamic.php.expect | 1 - .../slow/inout/msrv/tests/func-interop-static.php | 39 ----- .../msrv/tests/func-interop-static.php.expect | 1 - hphp/test/slow/inout/msrv/tests/inout-decl.php | 92 ----------- .../slow/inout/msrv/tests/inout-decl.php.expect | 1 - .../inout/msrv/tests/inout_param_mixed_hint.php | 13 -- .../msrv/tests/inout_param_mixed_hint.php.expect | 1 - .../msrv/tests/inout_param_soft_mixed_hint.php | 13 -- .../tests/inout_param_soft_mixed_hint.php.expect | 1 - hphp/test/slow/inout/msrv/tests/invalid-index.php | 75 --------- .../inout/msrv/tests/invalid-index.php.expectf | 1 - hphp/test/slow/inout/msrv/tests/method-dynamic.php | 70 --------- .../inout/msrv/tests/method-dynamic.php.expect | 1 - .../inout/msrv/tests/method-interop-dynamic.php | 116 -------------- .../msrv/tests/method-interop-dynamic.php.expectf | 1 - .../tests/method-interop-dynamic.php.hphp_opts | 1 - .../msrv/tests/method-interop-dynamic.php.opts | 1 - .../inout/msrv/tests/method-interop-static.php | 77 --------- .../msrv/tests/method-interop-static.php.expectf | 1 - .../msrv/tests/method-interop-static.php.hphp_opts | 1 - .../msrv/tests/method-interop-static.php.opts | 1 - hphp/test/slow/inout/msrv/tests/method-static.php | 36 ----- .../slow/inout/msrv/tests/method-static.php.expect | 1 - hphp/test/slow/inout/msrv/tests/msrv-error.php | 11 -- .../slow/inout/msrv/tests/msrv-error.php.expectf | 1 - .../slow/inout/msrv/tests/msrv-error.php.skipif | 1 - .../slow/inout/msrv/tests/msrv-unpack-error.php | 11 -- .../inout/msrv/tests/msrv-unpack-error.php.expectf | 1 - .../inout/msrv/tests/msrv-unpack-error.php.skipif | 1 - hphp/test/slow/inout/msrv/tests/out-type-hints.php | 27 ---- .../inout/msrv/tests/out-type-hints.php.expect | 1 - hphp/test/slow/inout/msrv/tests/reffy-magic.php | 21 --- .../slow/inout/msrv/tests/reffy-magic.php.expect | 1 - hphp/test/slow/inout/msrv/tests/shadow.php | 38 ----- hphp/test/slow/inout/msrv/tests/shadow.php.expect | 1 - hphp/test/slow/inout/msrv/tests/side-effects.php | 174 --------------------- .../slow/inout/msrv/tests/side-effects.php.expect | 1 - hphp/test/slow/inout/msrv/tests/trait-magic.php | 77 --------- .../slow/inout/msrv/tests/trait-magic.php.expect | 1 - .../inout/msrv/tests/trait-magic.php.hphp_opts | 1 - .../slow/inout/msrv/tests/trait-magic.php.opts | 1 - .../slow/inout/msrv/tests/variadic-builtin.php | 17 -- .../inout/msrv/tests/variadic-builtin.php.expect | 1 - hphp/test/slow/inout/msrv/tests/variadic-inout.php | 29 ---- .../inout/msrv/tests/variadic-inout.php.expect | 1 - hphp/test/slow/inout/msrv/tests/xhp.php | 12 -- hphp/test/slow/inout/msrv/tests/xhp.php.expect | 1 - .../inout/{tuple/tests => }/out-type-hints.php | 0 .../{tuple/tests => }/out-type-hints.php.expect | 0 .../slow/inout/{tuple/tests => }/reffy-magic.php | 0 .../inout/{tuple/tests => }/reffy-magic.php.expect | 0 hphp/test/slow/inout/{tuple/tests => }/shadow.php | 0 .../slow/inout/{tuple/tests => }/shadow.php.expect | 0 .../slow/inout/{tuple/tests => }/side-effects.php | 0 .../{tuple/tests => }/side-effects.php.expect | 0 .../slow/inout/{tuple/tests => }/trait-magic.php | 0 .../inout/{tuple/tests => }/trait-magic.php.expect | 0 .../{tuple/tests => }/trait-magic.php.hphp_opts | 0 .../inout/{tuple/tests => }/trait-magic.php.opts | 0 hphp/test/slow/inout/tuple/config.ini | 1 - hphp/test/slow/inout/tuple/hphp_config.ini | 1 - .../slow/inout/tuple/tests/msrv-error.php.skipif | 3 - .../inout/tuple/tests/msrv-unpack-error.php.skipif | 3 - .../inout/{tuple/tests => }/variadic-builtin.php | 0 .../{tuple/tests => }/variadic-builtin.php.expect | 0 .../inout/{tuple/tests => }/variadic-inout.php | 0 .../{tuple/tests => }/variadic-inout.php.expect | 0 hphp/test/slow/inout/{tuple/tests => }/xhp.php | 0 .../slow/inout/{tuple/tests => }/xhp.php.expect | 0 682 files changed, 42 insertions(+), 5717 deletions(-) rename hphp/test/slow/inout/{tuple/tests => }/abstract-method.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/abstract-method.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/abstract-method.php.hphp_opts (100%) rename hphp/test/slow/inout/{tuple/tests => }/abstract-method.php.opts (100%) rename hphp/test/slow/inout/{tuple/tests => }/autoloader.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/autoloader.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-abstract.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-abstract.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-async-generator.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-async-generator.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-async.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-async.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-1.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-1.php.expectregex (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-10.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-10.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-11.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-11.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-12.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-12.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-13.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-13.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-14.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-14.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-15.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-15.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-2.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-2.php.expectregex (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-3.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-3.php.expectregex (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-4.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-4.php.expectregex (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-5.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-5.php.expectregex (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-6.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-6.php.expectregex (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-7.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-7.php.expectregex (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-8.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-8.php.expectregex (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-9.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-call-9.php.expectregex (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-class.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-class.php.expectregex (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-constructor.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-constructor.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-decl-1.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-decl-1.php.expectregex (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-decl-2.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-decl-2.php.expectregex (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-func.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-func.php.expectregex (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-generator.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-generator.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-interface.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-interface.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-memoize.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-memoize.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-mixed-mode-1.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-mixed-mode-1.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-mixed-mode-2.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-mixed-mode-2.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-named-constructor.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-named-constructor.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-parent-1.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-parent-1.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-parent-2.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-parent-2.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-parent-3.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-parent-3.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-parent-4.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-parent-4.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-parent-5.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-parent-5.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-parent-6.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-parent-6.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-trait-1.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-trait-1.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-trait-2.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-trait-2.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-trait-3.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/bad-trait-3.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/builtin-interop.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/builtin-interop.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/call-dynamic.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/call-dynamic.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/call-static.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/call-static.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/closure.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/closure.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/complex-expr.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/complex-expr.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/def-func.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/def-func.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/double-array-get.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/double-array-get.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/fb-intercept-argc.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/fb-intercept-argc.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/fb-intercept-argc.php.hphp_opts (100%) rename hphp/test/slow/inout/{tuple/tests => }/fb-intercept-argc.php.opts (100%) rename hphp/test/slow/inout/{tuple/tests => }/fb-intercept-bad-handler.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/fb-intercept-bad-handler.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/fb-intercept-bad-handler.php.hphp_opts (100%) rename hphp/test/slow/inout/{tuple/tests => }/fb-intercept-bad-handler.php.opts (100%) rename hphp/test/slow/inout/{tuple/tests => }/fb-intercept-reffy.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/fb-intercept-reffy.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/fb-intercept-reffy.php.hphp_opts (100%) rename hphp/test/slow/inout/{tuple/tests => }/fb-intercept-reffy.php.opts (100%) rename hphp/test/slow/inout/{tuple/tests => }/fb-intercept-wrapper.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/fb-intercept-wrapper.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/fb-intercept-wrapper.php.hphp_opts (100%) rename hphp/test/slow/inout/{tuple/tests => }/fb-intercept-wrapper.php.opts (100%) rename hphp/test/slow/inout/{tuple/tests => }/fb-intercept.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/fb-intercept.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/fb-intercept.php.hphp_opts (100%) rename hphp/test/slow/inout/{tuple/tests => }/fb-intercept.php.opts (100%) rename hphp/test/slow/inout/{tuple/tests => }/func-interop-dynamic.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/func-interop-dynamic.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/func-interop-static.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/func-interop-static.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/inout-decl.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/inout-decl.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/inout_param_mixed_hint.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/inout_param_mixed_hint.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/inout_param_soft_mixed_hint.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/inout_param_soft_mixed_hint.php.expect (100%) delete mode 100644 hphp/test/slow/inout/interp-callm/config.ini delete mode 100644 hphp/test/slow/inout/interp-callm/tests/abstract-method.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/abstract-method.php.expect delete mode 120000 hphp/test/slow/inout/interp-callm/tests/abstract-method.php.hphp_opts delete mode 120000 hphp/test/slow/inout/interp-callm/tests/abstract-method.php.opts delete mode 100644 hphp/test/slow/inout/interp-callm/tests/autoloader.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/autoloader.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-abstract.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-abstract.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-async-generator.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-async-generator.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-async.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-async.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-call-1.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-call-1.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-call-10.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-call-10.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-call-11.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-call-11.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-call-12.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-call-12.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-call-13.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-call-13.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-call-14.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-call-14.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-call-15.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-call-15.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-call-2.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-call-2.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-call-3.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-call-3.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-call-4.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-call-4.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-call-5.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-call-5.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-call-6.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-call-6.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-call-7.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-call-7.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-call-8.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-call-8.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-call-9.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-call-9.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-class.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-class.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-constructor.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-constructor.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-decl-1.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-decl-1.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-decl-2.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-decl-2.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-func.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-func.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-generator.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-generator.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-interface.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-interface.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-memoize.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-memoize.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-mixed-mode-1.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-mixed-mode-1.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-mixed-mode-2.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-mixed-mode-2.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-named-constructor.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-named-constructor.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-parent-1.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-parent-1.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-parent-2.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-parent-2.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-parent-3.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-parent-3.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-parent-4.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-parent-4.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-parent-5.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-parent-5.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-parent-6.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-parent-6.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-trait-1.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-trait-1.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-trait-2.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-trait-2.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/bad-trait-3.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/bad-trait-3.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/builtin-interop.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/builtin-interop.php.expect delete mode 100644 hphp/test/slow/inout/interp-callm/tests/call-dynamic.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/call-dynamic.php.expect delete mode 100644 hphp/test/slow/inout/interp-callm/tests/call-static.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/call-static.php.expect delete mode 100644 hphp/test/slow/inout/interp-callm/tests/closure.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/closure.php.expect delete mode 100644 hphp/test/slow/inout/interp-callm/tests/complex-expr.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/complex-expr.php.expect delete mode 100644 hphp/test/slow/inout/interp-callm/tests/def-func.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/def-func.php.expect delete mode 100644 hphp/test/slow/inout/interp-callm/tests/double-array-get.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/double-array-get.php.expect delete mode 100644 hphp/test/slow/inout/interp-callm/tests/fb-intercept-argc.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/fb-intercept-argc.php.expect delete mode 120000 hphp/test/slow/inout/interp-callm/tests/fb-intercept-argc.php.hphp_opts delete mode 120000 hphp/test/slow/inout/interp-callm/tests/fb-intercept-argc.php.opts delete mode 100644 hphp/test/slow/inout/interp-callm/tests/fb-intercept-bad-handler.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/fb-intercept-bad-handler.php.expectf delete mode 120000 hphp/test/slow/inout/interp-callm/tests/fb-intercept-bad-handler.php.hphp_opts delete mode 120000 hphp/test/slow/inout/interp-callm/tests/fb-intercept-bad-handler.php.opts delete mode 100644 hphp/test/slow/inout/interp-callm/tests/fb-intercept-reffy.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/fb-intercept-reffy.php.expect delete mode 120000 hphp/test/slow/inout/interp-callm/tests/fb-intercept-reffy.php.hphp_opts delete mode 120000 hphp/test/slow/inout/interp-callm/tests/fb-intercept-reffy.php.opts delete mode 100644 hphp/test/slow/inout/interp-callm/tests/fb-intercept-wrapper.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/fb-intercept-wrapper.php.expect delete mode 120000 hphp/test/slow/inout/interp-callm/tests/fb-intercept-wrapper.php.hphp_opts delete mode 120000 hphp/test/slow/inout/interp-callm/tests/fb-intercept-wrapper.php.opts delete mode 100644 hphp/test/slow/inout/interp-callm/tests/fb-intercept.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/fb-intercept.php.expect delete mode 120000 hphp/test/slow/inout/interp-callm/tests/fb-intercept.php.hphp_opts delete mode 120000 hphp/test/slow/inout/interp-callm/tests/fb-intercept.php.opts delete mode 100644 hphp/test/slow/inout/interp-callm/tests/func-interop-dynamic.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/func-interop-dynamic.php.expect delete mode 100644 hphp/test/slow/inout/interp-callm/tests/func-interop-static.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/func-interop-static.php.expect delete mode 100644 hphp/test/slow/inout/interp-callm/tests/inout-decl.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/inout-decl.php.expect delete mode 100644 hphp/test/slow/inout/interp-callm/tests/inout_param_mixed_hint.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/inout_param_mixed_hint.php.expect delete mode 100644 hphp/test/slow/inout/interp-callm/tests/inout_param_soft_mixed_hint.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/inout_param_soft_mixed_hint.php.expect delete mode 100644 hphp/test/slow/inout/interp-callm/tests/invalid-index.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/invalid-index.php.expectf delete mode 100644 hphp/test/slow/inout/interp-callm/tests/method-dynamic.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/method-dynamic.php.expect delete mode 100644 hphp/test/slow/inout/interp-callm/tests/method-interop-dynamic.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/method-interop-dynamic.php.expectf delete mode 120000 hphp/test/slow/inout/interp-callm/tests/method-interop-dynamic.php.hphp_opts delete mode 120000 hphp/test/slow/inout/interp-callm/tests/method-interop-dynamic.php.opts delete mode 100644 hphp/test/slow/inout/interp-callm/tests/method-interop-static.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/method-interop-static.php.expectf delete mode 120000 hphp/test/slow/inout/interp-callm/tests/method-interop-static.php.hphp_opts delete mode 120000 hphp/test/slow/inout/interp-callm/tests/method-interop-static.php.opts delete mode 100644 hphp/test/slow/inout/interp-callm/tests/method-static.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/method-static.php.expect delete mode 100644 hphp/test/slow/inout/interp-callm/tests/msrv-error.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/msrv-error.php.expectf delete mode 120000 hphp/test/slow/inout/interp-callm/tests/msrv-error.php.skipif delete mode 100644 hphp/test/slow/inout/interp-callm/tests/msrv-unpack-error.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/msrv-unpack-error.php.expectf delete mode 120000 hphp/test/slow/inout/interp-callm/tests/msrv-unpack-error.php.skipif delete mode 100644 hphp/test/slow/inout/interp-callm/tests/out-type-hints.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/out-type-hints.php.expect delete mode 100644 hphp/test/slow/inout/interp-callm/tests/reffy-magic.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/reffy-magic.php.expect delete mode 100644 hphp/test/slow/inout/interp-callm/tests/shadow.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/shadow.php.expect delete mode 100644 hphp/test/slow/inout/interp-callm/tests/side-effects.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/side-effects.php.expect delete mode 100644 hphp/test/slow/inout/interp-callm/tests/trait-magic.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/trait-magic.php.expect delete mode 120000 hphp/test/slow/inout/interp-callm/tests/trait-magic.php.hphp_opts delete mode 120000 hphp/test/slow/inout/interp-callm/tests/trait-magic.php.opts delete mode 100644 hphp/test/slow/inout/interp-callm/tests/variadic-builtin.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/variadic-builtin.php.expect delete mode 100644 hphp/test/slow/inout/interp-callm/tests/variadic-inout.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/variadic-inout.php.expect delete mode 100644 hphp/test/slow/inout/interp-callm/tests/xhp.php delete mode 120000 hphp/test/slow/inout/interp-callm/tests/xhp.php.expect delete mode 100644 hphp/test/slow/inout/interp-retm/config.ini delete mode 100644 hphp/test/slow/inout/interp-retm/tests/abstract-method.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/abstract-method.php.expect delete mode 120000 hphp/test/slow/inout/interp-retm/tests/abstract-method.php.hphp_opts delete mode 120000 hphp/test/slow/inout/interp-retm/tests/abstract-method.php.opts delete mode 100644 hphp/test/slow/inout/interp-retm/tests/autoloader.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/autoloader.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-abstract.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-abstract.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-async-generator.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-async-generator.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-async.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-async.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-call-1.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-call-1.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-call-10.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-call-10.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-call-11.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-call-11.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-call-12.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-call-12.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-call-13.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-call-13.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-call-14.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-call-14.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-call-15.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-call-15.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-call-2.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-call-2.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-call-3.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-call-3.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-call-4.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-call-4.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-call-5.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-call-5.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-call-6.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-call-6.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-call-7.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-call-7.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-call-8.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-call-8.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-call-9.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-call-9.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-class.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-class.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-constructor.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-constructor.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-decl-1.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-decl-1.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-decl-2.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-decl-2.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-func.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-func.php.expectregex delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-generator.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-generator.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-interface.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-interface.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-memoize.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-memoize.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-mixed-mode-1.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-mixed-mode-1.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-mixed-mode-2.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-mixed-mode-2.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-named-constructor.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-named-constructor.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-parent-1.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-parent-1.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-parent-2.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-parent-2.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-parent-3.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-parent-3.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-parent-4.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-parent-4.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-parent-5.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-parent-5.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-parent-6.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-parent-6.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-trait-1.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-trait-1.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-trait-2.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-trait-2.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/bad-trait-3.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/bad-trait-3.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/builtin-interop.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/builtin-interop.php.expect delete mode 100644 hphp/test/slow/inout/interp-retm/tests/call-dynamic.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/call-dynamic.php.expect delete mode 100644 hphp/test/slow/inout/interp-retm/tests/call-static.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/call-static.php.expect delete mode 100644 hphp/test/slow/inout/interp-retm/tests/closure.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/closure.php.expect delete mode 100644 hphp/test/slow/inout/interp-retm/tests/complex-expr.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/complex-expr.php.expect delete mode 100644 hphp/test/slow/inout/interp-retm/tests/def-func.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/def-func.php.expect delete mode 100644 hphp/test/slow/inout/interp-retm/tests/double-array-get.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/double-array-get.php.expect delete mode 100644 hphp/test/slow/inout/interp-retm/tests/fb-intercept-argc.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/fb-intercept-argc.php.expect delete mode 120000 hphp/test/slow/inout/interp-retm/tests/fb-intercept-argc.php.hphp_opts delete mode 120000 hphp/test/slow/inout/interp-retm/tests/fb-intercept-argc.php.opts delete mode 100644 hphp/test/slow/inout/interp-retm/tests/fb-intercept-bad-handler.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/fb-intercept-bad-handler.php.expectf delete mode 120000 hphp/test/slow/inout/interp-retm/tests/fb-intercept-bad-handler.php.hphp_opts delete mode 120000 hphp/test/slow/inout/interp-retm/tests/fb-intercept-bad-handler.php.opts delete mode 100644 hphp/test/slow/inout/interp-retm/tests/fb-intercept-reffy.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/fb-intercept-reffy.php.expect delete mode 120000 hphp/test/slow/inout/interp-retm/tests/fb-intercept-reffy.php.hphp_opts delete mode 120000 hphp/test/slow/inout/interp-retm/tests/fb-intercept-reffy.php.opts delete mode 100644 hphp/test/slow/inout/interp-retm/tests/fb-intercept-wrapper.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/fb-intercept-wrapper.php.expect delete mode 120000 hphp/test/slow/inout/interp-retm/tests/fb-intercept-wrapper.php.hphp_opts delete mode 120000 hphp/test/slow/inout/interp-retm/tests/fb-intercept-wrapper.php.opts delete mode 100644 hphp/test/slow/inout/interp-retm/tests/fb-intercept.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/fb-intercept.php.expect delete mode 120000 hphp/test/slow/inout/interp-retm/tests/fb-intercept.php.hphp_opts delete mode 120000 hphp/test/slow/inout/interp-retm/tests/fb-intercept.php.opts delete mode 100644 hphp/test/slow/inout/interp-retm/tests/func-interop-dynamic.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/func-interop-dynamic.php.expect delete mode 100644 hphp/test/slow/inout/interp-retm/tests/func-interop-static.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/func-interop-static.php.expect delete mode 100644 hphp/test/slow/inout/interp-retm/tests/inout-decl.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/inout-decl.php.expect delete mode 100644 hphp/test/slow/inout/interp-retm/tests/inout_param_mixed_hint.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/inout_param_mixed_hint.php.expect delete mode 100644 hphp/test/slow/inout/interp-retm/tests/inout_param_soft_mixed_hint.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/inout_param_soft_mixed_hint.php.expect delete mode 100644 hphp/test/slow/inout/interp-retm/tests/invalid-index.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/invalid-index.php.expectf delete mode 100644 hphp/test/slow/inout/interp-retm/tests/method-dynamic.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/method-dynamic.php.expect delete mode 100644 hphp/test/slow/inout/interp-retm/tests/method-interop-dynamic.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/method-interop-dynamic.php.expectf delete mode 120000 hphp/test/slow/inout/interp-retm/tests/method-interop-dynamic.php.hphp_opts delete mode 120000 hphp/test/slow/inout/interp-retm/tests/method-interop-dynamic.php.opts delete mode 100644 hphp/test/slow/inout/interp-retm/tests/method-interop-static.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/method-interop-static.php.expectf delete mode 120000 hphp/test/slow/inout/interp-retm/tests/method-interop-static.php.hphp_opts delete mode 120000 hphp/test/slow/inout/interp-retm/tests/method-interop-static.php.opts delete mode 100644 hphp/test/slow/inout/interp-retm/tests/method-static.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/method-static.php.expect delete mode 100644 hphp/test/slow/inout/interp-retm/tests/msrv-error.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/msrv-error.php.expectf delete mode 120000 hphp/test/slow/inout/interp-retm/tests/msrv-error.php.skipif delete mode 100644 hphp/test/slow/inout/interp-retm/tests/msrv-unpack-error.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/msrv-unpack-error.php.expectf delete mode 120000 hphp/test/slow/inout/interp-retm/tests/msrv-unpack-error.php.skipif delete mode 100644 hphp/test/slow/inout/interp-retm/tests/out-type-hints.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/out-type-hints.php.expect delete mode 100644 hphp/test/slow/inout/interp-retm/tests/reffy-magic.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/reffy-magic.php.expect delete mode 100644 hphp/test/slow/inout/interp-retm/tests/shadow.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/shadow.php.expect delete mode 100644 hphp/test/slow/inout/interp-retm/tests/side-effects.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/side-effects.php.expect delete mode 100644 hphp/test/slow/inout/interp-retm/tests/trait-magic.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/trait-magic.php.expect delete mode 120000 hphp/test/slow/inout/interp-retm/tests/trait-magic.php.hphp_opts delete mode 120000 hphp/test/slow/inout/interp-retm/tests/trait-magic.php.opts delete mode 100644 hphp/test/slow/inout/interp-retm/tests/variadic-builtin.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/variadic-builtin.php.expect delete mode 100644 hphp/test/slow/inout/interp-retm/tests/variadic-inout.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/variadic-inout.php.expect delete mode 100644 hphp/test/slow/inout/interp-retm/tests/xhp.php delete mode 120000 hphp/test/slow/inout/interp-retm/tests/xhp.php.expect rename hphp/test/slow/inout/{tuple/tests => }/invalid-index.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/invalid-index.php.expectf (100%) delete mode 100755 hphp/test/slow/inout/make_suite.sh rename hphp/test/slow/inout/{tuple/tests => }/method-dynamic.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/method-dynamic.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/method-interop-dynamic.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/method-interop-dynamic.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/method-interop-dynamic.php.hphp_opts (100%) rename hphp/test/slow/inout/{tuple/tests => }/method-interop-dynamic.php.opts (100%) rename hphp/test/slow/inout/{tuple/tests => }/method-interop-static.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/method-interop-static.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/method-interop-static.php.hphp_opts (100%) rename hphp/test/slow/inout/{tuple/tests => }/method-interop-static.php.opts (100%) rename hphp/test/slow/inout/{tuple/tests => }/method-static.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/method-static.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/msrv-error.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/msrv-error.php.expectf (100%) rename hphp/test/slow/inout/{tuple/tests => }/msrv-unpack-error.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/msrv-unpack-error.php.expectf (100%) delete mode 100644 hphp/test/slow/inout/msrv/config.ini delete mode 100644 hphp/test/slow/inout/msrv/hphp_config.ini delete mode 100644 hphp/test/slow/inout/msrv/tests/abstract-method.php delete mode 120000 hphp/test/slow/inout/msrv/tests/abstract-method.php.expect delete mode 120000 hphp/test/slow/inout/msrv/tests/abstract-method.php.hphp_opts delete mode 120000 hphp/test/slow/inout/msrv/tests/abstract-method.php.opts delete mode 100644 hphp/test/slow/inout/msrv/tests/autoloader.php delete mode 120000 hphp/test/slow/inout/msrv/tests/autoloader.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-abstract.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-abstract.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-async-generator.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-async-generator.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-async.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-async.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-call-1.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-call-1.php.expectregex delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-call-10.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-call-10.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-call-11.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-call-11.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-call-12.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-call-12.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-call-13.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-call-13.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-call-14.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-call-14.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-call-15.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-call-15.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-call-2.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-call-2.php.expectregex delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-call-3.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-call-3.php.expectregex delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-call-4.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-call-4.php.expectregex delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-call-5.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-call-5.php.expectregex delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-call-6.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-call-6.php.expectregex delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-call-7.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-call-7.php.expectregex delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-call-8.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-call-8.php.expectregex delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-call-9.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-call-9.php.expectregex delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-class.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-class.php.expectregex delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-constructor.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-constructor.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-decl-1.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-decl-1.php.expectregex delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-decl-2.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-decl-2.php.expectregex delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-func.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-func.php.expectregex delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-generator.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-generator.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-interface.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-interface.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-memoize.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-memoize.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-mixed-mode-1.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-mixed-mode-1.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-mixed-mode-2.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-mixed-mode-2.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-named-constructor.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-named-constructor.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-parent-1.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-parent-1.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-parent-2.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-parent-2.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-parent-3.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-parent-3.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-parent-4.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-parent-4.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-parent-5.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-parent-5.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-parent-6.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-parent-6.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-trait-1.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-trait-1.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-trait-2.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-trait-2.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/bad-trait-3.php delete mode 120000 hphp/test/slow/inout/msrv/tests/bad-trait-3.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/builtin-interop.php delete mode 120000 hphp/test/slow/inout/msrv/tests/builtin-interop.php.expect delete mode 100644 hphp/test/slow/inout/msrv/tests/call-dynamic.php delete mode 120000 hphp/test/slow/inout/msrv/tests/call-dynamic.php.expect delete mode 100644 hphp/test/slow/inout/msrv/tests/call-static.php delete mode 120000 hphp/test/slow/inout/msrv/tests/call-static.php.expect delete mode 100644 hphp/test/slow/inout/msrv/tests/closure.php delete mode 120000 hphp/test/slow/inout/msrv/tests/closure.php.expect delete mode 100644 hphp/test/slow/inout/msrv/tests/complex-expr.php delete mode 120000 hphp/test/slow/inout/msrv/tests/complex-expr.php.expect delete mode 100644 hphp/test/slow/inout/msrv/tests/def-func.php delete mode 120000 hphp/test/slow/inout/msrv/tests/def-func.php.expect delete mode 100644 hphp/test/slow/inout/msrv/tests/double-array-get.php delete mode 120000 hphp/test/slow/inout/msrv/tests/double-array-get.php.expect delete mode 100644 hphp/test/slow/inout/msrv/tests/fb-intercept-argc.php delete mode 120000 hphp/test/slow/inout/msrv/tests/fb-intercept-argc.php.expect delete mode 120000 hphp/test/slow/inout/msrv/tests/fb-intercept-argc.php.hphp_opts delete mode 120000 hphp/test/slow/inout/msrv/tests/fb-intercept-argc.php.opts delete mode 100644 hphp/test/slow/inout/msrv/tests/fb-intercept-bad-handler.php delete mode 120000 hphp/test/slow/inout/msrv/tests/fb-intercept-bad-handler.php.expectf delete mode 120000 hphp/test/slow/inout/msrv/tests/fb-intercept-bad-handler.php.hphp_opts delete mode 120000 hphp/test/slow/inout/msrv/tests/fb-intercept-bad-handler.php.opts delete mode 100644 hphp/test/slow/inout/msrv/tests/fb-intercept-reffy.php delete mode 120000 hphp/test/slow/inout/msrv/tests/fb-intercept-reffy.php.expect delete mode 120000 hphp/test/slow/inout/msrv/tests/fb-intercept-reffy.php.hphp_opts delete mode 120000 hphp/test/slow/inout/msrv/tests/fb-intercept-reffy.php.opts delete mode 100644 hphp/test/slow/inout/msrv/tests/fb-intercept-wrapper.php delete mode 120000 hphp/test/slow/inout/msrv/tests/fb-intercept-wrapper.php.expect delete mode 120000 hphp/test/slow/inout/msrv/tests/fb-intercept-wrapper.php.hphp_opts delete mode 120000 hphp/test/slow/inout/msrv/tests/fb-intercept-wrapper.php.opts delete mode 100644 hphp/test/slow/inout/msrv/tests/fb-intercept.php delete mode 120000 hphp/test/slow/inout/msrv/tests/fb-intercept.php.expect delete mode 120000 hphp/test/slow/inout/msrv/tests/fb-intercept.php.hphp_opts delete mode 120000 hphp/test/slow/inout/msrv/tests/fb-intercept.php.opts delete mode 100644 hphp/test/slow/inout/msrv/tests/func-interop-dynamic.php delete mode 120000 hphp/test/slow/inout/msrv/tests/func-interop-dynamic.php.expect delete mode 100644 hphp/test/slow/inout/msrv/tests/func-interop-static.php delete mode 120000 hphp/test/slow/inout/msrv/tests/func-interop-static.php.expect delete mode 100644 hphp/test/slow/inout/msrv/tests/inout-decl.php delete mode 120000 hphp/test/slow/inout/msrv/tests/inout-decl.php.expect delete mode 100644 hphp/test/slow/inout/msrv/tests/inout_param_mixed_hint.php delete mode 120000 hphp/test/slow/inout/msrv/tests/inout_param_mixed_hint.php.expect delete mode 100644 hphp/test/slow/inout/msrv/tests/inout_param_soft_mixed_hint.php delete mode 120000 hphp/test/slow/inout/msrv/tests/inout_param_soft_mixed_hint.php.expect delete mode 100644 hphp/test/slow/inout/msrv/tests/invalid-index.php delete mode 120000 hphp/test/slow/inout/msrv/tests/invalid-index.php.expectf delete mode 100644 hphp/test/slow/inout/msrv/tests/method-dynamic.php delete mode 120000 hphp/test/slow/inout/msrv/tests/method-dynamic.php.expect delete mode 100644 hphp/test/slow/inout/msrv/tests/method-interop-dynamic.php delete mode 120000 hphp/test/slow/inout/msrv/tests/method-interop-dynamic.php.expectf delete mode 120000 hphp/test/slow/inout/msrv/tests/method-interop-dynamic.php.hphp_opts delete mode 120000 hphp/test/slow/inout/msrv/tests/method-interop-dynamic.php.opts delete mode 100644 hphp/test/slow/inout/msrv/tests/method-interop-static.php delete mode 120000 hphp/test/slow/inout/msrv/tests/method-interop-static.php.expectf delete mode 120000 hphp/test/slow/inout/msrv/tests/method-interop-static.php.hphp_opts delete mode 120000 hphp/test/slow/inout/msrv/tests/method-interop-static.php.opts delete mode 100644 hphp/test/slow/inout/msrv/tests/method-static.php delete mode 120000 hphp/test/slow/inout/msrv/tests/method-static.php.expect delete mode 100644 hphp/test/slow/inout/msrv/tests/msrv-error.php delete mode 120000 hphp/test/slow/inout/msrv/tests/msrv-error.php.expectf delete mode 120000 hphp/test/slow/inout/msrv/tests/msrv-error.php.skipif delete mode 100644 hphp/test/slow/inout/msrv/tests/msrv-unpack-error.php delete mode 120000 hphp/test/slow/inout/msrv/tests/msrv-unpack-error.php.expectf delete mode 120000 hphp/test/slow/inout/msrv/tests/msrv-unpack-error.php.skipif delete mode 100644 hphp/test/slow/inout/msrv/tests/out-type-hints.php delete mode 120000 hphp/test/slow/inout/msrv/tests/out-type-hints.php.expect delete mode 100644 hphp/test/slow/inout/msrv/tests/reffy-magic.php delete mode 120000 hphp/test/slow/inout/msrv/tests/reffy-magic.php.expect delete mode 100644 hphp/test/slow/inout/msrv/tests/shadow.php delete mode 120000 hphp/test/slow/inout/msrv/tests/shadow.php.expect delete mode 100644 hphp/test/slow/inout/msrv/tests/side-effects.php delete mode 120000 hphp/test/slow/inout/msrv/tests/side-effects.php.expect delete mode 100644 hphp/test/slow/inout/msrv/tests/trait-magic.php delete mode 120000 hphp/test/slow/inout/msrv/tests/trait-magic.php.expect delete mode 120000 hphp/test/slow/inout/msrv/tests/trait-magic.php.hphp_opts delete mode 120000 hphp/test/slow/inout/msrv/tests/trait-magic.php.opts delete mode 100644 hphp/test/slow/inout/msrv/tests/variadic-builtin.php delete mode 120000 hphp/test/slow/inout/msrv/tests/variadic-builtin.php.expect delete mode 100644 hphp/test/slow/inout/msrv/tests/variadic-inout.php delete mode 120000 hphp/test/slow/inout/msrv/tests/variadic-inout.php.expect delete mode 100644 hphp/test/slow/inout/msrv/tests/xhp.php delete mode 120000 hphp/test/slow/inout/msrv/tests/xhp.php.expect rename hphp/test/slow/inout/{tuple/tests => }/out-type-hints.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/out-type-hints.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/reffy-magic.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/reffy-magic.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/shadow.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/shadow.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/side-effects.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/side-effects.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/trait-magic.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/trait-magic.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/trait-magic.php.hphp_opts (100%) rename hphp/test/slow/inout/{tuple/tests => }/trait-magic.php.opts (100%) delete mode 100644 hphp/test/slow/inout/tuple/config.ini delete mode 100644 hphp/test/slow/inout/tuple/hphp_config.ini delete mode 100644 hphp/test/slow/inout/tuple/tests/msrv-error.php.skipif delete mode 100644 hphp/test/slow/inout/tuple/tests/msrv-unpack-error.php.skipif rename hphp/test/slow/inout/{tuple/tests => }/variadic-builtin.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/variadic-builtin.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/variadic-inout.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/variadic-inout.php.expect (100%) rename hphp/test/slow/inout/{tuple/tests => }/xhp.php (100%) rename hphp/test/slow/inout/{tuple/tests => }/xhp.php.expect (100%) diff --git a/hphp/compiler/analysis/emitter.cpp b/hphp/compiler/analysis/emitter.cpp index c6af984eed5..822245758c7 100644 --- a/hphp/compiler/analysis/emitter.cpp +++ b/hphp/compiler/analysis/emitter.cpp @@ -173,7 +173,6 @@ void commitGlobalData(std::unique_ptr arrTable) { RuntimeOption::EvalHackArrCompatDVCmpNotices; gd.HackArrCompatSerializeNotices = RuntimeOption::EvalHackArrCompatSerializeNotices; - gd.UseMSRVForInOut = RuntimeOption::EvalUseMSRVForInOut; gd.HackArrDVArrs = RuntimeOption::EvalHackArrDVArrs; for (auto a : Option::APCProfile) { diff --git a/hphp/compiler/option.cpp b/hphp/compiler/option.cpp index 9cbbb8ae605..5b449031575 100644 --- a/hphp/compiler/option.cpp +++ b/hphp/compiler/option.cpp @@ -267,9 +267,6 @@ void Option::Load(const IniSetting::Map& ini, Hdf &config) { Config::Bind(RuntimeOption::EvalNoticeOnBuiltinDynamicCalls, ini, config, "NoticeOnBuiltinDynamicCalls", RuntimeOption::EvalNoticeOnBuiltinDynamicCalls); - Config::Bind(RuntimeOption::EvalUseMSRVForInOut, - ini, config, "UseMSRVForInOut", - RuntimeOption::EvalUseMSRVForInOut); Config::Bind(RuntimeOption::EvalAllowObjectDestructors, ini, config, "AllowObjectDestructors", RuntimeOption::EvalAllowObjectDestructors); diff --git a/hphp/hack/src/hhbc/emit_body.ml b/hphp/hack/src/hhbc/emit_body.ml index d269d0e0d77..780baa90de2 100644 --- a/hphp/hack/src/hhbc/emit_body.ml +++ b/hphp/hack/src/hhbc/emit_body.ml @@ -284,7 +284,6 @@ let is_mixed_or_dynamic t = String_utils.string_ends_with t "HH\\dynamic" let emit_verify_out params = - let msrv = Hhbc_options.use_msrv_for_inout !Hhbc_options.compiler_options in let param_instrs = List.filter_mapi params ~f:(fun i p -> if not @@ Hhas_param.is_inout p then None else let b = match Hhas_param.type_info p with @@ -298,7 +297,7 @@ let emit_verify_out params = if b then instr_verifyOutType (Param_unnamed i) else empty ] )) in - let param_instrs = if msrv then List.rev param_instrs else param_instrs in + let param_instrs = List.rev param_instrs in let len = List.length param_instrs in if len = 0 then (0, empty) else (len, gather param_instrs) diff --git a/hphp/hack/src/hhbc/emit_expression.ml b/hphp/hack/src/hhbc/emit_expression.ml index 9ee6ffec1fd..f790f5caf3b 100644 --- a/hphp/hack/src/hhbc/emit_expression.ml +++ b/hphp/hack/src/hhbc/emit_expression.ml @@ -2839,11 +2839,9 @@ and emit_args_and_call env call_pos args uargs = let rec aux i rem_args inout_setters = match rem_args with | [] -> - let msrv = - Hhbc_options.use_msrv_for_inout !Hhbc_options.compiler_options in let use_unpack = (uargs != []) in let num_inout = List.length inout_setters in - let use_callm = msrv && (num_inout > 0) in + let use_callm = num_inout > 0 in let nargs = List.length all_args in let instr_call = match (use_callm, use_unpack) with | (false, false) -> instr (ICall (FCall nargs)) @@ -2866,7 +2864,6 @@ and emit_args_and_call env call_pos args uargs = else begin let local = Local.get_unnamed_local () in gather [ - if msrv then empty else instr_unboxr; Emit_inout_helpers.emit_list_set_for_inout_call local (List.rev inout_setters) ] @@ -3315,8 +3312,7 @@ and emit_call env pos (_, expr_ as expr) args uargs = | _ -> ()); let nargs = List.length args + List.length uargs in let inout_arg_positions = get_inout_arg_positions args in - let msrv = Hhbc_options.use_msrv_for_inout !Hhbc_options.compiler_options in - let num_uninit = if msrv then List.length inout_arg_positions else 0 in + let num_uninit = List.length inout_arg_positions in let default () = let flavor = if List.is_empty inout_arg_positions then Flavor.ReturnVal else Flavor.Cell in diff --git a/hphp/hack/src/hhbc/emit_inout_function.ml b/hphp/hack/src/hhbc/emit_inout_function.ml index 3b24c6e02b3..05be9cf3e16 100644 --- a/hphp/hack/src/hhbc/emit_inout_function.ml +++ b/hphp/hack/src/hhbc/emit_inout_function.ml @@ -33,29 +33,23 @@ let emit_body_instrs_inout params call_instrs = let inout_params = List.filter_map params ~f:(fun p -> if not @@ Hhas_param.is_inout p then None else Some (instr_setl @@ Local.Named (Hhas_param.name p))) in - let msrv = Hhbc_options.use_msrv_for_inout !Hhbc_options.compiler_options in let local = Local.get_unnamed_local () in let has_variadic = is_last_param_variadic param_count params in let num_inout = List.length inout_params in - let num_uninit = if msrv then num_inout else 0 in gather [ - gather @@ List.init num_uninit ~f:(fun _ -> instr_nulluninit); + gather @@ List.init num_inout ~f:(fun _ -> instr_nulluninit); call_instrs; param_instrs; - begin match (msrv, has_variadic) with - | (false, false) -> instr (ICall (FCall param_count)) - | (false, true) -> instr (ICall (FCallUnpack param_count)) - | (true, false) -> instr (ICall (FCallM (param_count, num_inout + 1))) - | (true, true) -> instr (ICall (FCallUnpackM (param_count, num_inout + 1))) + begin match has_variadic with + | false -> instr (ICall (FCallM (param_count, num_inout + 1))) + | true -> instr (ICall (FCallUnpackM (param_count, num_inout + 1))) end; - begin if msrv then empty else instr_unboxr_nop end; Emit_inout_helpers.emit_list_set_for_inout_call local inout_params; instr_retc ] let emit_body_instrs_ref params call_instrs = let param_count = List.length params in - let msrv = Hhbc_options.use_msrv_for_inout !Hhbc_options.compiler_options in let param_instrs = gather @@ List.map params ~f:(fun p -> let local = Local.Named (Hhas_param.name p) in @@ -79,13 +73,7 @@ let emit_body_instrs_ref params call_instrs = fcall_instr; instr_unboxr_nop; gather param_get_instrs; - if msrv then - instr_retm (List.length param_get_instrs + 1) - else - gather [ - instr_new_vec_array (List.length param_get_instrs + 1); - instr_retc; - ] + instr_retm (List.length param_get_instrs + 1) ] let emit_body_instrs ~wrapper_type env pos params call_instrs = diff --git a/hphp/hack/src/hhbc/emit_inout_helpers.ml b/hphp/hack/src/hhbc/emit_inout_helpers.ml index c79be976868..de6f8bb68ae 100644 --- a/hphp/hack/src/hhbc/emit_inout_helpers.ml +++ b/hphp/hack/src/hhbc/emit_inout_helpers.ml @@ -82,29 +82,10 @@ let emit_list_set_for_inout_call local inout_params = Local.scope @@ fun () -> let all_but_last, last = List.split_n inout_params (List.length inout_params - 1) in let last = List.hd_exn last in - let msrv = - Hhbc_options.use_msrv_for_inout !Hhbc_options.compiler_options in - match msrv with - | false -> - let try_body = - gather [ - emit_set_instrs (Some local) (1, instr_setl local); - gather @@ List.map all_but_last ~f:(emit_set_instrs (Some local)); - emit_set_instrs ~is_last:true (Some local) last - ] - in - let unset_instr = instr_unsetl local in - let f_label = Label.next_fault () in - let fault_body = gather [ unset_instr; instr_unwind ] in - gather [ - instr_try_fault f_label try_body fault_body; - unset_instr - ] - | true -> - gather [ - instr_setl local; - instr_popc; - gather @@ List.map all_but_last ~f:(emit_set_instrs None); - emit_set_instrs ~is_last:true None last; - instr_pushl local - ] + gather [ + instr_setl local; + instr_popc; + gather @@ List.map all_but_last ~f:(emit_set_instrs None); + emit_set_instrs ~is_last:true None last; + instr_pushl local + ] diff --git a/hphp/hack/src/hhbc/hhbc_options.ml b/hphp/hack/src/hhbc/hhbc_options.ml index 4bd48b96e3b..7ce78245053 100644 --- a/hphp/hack/src/hhbc/hhbc_options.ml +++ b/hphp/hack/src/hhbc/hhbc_options.ml @@ -34,7 +34,6 @@ type t = { option_repo_authoritative : bool; option_jit_enable_rename_function : bool; option_can_inline_gen_functions : bool; - option_use_msrv_for_inout : bool; option_php7_int_semantics : bool; option_autoprime_generators : bool; option_enable_is_expr_primitive_migration : bool; @@ -72,7 +71,6 @@ let default = { option_repo_authoritative = false; option_jit_enable_rename_function = false; option_can_inline_gen_functions = true; - option_use_msrv_for_inout = true; option_php7_int_semantics = false; option_autoprime_generators = true; option_enable_is_expr_primitive_migration = true; @@ -108,7 +106,6 @@ let dynamic_invoke_functions o = o.option_dynamic_invoke_functions let repo_authoritative o = o.option_repo_authoritative let jit_enable_rename_function o = o.option_jit_enable_rename_function let can_inline_gen_functions o = o.option_can_inline_gen_functions -let use_msrv_for_inout o = o.option_use_msrv_for_inout let php7_int_semantics o = o.option_php7_int_semantics let autoprime_generators o = o.option_autoprime_generators let enable_is_expr_primitive_migration o = o.option_enable_is_expr_primitive_migration @@ -151,7 +148,6 @@ let to_string o = ; Printf.sprintf "jit_enable_rename_function: %B" @@ jit_enable_rename_function o ; Printf.sprintf "can_inline_gen_functions: %B" @@ can_inline_gen_functions o - ; Printf.sprintf "use_msrv_for_inout: %B" @@ use_msrv_for_inout o ; Printf.sprintf "php7_int_semantics: %B" @@ php7_int_semantics o ; Printf.sprintf "autoprime_generators: %B" @@ autoprime_generators o ; Printf.sprintf "enable_is_expr_primitive_migration: %B" @@ -219,8 +215,6 @@ let set_option options name value = let v = not (as_bool value) in { options with option_constant_folding = v; option_can_inline_gen_functions = v} - | "hhvm.use_msrv_for_in_out" -> - { options with option_use_msrv_for_inout = as_bool value } | "hhvm.php7.int_semantics" -> { options with option_php7_int_semantics = as_bool value } | "hack.lang.autoprimegenerators" -> @@ -333,8 +327,6 @@ let value_setters = [ fun opts v -> { opts with option_repo_authoritative = (v = 1) }); (set_value "hhvm.jit_enable_rename_function" get_value_from_config_int @@ fun opts v -> { opts with option_jit_enable_rename_function = (v = 1) }); - (set_value "hhvm.use_msrv_for_in_out" get_value_from_config_int @@ - fun opts v -> { opts with option_use_msrv_for_inout = (v = 1) }); (set_value "hhvm.php7.int_semantics" get_value_from_config_int @@ fun opts v -> { opts with option_php7_int_semantics = (v = 1) }); (set_value "hhvm.hack.lang.autoprime_generators" get_value_from_config_int @@ diff --git a/hphp/hack/src/hhbc/try_finally_rewriter.ml b/hphp/hack/src/hhbc/try_finally_rewriter.ml index efd9dbe7ef0..d28a1a01c16 100644 --- a/hphp/hack/src/hhbc/try_finally_rewriter.ml +++ b/hphp/hack/src/hhbc/try_finally_rewriter.ml @@ -154,7 +154,6 @@ let emit_return let ret_instr = if need_ref then instr_retv else instr_retc in (* check if there are try/finally region *) let jump_targets = Emit_env.get_jump_targets env in - let msrv = Hhbc_options.use_msrv_for_inout !Hhbc_options.compiler_options in begin match JT.get_closest_enclosing_finally_label jump_targets with (* no finally blocks, but there might be some iterators that should be released before exit - do it *) @@ -181,16 +180,14 @@ let emit_return load_retval_instr; verify_return_instr; verify_out; - if not msrv && num_out <> 0 then instr_new_vec_array (num_out + 1) else empty; release_iterators_instr; - if msrv && num_out <> 0 then instr_retm (num_out + 1) else ret_instr + if num_out <> 0 then instr_retm (num_out + 1) else ret_instr ] else gather [ verify_return_instr; verify_out; - if not msrv && num_out <> 0 then instr_new_vec_array (num_out + 1) else empty; release_iterators_instr; - if msrv && num_out <> 0 then instr_retm (num_out + 1) else ret_instr + if num_out <> 0 then instr_retm (num_out + 1) else ret_instr ] (* ret is in finally block and there might be iterators to release - jump to finally block via Jmp/IterBreak *) diff --git a/hphp/hhbbc/main.cpp b/hphp/hhbbc/main.cpp index 4c8957e4b65..ee314f54342 100644 --- a/hphp/hhbbc/main.cpp +++ b/hphp/hhbbc/main.cpp @@ -286,7 +286,6 @@ std::pair>, gd.HackArrCompatDVCmpNotices; RuntimeOption::EvalHackArrCompatSerializeNotices = gd.HackArrCompatSerializeNotices; - RuntimeOption::EvalUseMSRVForInOut = gd.UseMSRVForInOut; RuntimeOption::EvalHackArrDVArrs = gd.HackArrDVArrs; RuntimeOption::EvalDisableReturnByReference = gd.DisableReturnByReference; return { @@ -377,7 +376,6 @@ void write_global_data( for (auto const& elm : RuntimeOption::ConstantFunctions) { gd.ConstantFunctions.push_back(elm); } - gd.UseMSRVForInOut = RuntimeOption::EvalUseMSRVForInOut; globalArrayTypeTable().repopulate(*arrTable); // NOTE: There's no way to tell if saveGlobalData() fails for some reason. diff --git a/hphp/runtime/base/execution-context.cpp b/hphp/runtime/base/execution-context.cpp index 8a440539b25..2f5bfe4a762 100644 --- a/hphp/runtime/base/execution-context.cpp +++ b/hphp/runtime/base/execution-context.cpp @@ -1682,7 +1682,7 @@ TypedValue ExecutionContext::invokeFuncImpl(const Func* f, TypedValue retval; if (doStackCheck(retval)) return retval; - if (UNLIKELY(RuntimeOption::EvalUseMSRVForInOut && f->takesInOutParams())) { + if (UNLIKELY(f->takesInOutParams())) { for (auto i = f->numInOutParams(); i > 0; --i) vmStack().pushNull(); } @@ -1705,7 +1705,7 @@ TypedValue ExecutionContext::invokeFuncImpl(const Func* f, ar->trashVarEnv(); } - if (UNLIKELY(RuntimeOption::EvalUseMSRVForInOut && f->takesInOutParams())) { + if (UNLIKELY(f->takesInOutParams())) { ar->setFCallM(); } @@ -1747,7 +1747,7 @@ TypedValue ExecutionContext::invokeFuncImpl(const Func* f, // `retptr' might point somewhere that is affected by {push,pop}VMState(), // so don't write to it until after we pop the nested VM state. - if (UNLIKELY(RuntimeOption::EvalUseMSRVForInOut && f->takesInOutParams())) { + if (UNLIKELY(f->takesInOutParams())) { VArrayInit varr(f->numInOutParams() + 1); for (uint32_t i = 0; i < f->numInOutParams() + 1; ++i) { varr.append(*vmStack().topTV()); diff --git a/hphp/runtime/base/runtime-option.h b/hphp/runtime/base/runtime-option.h index 4fca4e06e66..9f148a31849 100644 --- a/hphp/runtime/base/runtime-option.h +++ b/hphp/runtime/base/runtime-option.h @@ -854,11 +854,6 @@ struct RuntimeOption { F(int32_t, ForbidDynamicCalls, 0) \ F(int32_t, ServerOOMAdj, 0) \ F(std::string, PreludePath, "") \ - /* Use the CallM/RetM ABI to return multiple values via the stack for \ - inout functions */ \ - F(bool, UseMSRVForInOut, true) \ - F(bool, HHIRGenerateCallM, true) \ - F(bool, HHIRGenerateRetM, true) \ F(uint32_t, NonSharedInstanceMemoCaches, 10) \ F(std::vector, IniGetHide, std::vector()) \ F(std::string, UseRemoteUnixServer, "no") \ diff --git a/hphp/runtime/base/unit-cache.cpp b/hphp/runtime/base/unit-cache.cpp index 5361e7efb40..f366f77a4be 100644 --- a/hphp/runtime/base/unit-cache.cpp +++ b/hphp/runtime/base/unit-cache.cpp @@ -680,7 +680,6 @@ std::string mangleUnitMd5(const std::string& fileMd5) { + (RuntimeOption::EvalNoticeOnBuiltinDynamicCalls ? '1' : '0') + (RuntimeOption::EvalHackArrDVArrs ? '1' : '0') + (RuntimeOption::EvalDisableHphpcOpts ? '1' : '0') - + (RuntimeOption::EvalUseMSRVForInOut ? '1' : '0') + (RuntimeOption::EvalAllowObjectDestructors ? '1' : '0') + (RuntimeOption::EvalAssemblerFoldDefaultValues ? '1' : '0') + RuntimeOption::EvalHackCompilerCommand + '\0' diff --git a/hphp/runtime/vm/event-hook.cpp b/hphp/runtime/vm/event-hook.cpp index 9aa363e8b7f..9e57d2f97d3 100644 --- a/hphp/runtime/vm/event-hook.cpp +++ b/hphp/runtime/vm/event-hook.cpp @@ -385,47 +385,28 @@ bool EventHook::RunInterceptHandler(ActRec* ar) { if (UNLIKELY(func->takesInOutParams())) { uint32_t count = func->numInOutParams(); - if (RuntimeOption::EvalUseMSRVForInOut) { - auto start = stack.topTV(); - auto const end = start + count; - - auto push = [&] (TypedValue v) { - assertx(start < end); - tvIncRefGen(v); - *start++ = v; - }; - - uint32_t param = 0; - IterateKV(args.get(), [&] (Cell, TypedValue v) { - if (param >= func->numParams() || !func->params()[param++].inout) { - return; - } - push(v); - }); - - while (start < end) push(make_tv()); - cellDup(*ret.asCell(), *stack.allocTV()); - } else { - VArrayInit varr(count + 1); - varr.append(*ret.asCell()); - - uint32_t param = 0; - uint32_t added = 0; - IterateKV(args.get(), [&] (Cell, TypedValue v) { - if (param >= func->numParams() || !func->params()[param++].inout) { - return; - } - added++; - varr.append(v); - }); + auto start = stack.topTV(); + auto const end = start + count; + + auto push = [&] (TypedValue v) { + assertx(start < end); + tvIncRefGen(v); + *start++ = v; + }; + + uint32_t param = 0; + IterateKV(args.get(), [&] (Cell, TypedValue v) { + if (param >= func->numParams() || !func->params()[param++].inout) { + return; + } + push(v); + }); - for (; added < count; ++added) varr.append(make_tv()); - *stack.allocTV() = make_array_like_tv(varr.toArray().detach()); - } - } else { - cellDup(*ret.asCell(), *stack.allocTV()); + while (start < end) push(make_tv()); } + cellDup(*ret.asCell(), *stack.allocTV()); + vmfp() = outer; vmpc() = outer ? outer->func()->unit()->at(pcOff) : nullptr; diff --git a/hphp/runtime/vm/interp-helpers.h b/hphp/runtime/vm/interp-helpers.h index 4af41487034..f582d03cd2e 100644 --- a/hphp/runtime/vm/interp-helpers.h +++ b/hphp/runtime/vm/interp-helpers.h @@ -66,7 +66,6 @@ inline void calleeDynamicCallChecks(const ActRec* ar) { } inline void checkForRequiredCallM(const ActRec* ar) { - if (!RuntimeOption::EvalUseMSRVForInOut) return; if (!ar->func()->takesInOutParams()) return; if (!ar->isFCallM()) { diff --git a/hphp/runtime/vm/jit/irgen-call.cpp b/hphp/runtime/vm/jit/irgen-call.cpp index 679efe50772..10377843e83 100644 --- a/hphp/runtime/vm/jit/irgen-call.cpp +++ b/hphp/runtime/vm/jit/irgen-call.cpp @@ -1511,10 +1511,6 @@ void emitFCallUnpack(IRGS& env, uint32_t numParams) { } void emitFCallUnpackM(IRGS& env, uint32_t numParams, uint32_t numOut) { - if (!RuntimeOption::EvalHHIRGenerateCallM) { - interpOne(env, *env.currentNormalizedInstruction); - return; - } implFCallUnpack(env, numParams, numOut - 1); } @@ -1572,10 +1568,6 @@ void emitFCallD(IRGS& env, } void emitFCallM(IRGS& env, uint32_t numParams, uint32_t numOut) { - if (!RuntimeOption::EvalHHIRGenerateCallM) { - interpOne(env, *env.currentNormalizedInstruction); - return; - } implFCall(env, numParams, numOut - 1); } @@ -1584,10 +1576,6 @@ void emitFCallDM(IRGS& env, uint32_t numOut, const StringData*, const StringData*) { - if (!RuntimeOption::EvalHHIRGenerateCallM) { - interpOne(env, *env.currentNormalizedInstruction); - return; - } implFCall(env, numParams, numOut - 1); } diff --git a/hphp/runtime/vm/jit/irgen-func-prologue.cpp b/hphp/runtime/vm/jit/irgen-func-prologue.cpp index 86d44072553..836e594a6c3 100644 --- a/hphp/runtime/vm/jit/irgen-func-prologue.cpp +++ b/hphp/runtime/vm/jit/irgen-func-prologue.cpp @@ -534,7 +534,7 @@ const StaticString void emitCallMCheck(IRGS& env) { auto const func = curFunc(env); - if (!RuntimeOption::EvalUseMSRVForInOut || !func->takesInOutParams()) { + if (!func->takesInOutParams()) { return; } diff --git a/hphp/runtime/vm/jit/irgen-ret.cpp b/hphp/runtime/vm/jit/irgen-ret.cpp index 64c6c97920d..bb719a802c2 100644 --- a/hphp/runtime/vm/jit/irgen-ret.cpp +++ b/hphp/runtime/vm/jit/irgen-ret.cpp @@ -251,11 +251,6 @@ void emitRetM(IRGS& env, uint32_t nvals) { assertx(!curFunc(env)->isResumable()); assertx(nvals > 1); - if (!RuntimeOption::EvalHHIRGenerateRetM) { - interpOne(env, *env.currentNormalizedInstruction); - return; - } - // Pop the return values. Since they will be teleported to their places in // memory, we don't care about their types. for (int i = 0; i < nvals - 1; i++) { diff --git a/hphp/runtime/vm/repo-global-data.h b/hphp/runtime/vm/repo-global-data.h index fae3dc7d456..675cd4e2918 100644 --- a/hphp/runtime/vm/repo-global-data.h +++ b/hphp/runtime/vm/repo-global-data.h @@ -191,12 +191,6 @@ struct Repo::GlobalData { bool ReffinessInvariance = false; /* - * Should we use the multiple stack return value optimization for inout - * function calls? - */ - bool UseMSRVForInOut = false; - - /* * Are objects allowed to run destructors? */ bool AllowObjectDestructors = false; @@ -240,7 +234,6 @@ struct Repo::GlobalData { (ReffinessInvariance) (ForbidDynamicCalls) (NoticeOnBuiltinDynamicCalls) - (UseMSRVForInOut) (AllowObjectDestructors) (Signature) (DisableReturnByReference) diff --git a/hphp/test/one_bit_refcount_failing_slow b/hphp/test/one_bit_refcount_failing_slow index 34e2c011cd3..da60edac8a3 100644 --- a/hphp/test/one_bit_refcount_failing_slow +++ b/hphp/test/one_bit_refcount_failing_slow @@ -14,8 +14,8 @@ slow/ext_vsdebug/launch.php slow/ext_vsdebug/set_variable.php slow/ext_vsdebug/step.php slow/dict/ref-fail-leak.php -slow/inout/tuple/tests/complex-expr.php -slow/inout/tuple/tests/invalid-index.php +slow/inout/complex-expr.php +slow/inout/invalid-index.php slow/vec/ref-fail-leak.php slow/unserialize-reference-overwritten.php slow/hack_arr_compat/parse-str.php diff --git a/hphp/test/slow/inout/tuple/tests/abstract-method.php b/hphp/test/slow/inout/abstract-method.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/abstract-method.php rename to hphp/test/slow/inout/abstract-method.php diff --git a/hphp/test/slow/inout/tuple/tests/abstract-method.php.expect b/hphp/test/slow/inout/abstract-method.php.expect similarity index 100% rename from hphp/test/slow/inout/tuple/tests/abstract-method.php.expect rename to hphp/test/slow/inout/abstract-method.php.expect diff --git a/hphp/test/slow/inout/tuple/tests/abstract-method.php.hphp_opts b/hphp/test/slow/inout/abstract-method.php.hphp_opts similarity index 100% rename from hphp/test/slow/inout/tuple/tests/abstract-method.php.hphp_opts rename to hphp/test/slow/inout/abstract-method.php.hphp_opts diff --git a/hphp/test/slow/inout/tuple/tests/abstract-method.php.opts b/hphp/test/slow/inout/abstract-method.php.opts similarity index 100% rename from hphp/test/slow/inout/tuple/tests/abstract-method.php.opts rename to hphp/test/slow/inout/abstract-method.php.opts diff --git a/hphp/test/slow/inout/tuple/tests/autoloader.php b/hphp/test/slow/inout/autoloader.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/autoloader.php rename to hphp/test/slow/inout/autoloader.php diff --git a/hphp/test/slow/inout/tuple/tests/autoloader.php.expectf b/hphp/test/slow/inout/autoloader.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/autoloader.php.expectf rename to hphp/test/slow/inout/autoloader.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-abstract.php b/hphp/test/slow/inout/bad-abstract.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-abstract.php rename to hphp/test/slow/inout/bad-abstract.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-abstract.php.expectf b/hphp/test/slow/inout/bad-abstract.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-abstract.php.expectf rename to hphp/test/slow/inout/bad-abstract.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-async-generator.php b/hphp/test/slow/inout/bad-async-generator.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-async-generator.php rename to hphp/test/slow/inout/bad-async-generator.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-async-generator.php.expectf b/hphp/test/slow/inout/bad-async-generator.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-async-generator.php.expectf rename to hphp/test/slow/inout/bad-async-generator.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-async.php b/hphp/test/slow/inout/bad-async.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-async.php rename to hphp/test/slow/inout/bad-async.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-async.php.expectf b/hphp/test/slow/inout/bad-async.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-async.php.expectf rename to hphp/test/slow/inout/bad-async.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-1.php b/hphp/test/slow/inout/bad-call-1.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-1.php rename to hphp/test/slow/inout/bad-call-1.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-1.php.expectregex b/hphp/test/slow/inout/bad-call-1.php.expectregex similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-1.php.expectregex rename to hphp/test/slow/inout/bad-call-1.php.expectregex diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-10.php b/hphp/test/slow/inout/bad-call-10.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-10.php rename to hphp/test/slow/inout/bad-call-10.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-10.php.expectf b/hphp/test/slow/inout/bad-call-10.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-10.php.expectf rename to hphp/test/slow/inout/bad-call-10.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-11.php b/hphp/test/slow/inout/bad-call-11.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-11.php rename to hphp/test/slow/inout/bad-call-11.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-11.php.expectf b/hphp/test/slow/inout/bad-call-11.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-11.php.expectf rename to hphp/test/slow/inout/bad-call-11.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-12.php b/hphp/test/slow/inout/bad-call-12.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-12.php rename to hphp/test/slow/inout/bad-call-12.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-12.php.expectf b/hphp/test/slow/inout/bad-call-12.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-12.php.expectf rename to hphp/test/slow/inout/bad-call-12.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-13.php b/hphp/test/slow/inout/bad-call-13.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-13.php rename to hphp/test/slow/inout/bad-call-13.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-13.php.expectf b/hphp/test/slow/inout/bad-call-13.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-13.php.expectf rename to hphp/test/slow/inout/bad-call-13.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-14.php b/hphp/test/slow/inout/bad-call-14.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-14.php rename to hphp/test/slow/inout/bad-call-14.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-14.php.expectf b/hphp/test/slow/inout/bad-call-14.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-14.php.expectf rename to hphp/test/slow/inout/bad-call-14.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-15.php b/hphp/test/slow/inout/bad-call-15.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-15.php rename to hphp/test/slow/inout/bad-call-15.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-15.php.expectf b/hphp/test/slow/inout/bad-call-15.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-15.php.expectf rename to hphp/test/slow/inout/bad-call-15.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-2.php b/hphp/test/slow/inout/bad-call-2.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-2.php rename to hphp/test/slow/inout/bad-call-2.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-2.php.expectregex b/hphp/test/slow/inout/bad-call-2.php.expectregex similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-2.php.expectregex rename to hphp/test/slow/inout/bad-call-2.php.expectregex diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-3.php b/hphp/test/slow/inout/bad-call-3.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-3.php rename to hphp/test/slow/inout/bad-call-3.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-3.php.expectregex b/hphp/test/slow/inout/bad-call-3.php.expectregex similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-3.php.expectregex rename to hphp/test/slow/inout/bad-call-3.php.expectregex diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-4.php b/hphp/test/slow/inout/bad-call-4.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-4.php rename to hphp/test/slow/inout/bad-call-4.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-4.php.expectregex b/hphp/test/slow/inout/bad-call-4.php.expectregex similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-4.php.expectregex rename to hphp/test/slow/inout/bad-call-4.php.expectregex diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-5.php b/hphp/test/slow/inout/bad-call-5.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-5.php rename to hphp/test/slow/inout/bad-call-5.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-5.php.expectregex b/hphp/test/slow/inout/bad-call-5.php.expectregex similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-5.php.expectregex rename to hphp/test/slow/inout/bad-call-5.php.expectregex diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-6.php b/hphp/test/slow/inout/bad-call-6.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-6.php rename to hphp/test/slow/inout/bad-call-6.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-6.php.expectregex b/hphp/test/slow/inout/bad-call-6.php.expectregex similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-6.php.expectregex rename to hphp/test/slow/inout/bad-call-6.php.expectregex diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-7.php b/hphp/test/slow/inout/bad-call-7.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-7.php rename to hphp/test/slow/inout/bad-call-7.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-7.php.expectregex b/hphp/test/slow/inout/bad-call-7.php.expectregex similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-7.php.expectregex rename to hphp/test/slow/inout/bad-call-7.php.expectregex diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-8.php b/hphp/test/slow/inout/bad-call-8.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-8.php rename to hphp/test/slow/inout/bad-call-8.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-8.php.expectregex b/hphp/test/slow/inout/bad-call-8.php.expectregex similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-8.php.expectregex rename to hphp/test/slow/inout/bad-call-8.php.expectregex diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-9.php b/hphp/test/slow/inout/bad-call-9.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-9.php rename to hphp/test/slow/inout/bad-call-9.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-call-9.php.expectregex b/hphp/test/slow/inout/bad-call-9.php.expectregex similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-call-9.php.expectregex rename to hphp/test/slow/inout/bad-call-9.php.expectregex diff --git a/hphp/test/slow/inout/tuple/tests/bad-class.php b/hphp/test/slow/inout/bad-class.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-class.php rename to hphp/test/slow/inout/bad-class.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-class.php.expectregex b/hphp/test/slow/inout/bad-class.php.expectregex similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-class.php.expectregex rename to hphp/test/slow/inout/bad-class.php.expectregex diff --git a/hphp/test/slow/inout/tuple/tests/bad-constructor.php b/hphp/test/slow/inout/bad-constructor.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-constructor.php rename to hphp/test/slow/inout/bad-constructor.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-constructor.php.expectf b/hphp/test/slow/inout/bad-constructor.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-constructor.php.expectf rename to hphp/test/slow/inout/bad-constructor.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-decl-1.php b/hphp/test/slow/inout/bad-decl-1.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-decl-1.php rename to hphp/test/slow/inout/bad-decl-1.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-decl-1.php.expectregex b/hphp/test/slow/inout/bad-decl-1.php.expectregex similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-decl-1.php.expectregex rename to hphp/test/slow/inout/bad-decl-1.php.expectregex diff --git a/hphp/test/slow/inout/tuple/tests/bad-decl-2.php b/hphp/test/slow/inout/bad-decl-2.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-decl-2.php rename to hphp/test/slow/inout/bad-decl-2.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-decl-2.php.expectregex b/hphp/test/slow/inout/bad-decl-2.php.expectregex similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-decl-2.php.expectregex rename to hphp/test/slow/inout/bad-decl-2.php.expectregex diff --git a/hphp/test/slow/inout/tuple/tests/bad-func.php b/hphp/test/slow/inout/bad-func.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-func.php rename to hphp/test/slow/inout/bad-func.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-func.php.expectregex b/hphp/test/slow/inout/bad-func.php.expectregex similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-func.php.expectregex rename to hphp/test/slow/inout/bad-func.php.expectregex diff --git a/hphp/test/slow/inout/tuple/tests/bad-generator.php b/hphp/test/slow/inout/bad-generator.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-generator.php rename to hphp/test/slow/inout/bad-generator.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-generator.php.expectf b/hphp/test/slow/inout/bad-generator.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-generator.php.expectf rename to hphp/test/slow/inout/bad-generator.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-interface.php b/hphp/test/slow/inout/bad-interface.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-interface.php rename to hphp/test/slow/inout/bad-interface.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-interface.php.expectf b/hphp/test/slow/inout/bad-interface.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-interface.php.expectf rename to hphp/test/slow/inout/bad-interface.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-memoize.php b/hphp/test/slow/inout/bad-memoize.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-memoize.php rename to hphp/test/slow/inout/bad-memoize.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-memoize.php.expectf b/hphp/test/slow/inout/bad-memoize.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-memoize.php.expectf rename to hphp/test/slow/inout/bad-memoize.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-mixed-mode-1.php b/hphp/test/slow/inout/bad-mixed-mode-1.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-mixed-mode-1.php rename to hphp/test/slow/inout/bad-mixed-mode-1.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-mixed-mode-1.php.expectf b/hphp/test/slow/inout/bad-mixed-mode-1.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-mixed-mode-1.php.expectf rename to hphp/test/slow/inout/bad-mixed-mode-1.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-mixed-mode-2.php b/hphp/test/slow/inout/bad-mixed-mode-2.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-mixed-mode-2.php rename to hphp/test/slow/inout/bad-mixed-mode-2.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-mixed-mode-2.php.expectf b/hphp/test/slow/inout/bad-mixed-mode-2.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-mixed-mode-2.php.expectf rename to hphp/test/slow/inout/bad-mixed-mode-2.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-named-constructor.php b/hphp/test/slow/inout/bad-named-constructor.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-named-constructor.php rename to hphp/test/slow/inout/bad-named-constructor.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-named-constructor.php.expectf b/hphp/test/slow/inout/bad-named-constructor.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-named-constructor.php.expectf rename to hphp/test/slow/inout/bad-named-constructor.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-parent-1.php b/hphp/test/slow/inout/bad-parent-1.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-parent-1.php rename to hphp/test/slow/inout/bad-parent-1.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-parent-1.php.expectf b/hphp/test/slow/inout/bad-parent-1.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-parent-1.php.expectf rename to hphp/test/slow/inout/bad-parent-1.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-parent-2.php b/hphp/test/slow/inout/bad-parent-2.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-parent-2.php rename to hphp/test/slow/inout/bad-parent-2.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-parent-2.php.expectf b/hphp/test/slow/inout/bad-parent-2.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-parent-2.php.expectf rename to hphp/test/slow/inout/bad-parent-2.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-parent-3.php b/hphp/test/slow/inout/bad-parent-3.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-parent-3.php rename to hphp/test/slow/inout/bad-parent-3.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-parent-3.php.expectf b/hphp/test/slow/inout/bad-parent-3.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-parent-3.php.expectf rename to hphp/test/slow/inout/bad-parent-3.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-parent-4.php b/hphp/test/slow/inout/bad-parent-4.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-parent-4.php rename to hphp/test/slow/inout/bad-parent-4.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-parent-4.php.expectf b/hphp/test/slow/inout/bad-parent-4.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-parent-4.php.expectf rename to hphp/test/slow/inout/bad-parent-4.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-parent-5.php b/hphp/test/slow/inout/bad-parent-5.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-parent-5.php rename to hphp/test/slow/inout/bad-parent-5.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-parent-5.php.expectf b/hphp/test/slow/inout/bad-parent-5.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-parent-5.php.expectf rename to hphp/test/slow/inout/bad-parent-5.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-parent-6.php b/hphp/test/slow/inout/bad-parent-6.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-parent-6.php rename to hphp/test/slow/inout/bad-parent-6.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-parent-6.php.expectf b/hphp/test/slow/inout/bad-parent-6.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-parent-6.php.expectf rename to hphp/test/slow/inout/bad-parent-6.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-trait-1.php b/hphp/test/slow/inout/bad-trait-1.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-trait-1.php rename to hphp/test/slow/inout/bad-trait-1.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-trait-1.php.expectf b/hphp/test/slow/inout/bad-trait-1.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-trait-1.php.expectf rename to hphp/test/slow/inout/bad-trait-1.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-trait-2.php b/hphp/test/slow/inout/bad-trait-2.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-trait-2.php rename to hphp/test/slow/inout/bad-trait-2.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-trait-2.php.expectf b/hphp/test/slow/inout/bad-trait-2.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-trait-2.php.expectf rename to hphp/test/slow/inout/bad-trait-2.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/bad-trait-3.php b/hphp/test/slow/inout/bad-trait-3.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-trait-3.php rename to hphp/test/slow/inout/bad-trait-3.php diff --git a/hphp/test/slow/inout/tuple/tests/bad-trait-3.php.expectf b/hphp/test/slow/inout/bad-trait-3.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/bad-trait-3.php.expectf rename to hphp/test/slow/inout/bad-trait-3.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/builtin-interop.php b/hphp/test/slow/inout/builtin-interop.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/builtin-interop.php rename to hphp/test/slow/inout/builtin-interop.php diff --git a/hphp/test/slow/inout/tuple/tests/builtin-interop.php.expect b/hphp/test/slow/inout/builtin-interop.php.expect similarity index 100% rename from hphp/test/slow/inout/tuple/tests/builtin-interop.php.expect rename to hphp/test/slow/inout/builtin-interop.php.expect diff --git a/hphp/test/slow/inout/tuple/tests/call-dynamic.php b/hphp/test/slow/inout/call-dynamic.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/call-dynamic.php rename to hphp/test/slow/inout/call-dynamic.php diff --git a/hphp/test/slow/inout/tuple/tests/call-dynamic.php.expect b/hphp/test/slow/inout/call-dynamic.php.expect similarity index 100% rename from hphp/test/slow/inout/tuple/tests/call-dynamic.php.expect rename to hphp/test/slow/inout/call-dynamic.php.expect diff --git a/hphp/test/slow/inout/tuple/tests/call-static.php b/hphp/test/slow/inout/call-static.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/call-static.php rename to hphp/test/slow/inout/call-static.php diff --git a/hphp/test/slow/inout/tuple/tests/call-static.php.expect b/hphp/test/slow/inout/call-static.php.expect similarity index 100% rename from hphp/test/slow/inout/tuple/tests/call-static.php.expect rename to hphp/test/slow/inout/call-static.php.expect diff --git a/hphp/test/slow/inout/tuple/tests/closure.php b/hphp/test/slow/inout/closure.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/closure.php rename to hphp/test/slow/inout/closure.php diff --git a/hphp/test/slow/inout/tuple/tests/closure.php.expect b/hphp/test/slow/inout/closure.php.expect similarity index 100% rename from hphp/test/slow/inout/tuple/tests/closure.php.expect rename to hphp/test/slow/inout/closure.php.expect diff --git a/hphp/test/slow/inout/tuple/tests/complex-expr.php b/hphp/test/slow/inout/complex-expr.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/complex-expr.php rename to hphp/test/slow/inout/complex-expr.php diff --git a/hphp/test/slow/inout/tuple/tests/complex-expr.php.expect b/hphp/test/slow/inout/complex-expr.php.expect similarity index 100% rename from hphp/test/slow/inout/tuple/tests/complex-expr.php.expect rename to hphp/test/slow/inout/complex-expr.php.expect diff --git a/hphp/test/slow/inout/tuple/tests/def-func.php b/hphp/test/slow/inout/def-func.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/def-func.php rename to hphp/test/slow/inout/def-func.php diff --git a/hphp/test/slow/inout/tuple/tests/def-func.php.expect b/hphp/test/slow/inout/def-func.php.expect similarity index 100% rename from hphp/test/slow/inout/tuple/tests/def-func.php.expect rename to hphp/test/slow/inout/def-func.php.expect diff --git a/hphp/test/slow/inout/tuple/tests/double-array-get.php b/hphp/test/slow/inout/double-array-get.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/double-array-get.php rename to hphp/test/slow/inout/double-array-get.php diff --git a/hphp/test/slow/inout/tuple/tests/double-array-get.php.expect b/hphp/test/slow/inout/double-array-get.php.expect similarity index 100% rename from hphp/test/slow/inout/tuple/tests/double-array-get.php.expect rename to hphp/test/slow/inout/double-array-get.php.expect diff --git a/hphp/test/slow/inout/tuple/tests/fb-intercept-argc.php b/hphp/test/slow/inout/fb-intercept-argc.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/fb-intercept-argc.php rename to hphp/test/slow/inout/fb-intercept-argc.php diff --git a/hphp/test/slow/inout/tuple/tests/fb-intercept-argc.php.expect b/hphp/test/slow/inout/fb-intercept-argc.php.expect similarity index 100% rename from hphp/test/slow/inout/tuple/tests/fb-intercept-argc.php.expect rename to hphp/test/slow/inout/fb-intercept-argc.php.expect diff --git a/hphp/test/slow/inout/tuple/tests/fb-intercept-argc.php.hphp_opts b/hphp/test/slow/inout/fb-intercept-argc.php.hphp_opts similarity index 100% rename from hphp/test/slow/inout/tuple/tests/fb-intercept-argc.php.hphp_opts rename to hphp/test/slow/inout/fb-intercept-argc.php.hphp_opts diff --git a/hphp/test/slow/inout/tuple/tests/fb-intercept-argc.php.opts b/hphp/test/slow/inout/fb-intercept-argc.php.opts similarity index 100% rename from hphp/test/slow/inout/tuple/tests/fb-intercept-argc.php.opts rename to hphp/test/slow/inout/fb-intercept-argc.php.opts diff --git a/hphp/test/slow/inout/tuple/tests/fb-intercept-bad-handler.php b/hphp/test/slow/inout/fb-intercept-bad-handler.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/fb-intercept-bad-handler.php rename to hphp/test/slow/inout/fb-intercept-bad-handler.php diff --git a/hphp/test/slow/inout/tuple/tests/fb-intercept-bad-handler.php.expectf b/hphp/test/slow/inout/fb-intercept-bad-handler.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/fb-intercept-bad-handler.php.expectf rename to hphp/test/slow/inout/fb-intercept-bad-handler.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/fb-intercept-bad-handler.php.hphp_opts b/hphp/test/slow/inout/fb-intercept-bad-handler.php.hphp_opts similarity index 100% rename from hphp/test/slow/inout/tuple/tests/fb-intercept-bad-handler.php.hphp_opts rename to hphp/test/slow/inout/fb-intercept-bad-handler.php.hphp_opts diff --git a/hphp/test/slow/inout/tuple/tests/fb-intercept-bad-handler.php.opts b/hphp/test/slow/inout/fb-intercept-bad-handler.php.opts similarity index 100% rename from hphp/test/slow/inout/tuple/tests/fb-intercept-bad-handler.php.opts rename to hphp/test/slow/inout/fb-intercept-bad-handler.php.opts diff --git a/hphp/test/slow/inout/tuple/tests/fb-intercept-reffy.php b/hphp/test/slow/inout/fb-intercept-reffy.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/fb-intercept-reffy.php rename to hphp/test/slow/inout/fb-intercept-reffy.php diff --git a/hphp/test/slow/inout/tuple/tests/fb-intercept-reffy.php.expect b/hphp/test/slow/inout/fb-intercept-reffy.php.expect similarity index 100% rename from hphp/test/slow/inout/tuple/tests/fb-intercept-reffy.php.expect rename to hphp/test/slow/inout/fb-intercept-reffy.php.expect diff --git a/hphp/test/slow/inout/tuple/tests/fb-intercept-reffy.php.hphp_opts b/hphp/test/slow/inout/fb-intercept-reffy.php.hphp_opts similarity index 100% rename from hphp/test/slow/inout/tuple/tests/fb-intercept-reffy.php.hphp_opts rename to hphp/test/slow/inout/fb-intercept-reffy.php.hphp_opts diff --git a/hphp/test/slow/inout/tuple/tests/fb-intercept-reffy.php.opts b/hphp/test/slow/inout/fb-intercept-reffy.php.opts similarity index 100% rename from hphp/test/slow/inout/tuple/tests/fb-intercept-reffy.php.opts rename to hphp/test/slow/inout/fb-intercept-reffy.php.opts diff --git a/hphp/test/slow/inout/tuple/tests/fb-intercept-wrapper.php b/hphp/test/slow/inout/fb-intercept-wrapper.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/fb-intercept-wrapper.php rename to hphp/test/slow/inout/fb-intercept-wrapper.php diff --git a/hphp/test/slow/inout/tuple/tests/fb-intercept-wrapper.php.expect b/hphp/test/slow/inout/fb-intercept-wrapper.php.expect similarity index 100% rename from hphp/test/slow/inout/tuple/tests/fb-intercept-wrapper.php.expect rename to hphp/test/slow/inout/fb-intercept-wrapper.php.expect diff --git a/hphp/test/slow/inout/tuple/tests/fb-intercept-wrapper.php.hphp_opts b/hphp/test/slow/inout/fb-intercept-wrapper.php.hphp_opts similarity index 100% rename from hphp/test/slow/inout/tuple/tests/fb-intercept-wrapper.php.hphp_opts rename to hphp/test/slow/inout/fb-intercept-wrapper.php.hphp_opts diff --git a/hphp/test/slow/inout/tuple/tests/fb-intercept-wrapper.php.opts b/hphp/test/slow/inout/fb-intercept-wrapper.php.opts similarity index 100% rename from hphp/test/slow/inout/tuple/tests/fb-intercept-wrapper.php.opts rename to hphp/test/slow/inout/fb-intercept-wrapper.php.opts diff --git a/hphp/test/slow/inout/tuple/tests/fb-intercept.php b/hphp/test/slow/inout/fb-intercept.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/fb-intercept.php rename to hphp/test/slow/inout/fb-intercept.php diff --git a/hphp/test/slow/inout/tuple/tests/fb-intercept.php.expect b/hphp/test/slow/inout/fb-intercept.php.expect similarity index 100% rename from hphp/test/slow/inout/tuple/tests/fb-intercept.php.expect rename to hphp/test/slow/inout/fb-intercept.php.expect diff --git a/hphp/test/slow/inout/tuple/tests/fb-intercept.php.hphp_opts b/hphp/test/slow/inout/fb-intercept.php.hphp_opts similarity index 100% rename from hphp/test/slow/inout/tuple/tests/fb-intercept.php.hphp_opts rename to hphp/test/slow/inout/fb-intercept.php.hphp_opts diff --git a/hphp/test/slow/inout/tuple/tests/fb-intercept.php.opts b/hphp/test/slow/inout/fb-intercept.php.opts similarity index 100% rename from hphp/test/slow/inout/tuple/tests/fb-intercept.php.opts rename to hphp/test/slow/inout/fb-intercept.php.opts diff --git a/hphp/test/slow/inout/tuple/tests/func-interop-dynamic.php b/hphp/test/slow/inout/func-interop-dynamic.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/func-interop-dynamic.php rename to hphp/test/slow/inout/func-interop-dynamic.php diff --git a/hphp/test/slow/inout/tuple/tests/func-interop-dynamic.php.expect b/hphp/test/slow/inout/func-interop-dynamic.php.expect similarity index 100% rename from hphp/test/slow/inout/tuple/tests/func-interop-dynamic.php.expect rename to hphp/test/slow/inout/func-interop-dynamic.php.expect diff --git a/hphp/test/slow/inout/tuple/tests/func-interop-static.php b/hphp/test/slow/inout/func-interop-static.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/func-interop-static.php rename to hphp/test/slow/inout/func-interop-static.php diff --git a/hphp/test/slow/inout/tuple/tests/func-interop-static.php.expect b/hphp/test/slow/inout/func-interop-static.php.expect similarity index 100% rename from hphp/test/slow/inout/tuple/tests/func-interop-static.php.expect rename to hphp/test/slow/inout/func-interop-static.php.expect diff --git a/hphp/test/slow/inout/tuple/tests/inout-decl.php b/hphp/test/slow/inout/inout-decl.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/inout-decl.php rename to hphp/test/slow/inout/inout-decl.php diff --git a/hphp/test/slow/inout/tuple/tests/inout-decl.php.expect b/hphp/test/slow/inout/inout-decl.php.expect similarity index 100% rename from hphp/test/slow/inout/tuple/tests/inout-decl.php.expect rename to hphp/test/slow/inout/inout-decl.php.expect diff --git a/hphp/test/slow/inout/tuple/tests/inout_param_mixed_hint.php b/hphp/test/slow/inout/inout_param_mixed_hint.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/inout_param_mixed_hint.php rename to hphp/test/slow/inout/inout_param_mixed_hint.php diff --git a/hphp/test/slow/inout/tuple/tests/inout_param_mixed_hint.php.expect b/hphp/test/slow/inout/inout_param_mixed_hint.php.expect similarity index 100% rename from hphp/test/slow/inout/tuple/tests/inout_param_mixed_hint.php.expect rename to hphp/test/slow/inout/inout_param_mixed_hint.php.expect diff --git a/hphp/test/slow/inout/tuple/tests/inout_param_soft_mixed_hint.php b/hphp/test/slow/inout/inout_param_soft_mixed_hint.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/inout_param_soft_mixed_hint.php rename to hphp/test/slow/inout/inout_param_soft_mixed_hint.php diff --git a/hphp/test/slow/inout/tuple/tests/inout_param_soft_mixed_hint.php.expect b/hphp/test/slow/inout/inout_param_soft_mixed_hint.php.expect similarity index 100% rename from hphp/test/slow/inout/tuple/tests/inout_param_soft_mixed_hint.php.expect rename to hphp/test/slow/inout/inout_param_soft_mixed_hint.php.expect diff --git a/hphp/test/slow/inout/interp-callm/config.ini b/hphp/test/slow/inout/interp-callm/config.ini deleted file mode 100644 index be15398a5c4..00000000000 --- a/hphp/test/slow/inout/interp-callm/config.ini +++ /dev/null @@ -1,2 +0,0 @@ -hhvm.use_msrv_for_in_out = true -hhvm.hhir_generate_callm = false diff --git a/hphp/test/slow/inout/interp-callm/tests/abstract-method.php b/hphp/test/slow/inout/interp-callm/tests/abstract-method.php deleted file mode 100644 index c3f89fd4ecd..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/abstract-method.php +++ /dev/null @@ -1,19 +0,0 @@ -; -} - -class C implements I { - public async function foo(int &$x): Awaitable {} -} - -abstract class B { - public abstract function foo(int &$x): Awaitable; -} - -class D extends B { - public async function foo(int &$x): Awaitable {} -} - -echo "Done.\n"; diff --git a/hphp/test/slow/inout/interp-callm/tests/abstract-method.php.expect b/hphp/test/slow/inout/interp-callm/tests/abstract-method.php.expect deleted file mode 120000 index 6cdc35e7f66..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/abstract-method.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/abstract-method.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/abstract-method.php.hphp_opts b/hphp/test/slow/inout/interp-callm/tests/abstract-method.php.hphp_opts deleted file mode 120000 index c11742c5ad0..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/abstract-method.php.hphp_opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/abstract-method.php.hphp_opts \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/abstract-method.php.opts b/hphp/test/slow/inout/interp-callm/tests/abstract-method.php.opts deleted file mode 120000 index 8965f9fbe6e..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/abstract-method.php.opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/abstract-method.php.opts \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/autoloader.php b/hphp/test/slow/inout/interp-callm/tests/autoloader.php deleted file mode 100644 index a2dcb4bc520..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/autoloader.php +++ /dev/null @@ -1,38 +0,0 @@ - array(), 'failure' =>'loader'), ''); - - $v = null; - hit1(inout $v); - var_dump($v); - hit2(&$v); - var_dump($v); - hit3(inout $v); - var_dump($v); - - partial(inout $v); // error -} - -main(); diff --git a/hphp/test/slow/inout/interp-callm/tests/autoloader.php.expectf b/hphp/test/slow/inout/interp-callm/tests/autoloader.php.expectf deleted file mode 120000 index ca5c1141629..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/autoloader.php.expectf +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/autoloader.php.expectf \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/bad-abstract.php b/hphp/test/slow/inout/interp-callm/tests/bad-abstract.php deleted file mode 100644 index db080021723..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/bad-abstract.php +++ /dev/null @@ -1,9 +0,0 @@ - {} diff --git a/hphp/test/slow/inout/interp-callm/tests/bad-async.php.expectf b/hphp/test/slow/inout/interp-callm/tests/bad-async.php.expectf deleted file mode 120000 index 0baaf1480b5..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/bad-async.php.expectf +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/bad-async.php.expectf \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/bad-call-1.php b/hphp/test/slow/inout/interp-callm/tests/bad-call-1.php deleted file mode 100644 index 0a8fbe6bbc6..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/bad-call-1.php +++ /dev/null @@ -1,3 +0,0 @@ -derp(); diff --git a/hphp/test/slow/inout/interp-callm/tests/bad-call-15.php.expectf b/hphp/test/slow/inout/interp-callm/tests/bad-call-15.php.expectf deleted file mode 120000 index 6baa900557a..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/bad-call-15.php.expectf +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/bad-call-15.php.expectf \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/bad-call-2.php b/hphp/test/slow/inout/interp-callm/tests/bad-call-2.php deleted file mode 100644 index 82fef26501e..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/bad-call-2.php +++ /dev/null @@ -1,3 +0,0 @@ -b); diff --git a/hphp/test/slow/inout/interp-callm/tests/bad-call-5.php.expectregex b/hphp/test/slow/inout/interp-callm/tests/bad-call-5.php.expectregex deleted file mode 120000 index 0fff4674c77..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/bad-call-5.php.expectregex +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/bad-call-5.php.expectregex \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/bad-call-6.php b/hphp/test/slow/inout/interp-callm/tests/bad-call-6.php deleted file mode 100644 index 0bc19ac607e..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/bad-call-6.php +++ /dev/null @@ -1,3 +0,0 @@ -b); diff --git a/hphp/test/slow/inout/interp-callm/tests/bad-call-6.php.expectregex b/hphp/test/slow/inout/interp-callm/tests/bad-call-6.php.expectregex deleted file mode 120000 index 9e2af25f81a..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/bad-call-6.php.expectregex +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/bad-call-6.php.expectregex \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/bad-call-7.php b/hphp/test/slow/inout/interp-callm/tests/bad-call-7.php deleted file mode 100644 index 4c3557d22f3..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/bad-call-7.php +++ /dev/null @@ -1,3 +0,0 @@ -b[12]); diff --git a/hphp/test/slow/inout/interp-callm/tests/bad-call-7.php.expectregex b/hphp/test/slow/inout/interp-callm/tests/bad-call-7.php.expectregex deleted file mode 120000 index cf210233bb3..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/bad-call-7.php.expectregex +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/bad-call-7.php.expectregex \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/bad-call-8.php b/hphp/test/slow/inout/interp-callm/tests/bad-call-8.php deleted file mode 100644 index 55731e3e00e..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/bad-call-8.php +++ /dev/null @@ -1,3 +0,0 @@ -> -function foo(inout int $x): void {} diff --git a/hphp/test/slow/inout/interp-callm/tests/bad-memoize.php.expectf b/hphp/test/slow/inout/interp-callm/tests/bad-memoize.php.expectf deleted file mode 120000 index ef8b3e1d48e..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/bad-memoize.php.expectf +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/bad-memoize.php.expectf \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/bad-mixed-mode-1.php b/hphp/test/slow/inout/interp-callm/tests/bad-mixed-mode-1.php deleted file mode 100644 index d795fd07a0b..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/bad-mixed-mode-1.php +++ /dev/null @@ -1,4 +0,0 @@ - 12, 'apple' => 0, 'banana' => 2); - - sort(inout $x1); - asort(inout $x2); - usort(inout $x3, ($a, $b) ==> $a < $b); - var_dump($x1, $x2, $x3); - - ksort(inout $y1); - asort(inout $y2); - usort(inout $y3, ($a, $b) ==> $a < $b); - var_dump($y1, $y2, $y3); -} - -main(); diff --git a/hphp/test/slow/inout/interp-callm/tests/builtin-interop.php.expect b/hphp/test/slow/inout/interp-callm/tests/builtin-interop.php.expect deleted file mode 120000 index 92e803efdb3..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/builtin-interop.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/builtin-interop.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/call-dynamic.php b/hphp/test/slow/inout/interp-callm/tests/call-dynamic.php deleted file mode 100644 index 7777548aca5..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/call-dynamic.php +++ /dev/null @@ -1,32 +0,0 @@ -getTrace()[0]['function']); - } - } finally { - echo "outer finally\n"; - } -} - -function baz($x, inout $a) { - echo "baz($x, $a)\n"; - $a = $x; - if ($x === 42) throw new Exception(); - return $x + 1; -} - -function swap(inout $a, inout $b) { - $t = $b; - $b = $a; - $a = $t; - // implicit return -} - -function empty_(inout $t) { - try { - new stdclass; - return; - } finally { - echo "empty_ finally\n"; - } -} - -function main() { - $one = 'Eat'; - $two = ' my '; - $three = 'shorts'; - $four = foo('apple', inout $one, 'orange', inout $two, $two, inout $three); - echo "$one$two$three$four\n"; - - $v = 42; - var_dump(bar(inout $v), bar(inout $v), $v, bar(inout $v), $v); - - $q = 41; - try { - baz(baz($q, inout $q), inout $q); - } catch (Exception $e) { - var_dump(array_map($a ==> $a['function'], array_slice($e->getTrace(),0,2))); - var_dump($q); - } - - $a = 'alpha'; - $b = 'omega'; - empty_(inout $a); - empty_(inout $b); - swap(inout $a, inout $b); - echo "$a $b\n"; -} - -main(); diff --git a/hphp/test/slow/inout/interp-callm/tests/call-static.php.expect b/hphp/test/slow/inout/interp-callm/tests/call-static.php.expect deleted file mode 120000 index 72201a398b5..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/call-static.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/call-static.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/closure.php b/hphp/test/slow/inout/interp-callm/tests/closure.php deleted file mode 100644 index 3cd25161cec..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/closure.php +++ /dev/null @@ -1,20 +0,0 @@ - { - $x = 5; - return 6; - }; - $cl3 = function (&$x) { - $x = 6; - return 7; - }; - - $x = null; - var_dump($cl1(inout $x), $x, $cl2(&$x), $x, $cl3(inout $x), $x); -} - -main((inout $x) ==> { - $x = 4; - return 5; -}); diff --git a/hphp/test/slow/inout/interp-callm/tests/closure.php.expect b/hphp/test/slow/inout/interp-callm/tests/closure.php.expect deleted file mode 120000 index bc54f0f117b..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/closure.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/closure.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/complex-expr.php b/hphp/test/slow/inout/interp-callm/tests/complex-expr.php deleted file mode 100644 index 0ecf03e635c..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/complex-expr.php +++ /dev/null @@ -1,100 +0,0 @@ - $a['function'], $bt))."\n"; - return 'foo'; - } - - $x1 = 24; - $y1 = 42; - $a = nontop(inout $x1, inout $y1); - var_dump($a, $x1, $y1); - - $x2 = 18; - $y2 = 81; - $a = $nontop(inout $x2, inout $y2); - var_dump($a, $x2, $y2); -} - -main('nontop'); diff --git a/hphp/test/slow/inout/interp-callm/tests/def-func.php.expect b/hphp/test/slow/inout/interp-callm/tests/def-func.php.expect deleted file mode 120000 index facff3b1fe0..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/def-func.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/def-func.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/double-array-get.php b/hphp/test/slow/inout/interp-callm/tests/double-array-get.php deleted file mode 100644 index 53aff6d23c1..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/double-array-get.php +++ /dev/null @@ -1,9 +0,0 @@ - $a['function'], $bt))."\n"; - return 'Hello'; -} - -function bar(&$y) { - $y = 9; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'world!'; -} - -function main($foo, $bar) { - $a = null; - $b = null; - $c = null; - $g1 = $foo(inout $a); - $g2 = $foo(&$b); - $g3 = $foo(&$c); - var_dump($a, $b, $c); - - $x = null; - $y = null; - $z = null; - $h1 = $bar(&$x); - $h2 = $bar(&$y); - $h3 = $bar(inout $z); - var_dump($x, $y, $z); - - echo "$g1, $h1\n"; - echo "$g2, $h2\n"; - echo "$g2, $h2\n"; -} - -main('foo', 'bar'); diff --git a/hphp/test/slow/inout/interp-callm/tests/func-interop-dynamic.php.expect b/hphp/test/slow/inout/interp-callm/tests/func-interop-dynamic.php.expect deleted file mode 120000 index 85319c3ba89..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/func-interop-dynamic.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/func-interop-dynamic.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/func-interop-static.php b/hphp/test/slow/inout/interp-callm/tests/func-interop-static.php deleted file mode 100644 index 62e5e540bdb..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/func-interop-static.php +++ /dev/null @@ -1,39 +0,0 @@ - $a['function'], $bt))."\n"; - return 'Hello'; -} - -function bar(&$y) { - $y = 9; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'world!'; -} - -function main() { - $a = null; - $b = null; - $c = null; - $g1 = foo(inout $a); - $g2 = foo(&$b); - $g3 = foo(&$c); - var_dump($a, $b, $c); - - $x = null; - $y = null; - $z = null; - $h1 = bar(&$x); - $h2 = bar(&$y); - $h3 = bar(inout $z); - var_dump($x, $y, $z); - - echo "$g1, $h1\n"; - echo "$g2, $h2\n"; - echo "$g2, $h2\n"; -} - -main(); diff --git a/hphp/test/slow/inout/interp-callm/tests/func-interop-static.php.expect b/hphp/test/slow/inout/interp-callm/tests/func-interop-static.php.expect deleted file mode 120000 index 5ce11cc1dac..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/func-interop-static.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/func-interop-static.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/inout-decl.php b/hphp/test/slow/inout/interp-callm/tests/inout-decl.php deleted file mode 100644 index 89f9c8b66dd..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/inout-decl.php +++ /dev/null @@ -1,92 +0,0 @@ -(inout vec $v, ...) {} -function g($q, inout dict> $r, ...) {} -function h(inout $a, inout $b, $t, inout bool $c, $a = 12) {} - -function fptr( - inout $a, - (function(inout int, inout Foo, inout float): Bar) $b -): (function(inout double, inout int, float): int) { -} - -function main($a, $b, inout $c, $d, $e) { - if ($c === 3) return; - - foo(1, 2, inout $a, 3); - bar(inout $a['x']); - f(inout $a['v']['s'], $b['x'], $c); - g($a, inout $b, $c); - h(inout $a['m'], inout $b, $c, inout $a[$e], $e); - - $x = Cls::inout; - $y = Herp::inout(inout $x); - $z = Derp::foo + $x + $y; - - return $x + $y + $z; -} - -$a = 3; -main(1, 2, inout $a, 4, 5, 6); -var_dump(Cls::inout, Derp::foo); -echo "Done.\n"; -} diff --git a/hphp/test/slow/inout/interp-callm/tests/inout-decl.php.expect b/hphp/test/slow/inout/interp-callm/tests/inout-decl.php.expect deleted file mode 120000 index b6c47669b39..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/inout-decl.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/inout-decl.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/inout_param_mixed_hint.php b/hphp/test/slow/inout/interp-callm/tests/inout_param_mixed_hint.php deleted file mode 100644 index 7c2ecafb67b..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/inout_param_mixed_hint.php +++ /dev/null @@ -1,13 +0,0 @@ - ['orange' => 5]]; - foo(inout $a[10]); - foo(inout $a['apple']['banana']); - foo(inout $a['apple']['orange']); - - try { - foo(inout $a[50][100]); - } catch (Exception $e) { - var_dump($e->getMessage()); - } - foo(&$a[1]); - foo(&$a[5][10]); - var_dump($a); -} - -function getOne(inout $a, $k) { - try { - foo(inout $a[$k]); - } catch (Exception $e) { - echo "Caught: ".$e->getMessage()."\n"; - } -} - -function getTwo(inout $a, $k1, $k2) { - try { - foo(inout $a[$k1][$k2]); - } catch (Exception $e) { - echo "Caught: ".$e->getMessage()."\n"; - } -} - -function checkNonStatic($a) { - getOne(inout $a, 10); - getTwo(inout $a, 'apple', 'banana'); - getTwo(inout $a, 'apple', 'orange'); - getTwo(inout $a, 50, 100); - try { - foo(&$a[1]); - } catch (Exception $e) { - echo "Caught: ".$e->getMessage()."\n"; - } - try { - foo(&$a[5][10]); - } catch (Exception $e) { - echo "Caught: ".$e->getMessage()."\n"; - } - var_dump($a); -} - -function checkNums($a) { - getTwo(inout $a, 0, 1); - getTwo(inout $a, 0, 100); - getOne(inout $a, 0); - getOne(inout $a, 50); - getTwo(inout $a, 50, 100); -} - -function main() { - checkStatic(); - $a = ['apple' => ['orange' => 5]]; - $b = dict['apple' => ['orange' => 5]]; - $c = keyset[0, 1, 2]; - $d = vec[vec[0, 1, 2], 3, 4]; - checkNonStatic($a); - checkNonStatic($b); - checkNums($c); - checkNums($d); -} - -main(); diff --git a/hphp/test/slow/inout/interp-callm/tests/invalid-index.php.expectf b/hphp/test/slow/inout/interp-callm/tests/invalid-index.php.expectf deleted file mode 120000 index 2e8f29ac709..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/invalid-index.php.expectf +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/invalid-index.php.expectf \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/method-dynamic.php b/hphp/test/slow/inout/interp-callm/tests/method-dynamic.php deleted file mode 100644 index bcf9f9b4ece..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/method-dynamic.php +++ /dev/null @@ -1,70 +0,0 @@ -beep(); - } -} - -class Bar extends Foo { - function beep() { return 42; } - function info2(inout $x, inout $y, inout $z) { - $z = parent::class; - return parent::info(inout $x, inout $y); - } -} - -function main($obj, $foo, $alpha, $beta, $one, $two, $bar, $arr1, $arr2) { - $a = 'beta'; - $b = 'gamma'; - $x = 41; - $r1 = $obj->$alpha(inout $a, inout $b); - $r2 = $foo::$beta(inout $x); - var_dump($a, $b, $x, $r1, $r2); - - $t = null; - $obj->$one(inout $t); - var_dump($t); - - $foo::$two(inout $t); - var_dump($t); - - $q = null; - Foo::$two(inout $q); - var_dump($q); - - $r = null; - $foo::two(inout $r); - var_dump($r); - - $self = null; - $static = null; - $parent = null; - $num = $bar->info2(inout $self, inout $static, inout $parent); - var_dump($num, $self, $static, $parent); - - $a = null; - $arr1(inout $a); - var_dump($a); - $arr2(inout $a); - var_dump($a); -} - -main(new Foo, 'Foo', 'alpha', 'beta', 'one', 'two', new Bar, - array(new Foo, 'one'), array('Foo', 'two')); diff --git a/hphp/test/slow/inout/interp-callm/tests/method-dynamic.php.expect b/hphp/test/slow/inout/interp-callm/tests/method-dynamic.php.expect deleted file mode 120000 index 97e2800ffac..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/method-dynamic.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-dynamic.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/method-interop-dynamic.php b/hphp/test/slow/inout/interp-callm/tests/method-interop-dynamic.php deleted file mode 100644 index 246a8cf53bf..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/method-interop-dynamic.php +++ /dev/null @@ -1,116 +0,0 @@ - $a['function'], $bt))."\n"; - return 'Hello'; - } - - function bar(&$y) { - $y = 9; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'world!'; - } - - static function fizz(inout $x) { - $x = 24; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'FIZZ'; - } - - static function buzz(&$y) { - $y = 19; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'BUZZ'; - } -} - -function main($obj, $Herp, $foo, $bar, $fizz, $buzz) { - $a = null; - $b = null; - $c = null; - $g1 = $obj->$foo(inout $a); - $g2 = $obj->$foo($b); - $g3 = $obj->$foo(&$c); - var_dump($a, $b, $c); - - $x = null; - $y = null; - $z = null; - $h1 = $obj->$bar($x); - $h2 = $obj->$bar(&$y); - $h3 = $obj->$bar(inout $z); - var_dump($x, $y, $z); - - echo "$g1, $h1\n"; - echo "$g2, $h2\n"; - echo "$g2, $h2\n"; - - $q = null; - $r = null; - $s = null; - $f1 = Herp::$fizz(inout $q); - $f2 = Herp::$fizz($r); - $f3 = Herp::$fizz(&$s); - var_dump($q, $r, $s); - - $t = null; - $u = null; - $v = null; - $k1 = Herp::$buzz(inout $t); - $k2 = Herp::$buzz($u); - $k3 = Herp::$buzz(&$v); - var_dump($t, $u, $v); - - echo "$f1, $k1\n"; - echo "$f2, $k2\n"; - echo "$f2, $k2\n"; - - $q2 = null; - $r2 = null; - $s2 = null; - $f4 = $Herp::$fizz(inout $q2); - $f5 = $Herp::$fizz($r2); - $f6 = $Herp::$fizz(&$s2); - var_dump($q2, $r2, $s2); - - $t2 = null; - $u2 = null; - $v2 = null; - $k4 = $Herp::$buzz(inout $t2); - $k5 = $Herp::$buzz($u2); - $k6 = $Herp::$buzz(&$v2); - var_dump($t2, $u2, $v2); - - echo "$f4, $k4\n"; - echo "$f5, $k5\n"; - echo "$f6, $k6\n"; - - $q3 = null; - $r3 = null; - $s3 = null; - $f7 = $Herp::fizz(inout $q3); - $f8 = $Herp::fizz($r3); - $f9 = $Herp::fizz(&$s3); - var_dump($q3, $r3, $s3); - - $t3 = null; - $u3 = null; - $v3 = null; - $k7 = $Herp::$buzz(inout $t3); - $k8 = $Herp::$buzz($u3); - $k9 = $Herp::$buzz(&$v3); - var_dump($t3, $u3, $v3); - - echo "$f7, $k7\n"; - echo "$f8, $k8\n"; - echo "$f9, $k9\n"; -} - -$obj = new Herp; -main($obj, 'Herp', 'foo', 'bar', 'fizz', 'buzz'); diff --git a/hphp/test/slow/inout/interp-callm/tests/method-interop-dynamic.php.expectf b/hphp/test/slow/inout/interp-callm/tests/method-interop-dynamic.php.expectf deleted file mode 120000 index f0b11973675..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/method-interop-dynamic.php.expectf +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-interop-dynamic.php.expectf \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/method-interop-dynamic.php.hphp_opts b/hphp/test/slow/inout/interp-callm/tests/method-interop-dynamic.php.hphp_opts deleted file mode 120000 index 9b6ad6fcf80..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/method-interop-dynamic.php.hphp_opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-interop-dynamic.php.hphp_opts \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/method-interop-dynamic.php.opts b/hphp/test/slow/inout/interp-callm/tests/method-interop-dynamic.php.opts deleted file mode 120000 index 5041995c99e..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/method-interop-dynamic.php.opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-interop-dynamic.php.opts \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/method-interop-static.php b/hphp/test/slow/inout/interp-callm/tests/method-interop-static.php deleted file mode 100644 index ca066994c9f..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/method-interop-static.php +++ /dev/null @@ -1,77 +0,0 @@ - $a['function'], $bt))."\n"; - return 'Hello'; - } - - function bar(&$y) { - $y = 9; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'world!'; - } - - static function fizz(inout $x) { - $x = 24; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'FIZZ'; - } - - static function buzz(&$y) { - $y = 19; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'BUZZ'; - } -} - -function main() { - $obj = new Herp; - - $a = null; - $b = null; - $c = null; - $g1 = $obj->foo(inout $a); - $g2 = $obj->foo($b); - $g3 = $obj->foo(&$c); - var_dump($a, $b, $c); - - $x = null; - $y = null; - $z = null; - $h1 = $obj->bar($x); - $h2 = $obj->bar(&$y); - $h3 = $obj->bar(inout $z); - var_dump($x, $y, $z); - - echo "$g1, $h1\n"; - echo "$g2, $h2\n"; - echo "$g2, $h2\n"; - - $q = null; - $r = null; - $s = null; - $f1 = Herp::fizz(inout $q); - $f2 = Herp::fizz($r); - $f3 = Herp::fizz(&$s); - var_dump($q, $r, $s); - - $t = null; - $u = null; - $v = null; - $k1 = Herp::buzz(inout $t); - $k2 = Herp::buzz($u); - $k3 = Herp::buzz(&$v); - var_dump($t, $u, $v); - - echo "$f1, $k1\n"; - echo "$f2, $k2\n"; - echo "$f2, $k2\n"; -} - -main(); diff --git a/hphp/test/slow/inout/interp-callm/tests/method-interop-static.php.expectf b/hphp/test/slow/inout/interp-callm/tests/method-interop-static.php.expectf deleted file mode 120000 index d49f4117c4a..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/method-interop-static.php.expectf +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-interop-static.php.expectf \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/method-interop-static.php.hphp_opts b/hphp/test/slow/inout/interp-callm/tests/method-interop-static.php.hphp_opts deleted file mode 120000 index ddb4e97a403..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/method-interop-static.php.hphp_opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-interop-static.php.hphp_opts \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/method-interop-static.php.opts b/hphp/test/slow/inout/interp-callm/tests/method-interop-static.php.opts deleted file mode 120000 index 5d7961e5edd..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/method-interop-static.php.opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-interop-static.php.opts \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/method-static.php b/hphp/test/slow/inout/interp-callm/tests/method-static.php deleted file mode 100644 index 56699153747..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/method-static.php +++ /dev/null @@ -1,36 +0,0 @@ -alpha(inout $a, inout $b); - $r2 = Foo::beta(inout $x); - var_dump($a, $b, $x, $r1, $r2); - - $t = null; - $obj->one(inout $t); - var_dump($t); - - Foo::two(inout $t); - var_dump($t); -} - -main(new Foo); diff --git a/hphp/test/slow/inout/interp-callm/tests/method-static.php.expect b/hphp/test/slow/inout/interp-callm/tests/method-static.php.expect deleted file mode 120000 index 4421401e25d..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/method-static.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-static.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/msrv-error.php b/hphp/test/slow/inout/interp-callm/tests/msrv-error.php deleted file mode 100644 index c8e9e75bfb6..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/msrv-error.php +++ /dev/null @@ -1,11 +0,0 @@ - { - echo "[$errno] $errstr\n"; - throw new Exception(); -}); - -function foo($x, inout int $y): string { - return ($y = $x); -} - -function bar(inout int $x, inout int $y): int { - list($x, $y) = array($y, $x); - return $x + $y; -} - -function main() { - $a = 'hello'; - $b = 42; - $c = 58; - try { foo($a, inout $b); } catch (Exception $e) {} - try { foo($b, inout $c); } catch (Exception $e) {} - $r = bar(inout $b, inout $c); - var_dump($r, $b, $c); -} - -main(); diff --git a/hphp/test/slow/inout/interp-callm/tests/out-type-hints.php.expect b/hphp/test/slow/inout/interp-callm/tests/out-type-hints.php.expect deleted file mode 120000 index ed7210e824a..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/out-type-hints.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/out-type-hints.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/reffy-magic.php b/hphp/test/slow/inout/interp-callm/tests/reffy-magic.php deleted file mode 100644 index 41fa44e4511..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/reffy-magic.php +++ /dev/null @@ -1,21 +0,0 @@ - vec[dict['beta' => new Herp], null, new Herp, null]); - $x['alpha'][0]['beta'] = array('one' => '*BLANK*', 'two' => '*BLANK*'); - return $x; -} - -function &get_arr_ref() { - static $a; - if (!isset($a)) $a = get_arr(); - echo "get_arr_ref()\n"; - return $a; -} - -function main() { - $x = get_arr(); - $i = 1; - $t = 'alpha'; - foo( - 0, - inout $x[launder('alpha')][--$i]['beta']['one'], - inout $x[$t][++$i], - 0, - inout $x[$t.launder('')][++$i], - $i *= 2, - $t = 'red', - ); - var_dump($x); - - /* The following more general syntax is not allowed- - foo( - $i = 1, - inout get_arr_ref()[launder('alpha')][$i++], - inout get_arr_ref()[$t = launder('alpha')][$i++], - $a =& get_arr_ref(), - inout $a[$t][$i], - $i *= 2, - $t = 'red', - ); - var_dump($a); - - $i = 0; - $x = 'apple'; - Herp::$derp = get_arr(); - foo( - $x = 'baz', - inout (Herp::$derp[$t = launder('alpha')][$i++]['beta']->$x)['one'], - inout $x, - $a = 'TWO', - inout Herp::$derp[$t][$i], - $i *= 2, - $old = Herp::$derp, - ); - var_dump($x, Herp::$derp, $old); - - $i = 0; - $x = 'apple'; - $Herp = Herp::class; - $hh = 'Herp'; - Herp::$derp = get_arr(); - foo( - $x = 'alpha', - inout ${launder('hh')}::${launder('derp')}[$x][$i++], - inout Herp::${launder('derp')}[$x][$i++], - $a = 'TWO', - inout ${$hh}::$derp[$x][$i++], - $i *= 2, - $x = 0, - ); - var_dump($x, Herp::$derp); - */ - - $a = 'nope'; - $b = 'nope'; - $c = 'nope'; - foo( - $a, - inout $a, - inout $b, - $b, - inout $c, - $a, - $c, - ); - var_dump($a, $b, $c); - - $a = array('yep'); - $b = array('nope'); - $c = array('yep'); - foo( - $a, - inout $a[0], - inout $b[0], - $b, - inout $c[0], - ref(&$a), - ref(&ref(&ref(&$c))), - ); - var_dump($a[0], $b[0], $c[0]); - - /* The following more general syntax is not allowed- - $a = new stdclass; - $a->x = 'one'; - $a->y = 'two'; - $saved = $a; - foo( - &$a, - inout $a->x, - inout $a, - $a, - inout $a->y, - ); - var_dump($saved, $a); - - Herp::$derp = 'foo'; - $a = 'Herp'; - foo( - &$a, - inout $a::$derp, - inout $a, - $a, - inout $a::$derp, - ); - var_dump($a, Herp::$derp); - - $a = new stdclass; - $a->x = 'one'; - $a->y = 'two'; - $saved = $a; - foo( - &$a, - inout $a, - inout $a->x, - $a, - inout $a, - ); - var_dump($saved, $a); - - $a = new stdclass; - $a->x = 'one'; - $a->y = 'two'; - $saved = $a; - foo( - &$a, - inout $a->x, - inout $a->y, - $a = 'oops', - inout $a, - ); - var_dump($saved, $a); - */ -} - -main(); diff --git a/hphp/test/slow/inout/interp-callm/tests/side-effects.php.expect b/hphp/test/slow/inout/interp-callm/tests/side-effects.php.expect deleted file mode 120000 index 545787d19c4..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/side-effects.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/side-effects.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/trait-magic.php b/hphp/test/slow/inout/interp-callm/tests/trait-magic.php deleted file mode 100644 index 9873e406879..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/trait-magic.php +++ /dev/null @@ -1,77 +0,0 @@ -foo(inout $x, inout $y); - var_dump($r, $x, $y); - $r = $o->bar(inout $x); - var_dump($r, $x); - $r = $o->apple(inout $x); - var_dump($r, $x); - $r = $o->potato(inout $x); - var_dump($r, $x); - - var_dump(HerpDerp::s1(inout $x), $x); - var_dump(HerpDerp::s2(&$x), $x); - var_dump(HerpDerp::s2(inout $x)); - var_dump(HerpDerp::orange($x)); -} - -main(); diff --git a/hphp/test/slow/inout/interp-callm/tests/trait-magic.php.expect b/hphp/test/slow/inout/interp-callm/tests/trait-magic.php.expect deleted file mode 120000 index fea0f9df75a..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/trait-magic.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/trait-magic.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/trait-magic.php.hphp_opts b/hphp/test/slow/inout/interp-callm/tests/trait-magic.php.hphp_opts deleted file mode 120000 index f13391622ca..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/trait-magic.php.hphp_opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/trait-magic.php.hphp_opts \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/trait-magic.php.opts b/hphp/test/slow/inout/interp-callm/tests/trait-magic.php.opts deleted file mode 120000 index f6654dc2ef6..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/trait-magic.php.opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/trait-magic.php.opts \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/variadic-builtin.php b/hphp/test/slow/inout/interp-callm/tests/variadic-builtin.php deleted file mode 100644 index 342ee8c7ef6..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/variadic-builtin.php +++ /dev/null @@ -1,17 +0,0 @@ - 0) var_dump("wat"); - return $r; -} - -function main() { - $x = [1, 2, 3]; - foo(inout $x, 24); - foo(inout $x, 42, 'apple', 200); - foo(&$x, 8, 99, 'green'); - foo(&$x, 16); - var_dump($x); - var_dump(bar(&$x)); - var_dump(bar(inout $x)); - var_dump(bar(&$x)); - var_dump(bar(inout $x)); - var_dump($x); -} - -main(); diff --git a/hphp/test/slow/inout/interp-callm/tests/variadic-inout.php.expect b/hphp/test/slow/inout/interp-callm/tests/variadic-inout.php.expect deleted file mode 120000 index 80e8ed6db8a..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/variadic-inout.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/variadic-inout.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-callm/tests/xhp.php b/hphp/test/slow/inout/interp-callm/tests/xhp.php deleted file mode 100644 index 75124029d52..00000000000 --- a/hphp/test/slow/inout/interp-callm/tests/xhp.php +++ /dev/null @@ -1,12 +0,0 @@ -; -} - -class C implements I { - public async function foo(int &$x): Awaitable {} -} - -abstract class B { - public abstract function foo(int &$x): Awaitable; -} - -class D extends B { - public async function foo(int &$x): Awaitable {} -} - -echo "Done.\n"; diff --git a/hphp/test/slow/inout/interp-retm/tests/abstract-method.php.expect b/hphp/test/slow/inout/interp-retm/tests/abstract-method.php.expect deleted file mode 120000 index 6cdc35e7f66..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/abstract-method.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/abstract-method.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/abstract-method.php.hphp_opts b/hphp/test/slow/inout/interp-retm/tests/abstract-method.php.hphp_opts deleted file mode 120000 index c11742c5ad0..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/abstract-method.php.hphp_opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/abstract-method.php.hphp_opts \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/abstract-method.php.opts b/hphp/test/slow/inout/interp-retm/tests/abstract-method.php.opts deleted file mode 120000 index 8965f9fbe6e..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/abstract-method.php.opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/abstract-method.php.opts \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/autoloader.php b/hphp/test/slow/inout/interp-retm/tests/autoloader.php deleted file mode 100644 index a2dcb4bc520..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/autoloader.php +++ /dev/null @@ -1,38 +0,0 @@ - array(), 'failure' =>'loader'), ''); - - $v = null; - hit1(inout $v); - var_dump($v); - hit2(&$v); - var_dump($v); - hit3(inout $v); - var_dump($v); - - partial(inout $v); // error -} - -main(); diff --git a/hphp/test/slow/inout/interp-retm/tests/autoloader.php.expectf b/hphp/test/slow/inout/interp-retm/tests/autoloader.php.expectf deleted file mode 120000 index ca5c1141629..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/autoloader.php.expectf +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/autoloader.php.expectf \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/bad-abstract.php b/hphp/test/slow/inout/interp-retm/tests/bad-abstract.php deleted file mode 100644 index db080021723..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/bad-abstract.php +++ /dev/null @@ -1,9 +0,0 @@ - {} diff --git a/hphp/test/slow/inout/interp-retm/tests/bad-async.php.expectf b/hphp/test/slow/inout/interp-retm/tests/bad-async.php.expectf deleted file mode 120000 index 0baaf1480b5..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/bad-async.php.expectf +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/bad-async.php.expectf \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/bad-call-1.php b/hphp/test/slow/inout/interp-retm/tests/bad-call-1.php deleted file mode 100644 index 0a8fbe6bbc6..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/bad-call-1.php +++ /dev/null @@ -1,3 +0,0 @@ -derp(); diff --git a/hphp/test/slow/inout/interp-retm/tests/bad-call-15.php.expectf b/hphp/test/slow/inout/interp-retm/tests/bad-call-15.php.expectf deleted file mode 120000 index 6baa900557a..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/bad-call-15.php.expectf +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/bad-call-15.php.expectf \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/bad-call-2.php b/hphp/test/slow/inout/interp-retm/tests/bad-call-2.php deleted file mode 100644 index 82fef26501e..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/bad-call-2.php +++ /dev/null @@ -1,3 +0,0 @@ -b); diff --git a/hphp/test/slow/inout/interp-retm/tests/bad-call-5.php.expectregex b/hphp/test/slow/inout/interp-retm/tests/bad-call-5.php.expectregex deleted file mode 120000 index 0fff4674c77..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/bad-call-5.php.expectregex +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/bad-call-5.php.expectregex \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/bad-call-6.php b/hphp/test/slow/inout/interp-retm/tests/bad-call-6.php deleted file mode 100644 index 0bc19ac607e..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/bad-call-6.php +++ /dev/null @@ -1,3 +0,0 @@ -b); diff --git a/hphp/test/slow/inout/interp-retm/tests/bad-call-6.php.expectregex b/hphp/test/slow/inout/interp-retm/tests/bad-call-6.php.expectregex deleted file mode 120000 index 9e2af25f81a..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/bad-call-6.php.expectregex +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/bad-call-6.php.expectregex \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/bad-call-7.php b/hphp/test/slow/inout/interp-retm/tests/bad-call-7.php deleted file mode 100644 index 4c3557d22f3..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/bad-call-7.php +++ /dev/null @@ -1,3 +0,0 @@ -b[12]); diff --git a/hphp/test/slow/inout/interp-retm/tests/bad-call-7.php.expectregex b/hphp/test/slow/inout/interp-retm/tests/bad-call-7.php.expectregex deleted file mode 120000 index cf210233bb3..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/bad-call-7.php.expectregex +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/bad-call-7.php.expectregex \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/bad-call-8.php b/hphp/test/slow/inout/interp-retm/tests/bad-call-8.php deleted file mode 100644 index 55731e3e00e..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/bad-call-8.php +++ /dev/null @@ -1,3 +0,0 @@ -> -function foo(inout int $x): void {} diff --git a/hphp/test/slow/inout/interp-retm/tests/bad-memoize.php.expectf b/hphp/test/slow/inout/interp-retm/tests/bad-memoize.php.expectf deleted file mode 120000 index ef8b3e1d48e..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/bad-memoize.php.expectf +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/bad-memoize.php.expectf \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/bad-mixed-mode-1.php b/hphp/test/slow/inout/interp-retm/tests/bad-mixed-mode-1.php deleted file mode 100644 index d795fd07a0b..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/bad-mixed-mode-1.php +++ /dev/null @@ -1,4 +0,0 @@ - 12, 'apple' => 0, 'banana' => 2); - - sort(inout $x1); - asort(inout $x2); - usort(inout $x3, ($a, $b) ==> $a < $b); - var_dump($x1, $x2, $x3); - - ksort(inout $y1); - asort(inout $y2); - usort(inout $y3, ($a, $b) ==> $a < $b); - var_dump($y1, $y2, $y3); -} - -main(); diff --git a/hphp/test/slow/inout/interp-retm/tests/builtin-interop.php.expect b/hphp/test/slow/inout/interp-retm/tests/builtin-interop.php.expect deleted file mode 120000 index 92e803efdb3..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/builtin-interop.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/builtin-interop.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/call-dynamic.php b/hphp/test/slow/inout/interp-retm/tests/call-dynamic.php deleted file mode 100644 index 7777548aca5..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/call-dynamic.php +++ /dev/null @@ -1,32 +0,0 @@ -getTrace()[0]['function']); - } - } finally { - echo "outer finally\n"; - } -} - -function baz($x, inout $a) { - echo "baz($x, $a)\n"; - $a = $x; - if ($x === 42) throw new Exception(); - return $x + 1; -} - -function swap(inout $a, inout $b) { - $t = $b; - $b = $a; - $a = $t; - // implicit return -} - -function empty_(inout $t) { - try { - new stdclass; - return; - } finally { - echo "empty_ finally\n"; - } -} - -function main() { - $one = 'Eat'; - $two = ' my '; - $three = 'shorts'; - $four = foo('apple', inout $one, 'orange', inout $two, $two, inout $three); - echo "$one$two$three$four\n"; - - $v = 42; - var_dump(bar(inout $v), bar(inout $v), $v, bar(inout $v), $v); - - $q = 41; - try { - baz(baz($q, inout $q), inout $q); - } catch (Exception $e) { - var_dump(array_map($a ==> $a['function'], array_slice($e->getTrace(),0,2))); - var_dump($q); - } - - $a = 'alpha'; - $b = 'omega'; - empty_(inout $a); - empty_(inout $b); - swap(inout $a, inout $b); - echo "$a $b\n"; -} - -main(); diff --git a/hphp/test/slow/inout/interp-retm/tests/call-static.php.expect b/hphp/test/slow/inout/interp-retm/tests/call-static.php.expect deleted file mode 120000 index 72201a398b5..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/call-static.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/call-static.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/closure.php b/hphp/test/slow/inout/interp-retm/tests/closure.php deleted file mode 100644 index 3cd25161cec..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/closure.php +++ /dev/null @@ -1,20 +0,0 @@ - { - $x = 5; - return 6; - }; - $cl3 = function (&$x) { - $x = 6; - return 7; - }; - - $x = null; - var_dump($cl1(inout $x), $x, $cl2(&$x), $x, $cl3(inout $x), $x); -} - -main((inout $x) ==> { - $x = 4; - return 5; -}); diff --git a/hphp/test/slow/inout/interp-retm/tests/closure.php.expect b/hphp/test/slow/inout/interp-retm/tests/closure.php.expect deleted file mode 120000 index bc54f0f117b..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/closure.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/closure.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/complex-expr.php b/hphp/test/slow/inout/interp-retm/tests/complex-expr.php deleted file mode 100644 index 0ecf03e635c..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/complex-expr.php +++ /dev/null @@ -1,100 +0,0 @@ - $a['function'], $bt))."\n"; - return 'foo'; - } - - $x1 = 24; - $y1 = 42; - $a = nontop(inout $x1, inout $y1); - var_dump($a, $x1, $y1); - - $x2 = 18; - $y2 = 81; - $a = $nontop(inout $x2, inout $y2); - var_dump($a, $x2, $y2); -} - -main('nontop'); diff --git a/hphp/test/slow/inout/interp-retm/tests/def-func.php.expect b/hphp/test/slow/inout/interp-retm/tests/def-func.php.expect deleted file mode 120000 index facff3b1fe0..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/def-func.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/def-func.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/double-array-get.php b/hphp/test/slow/inout/interp-retm/tests/double-array-get.php deleted file mode 100644 index 53aff6d23c1..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/double-array-get.php +++ /dev/null @@ -1,9 +0,0 @@ - $a['function'], $bt))."\n"; - return 'Hello'; -} - -function bar(&$y) { - $y = 9; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'world!'; -} - -function main($foo, $bar) { - $a = null; - $b = null; - $c = null; - $g1 = $foo(inout $a); - $g2 = $foo(&$b); - $g3 = $foo(&$c); - var_dump($a, $b, $c); - - $x = null; - $y = null; - $z = null; - $h1 = $bar(&$x); - $h2 = $bar(&$y); - $h3 = $bar(inout $z); - var_dump($x, $y, $z); - - echo "$g1, $h1\n"; - echo "$g2, $h2\n"; - echo "$g2, $h2\n"; -} - -main('foo', 'bar'); diff --git a/hphp/test/slow/inout/interp-retm/tests/func-interop-dynamic.php.expect b/hphp/test/slow/inout/interp-retm/tests/func-interop-dynamic.php.expect deleted file mode 120000 index 85319c3ba89..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/func-interop-dynamic.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/func-interop-dynamic.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/func-interop-static.php b/hphp/test/slow/inout/interp-retm/tests/func-interop-static.php deleted file mode 100644 index 62e5e540bdb..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/func-interop-static.php +++ /dev/null @@ -1,39 +0,0 @@ - $a['function'], $bt))."\n"; - return 'Hello'; -} - -function bar(&$y) { - $y = 9; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'world!'; -} - -function main() { - $a = null; - $b = null; - $c = null; - $g1 = foo(inout $a); - $g2 = foo(&$b); - $g3 = foo(&$c); - var_dump($a, $b, $c); - - $x = null; - $y = null; - $z = null; - $h1 = bar(&$x); - $h2 = bar(&$y); - $h3 = bar(inout $z); - var_dump($x, $y, $z); - - echo "$g1, $h1\n"; - echo "$g2, $h2\n"; - echo "$g2, $h2\n"; -} - -main(); diff --git a/hphp/test/slow/inout/interp-retm/tests/func-interop-static.php.expect b/hphp/test/slow/inout/interp-retm/tests/func-interop-static.php.expect deleted file mode 120000 index 5ce11cc1dac..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/func-interop-static.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/func-interop-static.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/inout-decl.php b/hphp/test/slow/inout/interp-retm/tests/inout-decl.php deleted file mode 100644 index 89f9c8b66dd..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/inout-decl.php +++ /dev/null @@ -1,92 +0,0 @@ -(inout vec $v, ...) {} -function g($q, inout dict> $r, ...) {} -function h(inout $a, inout $b, $t, inout bool $c, $a = 12) {} - -function fptr( - inout $a, - (function(inout int, inout Foo, inout float): Bar) $b -): (function(inout double, inout int, float): int) { -} - -function main($a, $b, inout $c, $d, $e) { - if ($c === 3) return; - - foo(1, 2, inout $a, 3); - bar(inout $a['x']); - f(inout $a['v']['s'], $b['x'], $c); - g($a, inout $b, $c); - h(inout $a['m'], inout $b, $c, inout $a[$e], $e); - - $x = Cls::inout; - $y = Herp::inout(inout $x); - $z = Derp::foo + $x + $y; - - return $x + $y + $z; -} - -$a = 3; -main(1, 2, inout $a, 4, 5, 6); -var_dump(Cls::inout, Derp::foo); -echo "Done.\n"; -} diff --git a/hphp/test/slow/inout/interp-retm/tests/inout-decl.php.expect b/hphp/test/slow/inout/interp-retm/tests/inout-decl.php.expect deleted file mode 120000 index b6c47669b39..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/inout-decl.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/inout-decl.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/inout_param_mixed_hint.php b/hphp/test/slow/inout/interp-retm/tests/inout_param_mixed_hint.php deleted file mode 100644 index 7c2ecafb67b..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/inout_param_mixed_hint.php +++ /dev/null @@ -1,13 +0,0 @@ - ['orange' => 5]]; - foo(inout $a[10]); - foo(inout $a['apple']['banana']); - foo(inout $a['apple']['orange']); - - try { - foo(inout $a[50][100]); - } catch (Exception $e) { - var_dump($e->getMessage()); - } - foo(&$a[1]); - foo(&$a[5][10]); - var_dump($a); -} - -function getOne(inout $a, $k) { - try { - foo(inout $a[$k]); - } catch (Exception $e) { - echo "Caught: ".$e->getMessage()."\n"; - } -} - -function getTwo(inout $a, $k1, $k2) { - try { - foo(inout $a[$k1][$k2]); - } catch (Exception $e) { - echo "Caught: ".$e->getMessage()."\n"; - } -} - -function checkNonStatic($a) { - getOne(inout $a, 10); - getTwo(inout $a, 'apple', 'banana'); - getTwo(inout $a, 'apple', 'orange'); - getTwo(inout $a, 50, 100); - try { - foo(&$a[1]); - } catch (Exception $e) { - echo "Caught: ".$e->getMessage()."\n"; - } - try { - foo(&$a[5][10]); - } catch (Exception $e) { - echo "Caught: ".$e->getMessage()."\n"; - } - var_dump($a); -} - -function checkNums($a) { - getTwo(inout $a, 0, 1); - getTwo(inout $a, 0, 100); - getOne(inout $a, 0); - getOne(inout $a, 50); - getTwo(inout $a, 50, 100); -} - -function main() { - checkStatic(); - $a = ['apple' => ['orange' => 5]]; - $b = dict['apple' => ['orange' => 5]]; - $c = keyset[0, 1, 2]; - $d = vec[vec[0, 1, 2], 3, 4]; - checkNonStatic($a); - checkNonStatic($b); - checkNums($c); - checkNums($d); -} - -main(); diff --git a/hphp/test/slow/inout/interp-retm/tests/invalid-index.php.expectf b/hphp/test/slow/inout/interp-retm/tests/invalid-index.php.expectf deleted file mode 120000 index 2e8f29ac709..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/invalid-index.php.expectf +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/invalid-index.php.expectf \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/method-dynamic.php b/hphp/test/slow/inout/interp-retm/tests/method-dynamic.php deleted file mode 100644 index bcf9f9b4ece..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/method-dynamic.php +++ /dev/null @@ -1,70 +0,0 @@ -beep(); - } -} - -class Bar extends Foo { - function beep() { return 42; } - function info2(inout $x, inout $y, inout $z) { - $z = parent::class; - return parent::info(inout $x, inout $y); - } -} - -function main($obj, $foo, $alpha, $beta, $one, $two, $bar, $arr1, $arr2) { - $a = 'beta'; - $b = 'gamma'; - $x = 41; - $r1 = $obj->$alpha(inout $a, inout $b); - $r2 = $foo::$beta(inout $x); - var_dump($a, $b, $x, $r1, $r2); - - $t = null; - $obj->$one(inout $t); - var_dump($t); - - $foo::$two(inout $t); - var_dump($t); - - $q = null; - Foo::$two(inout $q); - var_dump($q); - - $r = null; - $foo::two(inout $r); - var_dump($r); - - $self = null; - $static = null; - $parent = null; - $num = $bar->info2(inout $self, inout $static, inout $parent); - var_dump($num, $self, $static, $parent); - - $a = null; - $arr1(inout $a); - var_dump($a); - $arr2(inout $a); - var_dump($a); -} - -main(new Foo, 'Foo', 'alpha', 'beta', 'one', 'two', new Bar, - array(new Foo, 'one'), array('Foo', 'two')); diff --git a/hphp/test/slow/inout/interp-retm/tests/method-dynamic.php.expect b/hphp/test/slow/inout/interp-retm/tests/method-dynamic.php.expect deleted file mode 120000 index 97e2800ffac..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/method-dynamic.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-dynamic.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/method-interop-dynamic.php b/hphp/test/slow/inout/interp-retm/tests/method-interop-dynamic.php deleted file mode 100644 index 246a8cf53bf..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/method-interop-dynamic.php +++ /dev/null @@ -1,116 +0,0 @@ - $a['function'], $bt))."\n"; - return 'Hello'; - } - - function bar(&$y) { - $y = 9; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'world!'; - } - - static function fizz(inout $x) { - $x = 24; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'FIZZ'; - } - - static function buzz(&$y) { - $y = 19; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'BUZZ'; - } -} - -function main($obj, $Herp, $foo, $bar, $fizz, $buzz) { - $a = null; - $b = null; - $c = null; - $g1 = $obj->$foo(inout $a); - $g2 = $obj->$foo($b); - $g3 = $obj->$foo(&$c); - var_dump($a, $b, $c); - - $x = null; - $y = null; - $z = null; - $h1 = $obj->$bar($x); - $h2 = $obj->$bar(&$y); - $h3 = $obj->$bar(inout $z); - var_dump($x, $y, $z); - - echo "$g1, $h1\n"; - echo "$g2, $h2\n"; - echo "$g2, $h2\n"; - - $q = null; - $r = null; - $s = null; - $f1 = Herp::$fizz(inout $q); - $f2 = Herp::$fizz($r); - $f3 = Herp::$fizz(&$s); - var_dump($q, $r, $s); - - $t = null; - $u = null; - $v = null; - $k1 = Herp::$buzz(inout $t); - $k2 = Herp::$buzz($u); - $k3 = Herp::$buzz(&$v); - var_dump($t, $u, $v); - - echo "$f1, $k1\n"; - echo "$f2, $k2\n"; - echo "$f2, $k2\n"; - - $q2 = null; - $r2 = null; - $s2 = null; - $f4 = $Herp::$fizz(inout $q2); - $f5 = $Herp::$fizz($r2); - $f6 = $Herp::$fizz(&$s2); - var_dump($q2, $r2, $s2); - - $t2 = null; - $u2 = null; - $v2 = null; - $k4 = $Herp::$buzz(inout $t2); - $k5 = $Herp::$buzz($u2); - $k6 = $Herp::$buzz(&$v2); - var_dump($t2, $u2, $v2); - - echo "$f4, $k4\n"; - echo "$f5, $k5\n"; - echo "$f6, $k6\n"; - - $q3 = null; - $r3 = null; - $s3 = null; - $f7 = $Herp::fizz(inout $q3); - $f8 = $Herp::fizz($r3); - $f9 = $Herp::fizz(&$s3); - var_dump($q3, $r3, $s3); - - $t3 = null; - $u3 = null; - $v3 = null; - $k7 = $Herp::$buzz(inout $t3); - $k8 = $Herp::$buzz($u3); - $k9 = $Herp::$buzz(&$v3); - var_dump($t3, $u3, $v3); - - echo "$f7, $k7\n"; - echo "$f8, $k8\n"; - echo "$f9, $k9\n"; -} - -$obj = new Herp; -main($obj, 'Herp', 'foo', 'bar', 'fizz', 'buzz'); diff --git a/hphp/test/slow/inout/interp-retm/tests/method-interop-dynamic.php.expectf b/hphp/test/slow/inout/interp-retm/tests/method-interop-dynamic.php.expectf deleted file mode 120000 index f0b11973675..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/method-interop-dynamic.php.expectf +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-interop-dynamic.php.expectf \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/method-interop-dynamic.php.hphp_opts b/hphp/test/slow/inout/interp-retm/tests/method-interop-dynamic.php.hphp_opts deleted file mode 120000 index 9b6ad6fcf80..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/method-interop-dynamic.php.hphp_opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-interop-dynamic.php.hphp_opts \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/method-interop-dynamic.php.opts b/hphp/test/slow/inout/interp-retm/tests/method-interop-dynamic.php.opts deleted file mode 120000 index 5041995c99e..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/method-interop-dynamic.php.opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-interop-dynamic.php.opts \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/method-interop-static.php b/hphp/test/slow/inout/interp-retm/tests/method-interop-static.php deleted file mode 100644 index ca066994c9f..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/method-interop-static.php +++ /dev/null @@ -1,77 +0,0 @@ - $a['function'], $bt))."\n"; - return 'Hello'; - } - - function bar(&$y) { - $y = 9; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'world!'; - } - - static function fizz(inout $x) { - $x = 24; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'FIZZ'; - } - - static function buzz(&$y) { - $y = 19; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'BUZZ'; - } -} - -function main() { - $obj = new Herp; - - $a = null; - $b = null; - $c = null; - $g1 = $obj->foo(inout $a); - $g2 = $obj->foo($b); - $g3 = $obj->foo(&$c); - var_dump($a, $b, $c); - - $x = null; - $y = null; - $z = null; - $h1 = $obj->bar($x); - $h2 = $obj->bar(&$y); - $h3 = $obj->bar(inout $z); - var_dump($x, $y, $z); - - echo "$g1, $h1\n"; - echo "$g2, $h2\n"; - echo "$g2, $h2\n"; - - $q = null; - $r = null; - $s = null; - $f1 = Herp::fizz(inout $q); - $f2 = Herp::fizz($r); - $f3 = Herp::fizz(&$s); - var_dump($q, $r, $s); - - $t = null; - $u = null; - $v = null; - $k1 = Herp::buzz(inout $t); - $k2 = Herp::buzz($u); - $k3 = Herp::buzz(&$v); - var_dump($t, $u, $v); - - echo "$f1, $k1\n"; - echo "$f2, $k2\n"; - echo "$f2, $k2\n"; -} - -main(); diff --git a/hphp/test/slow/inout/interp-retm/tests/method-interop-static.php.expectf b/hphp/test/slow/inout/interp-retm/tests/method-interop-static.php.expectf deleted file mode 120000 index d49f4117c4a..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/method-interop-static.php.expectf +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-interop-static.php.expectf \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/method-interop-static.php.hphp_opts b/hphp/test/slow/inout/interp-retm/tests/method-interop-static.php.hphp_opts deleted file mode 120000 index ddb4e97a403..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/method-interop-static.php.hphp_opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-interop-static.php.hphp_opts \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/method-interop-static.php.opts b/hphp/test/slow/inout/interp-retm/tests/method-interop-static.php.opts deleted file mode 120000 index 5d7961e5edd..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/method-interop-static.php.opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-interop-static.php.opts \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/method-static.php b/hphp/test/slow/inout/interp-retm/tests/method-static.php deleted file mode 100644 index 56699153747..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/method-static.php +++ /dev/null @@ -1,36 +0,0 @@ -alpha(inout $a, inout $b); - $r2 = Foo::beta(inout $x); - var_dump($a, $b, $x, $r1, $r2); - - $t = null; - $obj->one(inout $t); - var_dump($t); - - Foo::two(inout $t); - var_dump($t); -} - -main(new Foo); diff --git a/hphp/test/slow/inout/interp-retm/tests/method-static.php.expect b/hphp/test/slow/inout/interp-retm/tests/method-static.php.expect deleted file mode 120000 index 4421401e25d..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/method-static.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-static.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/msrv-error.php b/hphp/test/slow/inout/interp-retm/tests/msrv-error.php deleted file mode 100644 index c8e9e75bfb6..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/msrv-error.php +++ /dev/null @@ -1,11 +0,0 @@ - { - echo "[$errno] $errstr\n"; - throw new Exception(); -}); - -function foo($x, inout int $y): string { - return ($y = $x); -} - -function bar(inout int $x, inout int $y): int { - list($x, $y) = array($y, $x); - return $x + $y; -} - -function main() { - $a = 'hello'; - $b = 42; - $c = 58; - try { foo($a, inout $b); } catch (Exception $e) {} - try { foo($b, inout $c); } catch (Exception $e) {} - $r = bar(inout $b, inout $c); - var_dump($r, $b, $c); -} - -main(); diff --git a/hphp/test/slow/inout/interp-retm/tests/out-type-hints.php.expect b/hphp/test/slow/inout/interp-retm/tests/out-type-hints.php.expect deleted file mode 120000 index ed7210e824a..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/out-type-hints.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/out-type-hints.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/reffy-magic.php b/hphp/test/slow/inout/interp-retm/tests/reffy-magic.php deleted file mode 100644 index 41fa44e4511..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/reffy-magic.php +++ /dev/null @@ -1,21 +0,0 @@ - vec[dict['beta' => new Herp], null, new Herp, null]); - $x['alpha'][0]['beta'] = array('one' => '*BLANK*', 'two' => '*BLANK*'); - return $x; -} - -function &get_arr_ref() { - static $a; - if (!isset($a)) $a = get_arr(); - echo "get_arr_ref()\n"; - return $a; -} - -function main() { - $x = get_arr(); - $i = 1; - $t = 'alpha'; - foo( - 0, - inout $x[launder('alpha')][--$i]['beta']['one'], - inout $x[$t][++$i], - 0, - inout $x[$t.launder('')][++$i], - $i *= 2, - $t = 'red', - ); - var_dump($x); - - /* The following more general syntax is not allowed- - foo( - $i = 1, - inout get_arr_ref()[launder('alpha')][$i++], - inout get_arr_ref()[$t = launder('alpha')][$i++], - $a =& get_arr_ref(), - inout $a[$t][$i], - $i *= 2, - $t = 'red', - ); - var_dump($a); - - $i = 0; - $x = 'apple'; - Herp::$derp = get_arr(); - foo( - $x = 'baz', - inout (Herp::$derp[$t = launder('alpha')][$i++]['beta']->$x)['one'], - inout $x, - $a = 'TWO', - inout Herp::$derp[$t][$i], - $i *= 2, - $old = Herp::$derp, - ); - var_dump($x, Herp::$derp, $old); - - $i = 0; - $x = 'apple'; - $Herp = Herp::class; - $hh = 'Herp'; - Herp::$derp = get_arr(); - foo( - $x = 'alpha', - inout ${launder('hh')}::${launder('derp')}[$x][$i++], - inout Herp::${launder('derp')}[$x][$i++], - $a = 'TWO', - inout ${$hh}::$derp[$x][$i++], - $i *= 2, - $x = 0, - ); - var_dump($x, Herp::$derp); - */ - - $a = 'nope'; - $b = 'nope'; - $c = 'nope'; - foo( - $a, - inout $a, - inout $b, - $b, - inout $c, - $a, - $c, - ); - var_dump($a, $b, $c); - - $a = array('yep'); - $b = array('nope'); - $c = array('yep'); - foo( - $a, - inout $a[0], - inout $b[0], - $b, - inout $c[0], - ref(&$a), - ref(&ref(&ref(&$c))), - ); - var_dump($a[0], $b[0], $c[0]); - - /* The following more general syntax is not allowed- - $a = new stdclass; - $a->x = 'one'; - $a->y = 'two'; - $saved = $a; - foo( - &$a, - inout $a->x, - inout $a, - $a, - inout $a->y, - ); - var_dump($saved, $a); - - Herp::$derp = 'foo'; - $a = 'Herp'; - foo( - &$a, - inout $a::$derp, - inout $a, - $a, - inout $a::$derp, - ); - var_dump($a, Herp::$derp); - - $a = new stdclass; - $a->x = 'one'; - $a->y = 'two'; - $saved = $a; - foo( - &$a, - inout $a, - inout $a->x, - $a, - inout $a, - ); - var_dump($saved, $a); - - $a = new stdclass; - $a->x = 'one'; - $a->y = 'two'; - $saved = $a; - foo( - &$a, - inout $a->x, - inout $a->y, - $a = 'oops', - inout $a, - ); - var_dump($saved, $a); - */ -} - -main(); diff --git a/hphp/test/slow/inout/interp-retm/tests/side-effects.php.expect b/hphp/test/slow/inout/interp-retm/tests/side-effects.php.expect deleted file mode 120000 index 545787d19c4..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/side-effects.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/side-effects.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/trait-magic.php b/hphp/test/slow/inout/interp-retm/tests/trait-magic.php deleted file mode 100644 index 9873e406879..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/trait-magic.php +++ /dev/null @@ -1,77 +0,0 @@ -foo(inout $x, inout $y); - var_dump($r, $x, $y); - $r = $o->bar(inout $x); - var_dump($r, $x); - $r = $o->apple(inout $x); - var_dump($r, $x); - $r = $o->potato(inout $x); - var_dump($r, $x); - - var_dump(HerpDerp::s1(inout $x), $x); - var_dump(HerpDerp::s2(&$x), $x); - var_dump(HerpDerp::s2(inout $x)); - var_dump(HerpDerp::orange($x)); -} - -main(); diff --git a/hphp/test/slow/inout/interp-retm/tests/trait-magic.php.expect b/hphp/test/slow/inout/interp-retm/tests/trait-magic.php.expect deleted file mode 120000 index fea0f9df75a..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/trait-magic.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/trait-magic.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/trait-magic.php.hphp_opts b/hphp/test/slow/inout/interp-retm/tests/trait-magic.php.hphp_opts deleted file mode 120000 index f13391622ca..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/trait-magic.php.hphp_opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/trait-magic.php.hphp_opts \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/trait-magic.php.opts b/hphp/test/slow/inout/interp-retm/tests/trait-magic.php.opts deleted file mode 120000 index f6654dc2ef6..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/trait-magic.php.opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/trait-magic.php.opts \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/variadic-builtin.php b/hphp/test/slow/inout/interp-retm/tests/variadic-builtin.php deleted file mode 100644 index 342ee8c7ef6..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/variadic-builtin.php +++ /dev/null @@ -1,17 +0,0 @@ - 0) var_dump("wat"); - return $r; -} - -function main() { - $x = [1, 2, 3]; - foo(inout $x, 24); - foo(inout $x, 42, 'apple', 200); - foo(&$x, 8, 99, 'green'); - foo(&$x, 16); - var_dump($x); - var_dump(bar(&$x)); - var_dump(bar(inout $x)); - var_dump(bar(&$x)); - var_dump(bar(inout $x)); - var_dump($x); -} - -main(); diff --git a/hphp/test/slow/inout/interp-retm/tests/variadic-inout.php.expect b/hphp/test/slow/inout/interp-retm/tests/variadic-inout.php.expect deleted file mode 120000 index 80e8ed6db8a..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/variadic-inout.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/variadic-inout.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/interp-retm/tests/xhp.php b/hphp/test/slow/inout/interp-retm/tests/xhp.php deleted file mode 100644 index 75124029d52..00000000000 --- a/hphp/test/slow/inout/interp-retm/tests/xhp.php +++ /dev/null @@ -1,12 +0,0 @@ - /dev/null - -if [ ! -d "$SUITE" ]; then - echo "Could not find directory $SUITE" - exit 1 -fi - -if [ ! -d "tuple/tests" ]; then - echo "Could not find original tests in tuple/tests" - exit 1 -fi - -function link_expect() { - local F=$1 - local N=$2 - local EXP=$3 - if [ -f "$F.$EXP" ]; then - ln -sf "../../tuple/tests/$N.$EXP" "$SUITE/tests/$N.$EXP" - else - rm -f "$SUITE/tests/$N.$EXP" - fi -} - -mkdir -p "$SUITE/tests" - -gen="generated" - -for FILE in tuple/tests/*.php; do - NAME=$(basename "$FILE") - DST_FILE="$SUITE/tests/$NAME" - sed "s/ $DST_FILE - link_expect "$FILE" "$NAME" "expect" - link_expect "$FILE" "$NAME" "expectf" - link_expect "$FILE" "$NAME" "expectregex" - link_expect "$FILE" "$NAME" "opts" - link_expect "$FILE" "$NAME" "hphp_opts" - link_expect "$FILE" "$NAME" "skipif" -done diff --git a/hphp/test/slow/inout/tuple/tests/method-dynamic.php b/hphp/test/slow/inout/method-dynamic.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/method-dynamic.php rename to hphp/test/slow/inout/method-dynamic.php diff --git a/hphp/test/slow/inout/tuple/tests/method-dynamic.php.expect b/hphp/test/slow/inout/method-dynamic.php.expect similarity index 100% rename from hphp/test/slow/inout/tuple/tests/method-dynamic.php.expect rename to hphp/test/slow/inout/method-dynamic.php.expect diff --git a/hphp/test/slow/inout/tuple/tests/method-interop-dynamic.php b/hphp/test/slow/inout/method-interop-dynamic.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/method-interop-dynamic.php rename to hphp/test/slow/inout/method-interop-dynamic.php diff --git a/hphp/test/slow/inout/tuple/tests/method-interop-dynamic.php.expectf b/hphp/test/slow/inout/method-interop-dynamic.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/method-interop-dynamic.php.expectf rename to hphp/test/slow/inout/method-interop-dynamic.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/method-interop-dynamic.php.hphp_opts b/hphp/test/slow/inout/method-interop-dynamic.php.hphp_opts similarity index 100% rename from hphp/test/slow/inout/tuple/tests/method-interop-dynamic.php.hphp_opts rename to hphp/test/slow/inout/method-interop-dynamic.php.hphp_opts diff --git a/hphp/test/slow/inout/tuple/tests/method-interop-dynamic.php.opts b/hphp/test/slow/inout/method-interop-dynamic.php.opts similarity index 100% rename from hphp/test/slow/inout/tuple/tests/method-interop-dynamic.php.opts rename to hphp/test/slow/inout/method-interop-dynamic.php.opts diff --git a/hphp/test/slow/inout/tuple/tests/method-interop-static.php b/hphp/test/slow/inout/method-interop-static.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/method-interop-static.php rename to hphp/test/slow/inout/method-interop-static.php diff --git a/hphp/test/slow/inout/tuple/tests/method-interop-static.php.expectf b/hphp/test/slow/inout/method-interop-static.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/method-interop-static.php.expectf rename to hphp/test/slow/inout/method-interop-static.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/method-interop-static.php.hphp_opts b/hphp/test/slow/inout/method-interop-static.php.hphp_opts similarity index 100% rename from hphp/test/slow/inout/tuple/tests/method-interop-static.php.hphp_opts rename to hphp/test/slow/inout/method-interop-static.php.hphp_opts diff --git a/hphp/test/slow/inout/tuple/tests/method-interop-static.php.opts b/hphp/test/slow/inout/method-interop-static.php.opts similarity index 100% rename from hphp/test/slow/inout/tuple/tests/method-interop-static.php.opts rename to hphp/test/slow/inout/method-interop-static.php.opts diff --git a/hphp/test/slow/inout/tuple/tests/method-static.php b/hphp/test/slow/inout/method-static.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/method-static.php rename to hphp/test/slow/inout/method-static.php diff --git a/hphp/test/slow/inout/tuple/tests/method-static.php.expect b/hphp/test/slow/inout/method-static.php.expect similarity index 100% rename from hphp/test/slow/inout/tuple/tests/method-static.php.expect rename to hphp/test/slow/inout/method-static.php.expect diff --git a/hphp/test/slow/inout/tuple/tests/msrv-error.php b/hphp/test/slow/inout/msrv-error.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/msrv-error.php rename to hphp/test/slow/inout/msrv-error.php diff --git a/hphp/test/slow/inout/tuple/tests/msrv-error.php.expectf b/hphp/test/slow/inout/msrv-error.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/msrv-error.php.expectf rename to hphp/test/slow/inout/msrv-error.php.expectf diff --git a/hphp/test/slow/inout/tuple/tests/msrv-unpack-error.php b/hphp/test/slow/inout/msrv-unpack-error.php similarity index 100% rename from hphp/test/slow/inout/tuple/tests/msrv-unpack-error.php rename to hphp/test/slow/inout/msrv-unpack-error.php diff --git a/hphp/test/slow/inout/tuple/tests/msrv-unpack-error.php.expectf b/hphp/test/slow/inout/msrv-unpack-error.php.expectf similarity index 100% rename from hphp/test/slow/inout/tuple/tests/msrv-unpack-error.php.expectf rename to hphp/test/slow/inout/msrv-unpack-error.php.expectf diff --git a/hphp/test/slow/inout/msrv/config.ini b/hphp/test/slow/inout/msrv/config.ini deleted file mode 100644 index 966516967a0..00000000000 --- a/hphp/test/slow/inout/msrv/config.ini +++ /dev/null @@ -1 +0,0 @@ -hhvm.use_msrv_for_in_out = true diff --git a/hphp/test/slow/inout/msrv/hphp_config.ini b/hphp/test/slow/inout/msrv/hphp_config.ini deleted file mode 100644 index 966516967a0..00000000000 --- a/hphp/test/slow/inout/msrv/hphp_config.ini +++ /dev/null @@ -1 +0,0 @@ -hhvm.use_msrv_for_in_out = true diff --git a/hphp/test/slow/inout/msrv/tests/abstract-method.php b/hphp/test/slow/inout/msrv/tests/abstract-method.php deleted file mode 100644 index c3f89fd4ecd..00000000000 --- a/hphp/test/slow/inout/msrv/tests/abstract-method.php +++ /dev/null @@ -1,19 +0,0 @@ -; -} - -class C implements I { - public async function foo(int &$x): Awaitable {} -} - -abstract class B { - public abstract function foo(int &$x): Awaitable; -} - -class D extends B { - public async function foo(int &$x): Awaitable {} -} - -echo "Done.\n"; diff --git a/hphp/test/slow/inout/msrv/tests/abstract-method.php.expect b/hphp/test/slow/inout/msrv/tests/abstract-method.php.expect deleted file mode 120000 index 6cdc35e7f66..00000000000 --- a/hphp/test/slow/inout/msrv/tests/abstract-method.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/abstract-method.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/abstract-method.php.hphp_opts b/hphp/test/slow/inout/msrv/tests/abstract-method.php.hphp_opts deleted file mode 120000 index c11742c5ad0..00000000000 --- a/hphp/test/slow/inout/msrv/tests/abstract-method.php.hphp_opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/abstract-method.php.hphp_opts \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/abstract-method.php.opts b/hphp/test/slow/inout/msrv/tests/abstract-method.php.opts deleted file mode 120000 index 8965f9fbe6e..00000000000 --- a/hphp/test/slow/inout/msrv/tests/abstract-method.php.opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/abstract-method.php.opts \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/autoloader.php b/hphp/test/slow/inout/msrv/tests/autoloader.php deleted file mode 100644 index a2dcb4bc520..00000000000 --- a/hphp/test/slow/inout/msrv/tests/autoloader.php +++ /dev/null @@ -1,38 +0,0 @@ - array(), 'failure' =>'loader'), ''); - - $v = null; - hit1(inout $v); - var_dump($v); - hit2(&$v); - var_dump($v); - hit3(inout $v); - var_dump($v); - - partial(inout $v); // error -} - -main(); diff --git a/hphp/test/slow/inout/msrv/tests/autoloader.php.expectf b/hphp/test/slow/inout/msrv/tests/autoloader.php.expectf deleted file mode 120000 index ca5c1141629..00000000000 --- a/hphp/test/slow/inout/msrv/tests/autoloader.php.expectf +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/autoloader.php.expectf \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/bad-abstract.php b/hphp/test/slow/inout/msrv/tests/bad-abstract.php deleted file mode 100644 index db080021723..00000000000 --- a/hphp/test/slow/inout/msrv/tests/bad-abstract.php +++ /dev/null @@ -1,9 +0,0 @@ - {} diff --git a/hphp/test/slow/inout/msrv/tests/bad-async.php.expectf b/hphp/test/slow/inout/msrv/tests/bad-async.php.expectf deleted file mode 120000 index 0baaf1480b5..00000000000 --- a/hphp/test/slow/inout/msrv/tests/bad-async.php.expectf +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/bad-async.php.expectf \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/bad-call-1.php b/hphp/test/slow/inout/msrv/tests/bad-call-1.php deleted file mode 100644 index 0a8fbe6bbc6..00000000000 --- a/hphp/test/slow/inout/msrv/tests/bad-call-1.php +++ /dev/null @@ -1,3 +0,0 @@ -derp(); diff --git a/hphp/test/slow/inout/msrv/tests/bad-call-15.php.expectf b/hphp/test/slow/inout/msrv/tests/bad-call-15.php.expectf deleted file mode 120000 index 6baa900557a..00000000000 --- a/hphp/test/slow/inout/msrv/tests/bad-call-15.php.expectf +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/bad-call-15.php.expectf \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/bad-call-2.php b/hphp/test/slow/inout/msrv/tests/bad-call-2.php deleted file mode 100644 index 82fef26501e..00000000000 --- a/hphp/test/slow/inout/msrv/tests/bad-call-2.php +++ /dev/null @@ -1,3 +0,0 @@ -b); diff --git a/hphp/test/slow/inout/msrv/tests/bad-call-5.php.expectregex b/hphp/test/slow/inout/msrv/tests/bad-call-5.php.expectregex deleted file mode 120000 index 0fff4674c77..00000000000 --- a/hphp/test/slow/inout/msrv/tests/bad-call-5.php.expectregex +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/bad-call-5.php.expectregex \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/bad-call-6.php b/hphp/test/slow/inout/msrv/tests/bad-call-6.php deleted file mode 100644 index 0bc19ac607e..00000000000 --- a/hphp/test/slow/inout/msrv/tests/bad-call-6.php +++ /dev/null @@ -1,3 +0,0 @@ -b); diff --git a/hphp/test/slow/inout/msrv/tests/bad-call-6.php.expectregex b/hphp/test/slow/inout/msrv/tests/bad-call-6.php.expectregex deleted file mode 120000 index 9e2af25f81a..00000000000 --- a/hphp/test/slow/inout/msrv/tests/bad-call-6.php.expectregex +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/bad-call-6.php.expectregex \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/bad-call-7.php b/hphp/test/slow/inout/msrv/tests/bad-call-7.php deleted file mode 100644 index 4c3557d22f3..00000000000 --- a/hphp/test/slow/inout/msrv/tests/bad-call-7.php +++ /dev/null @@ -1,3 +0,0 @@ -b[12]); diff --git a/hphp/test/slow/inout/msrv/tests/bad-call-7.php.expectregex b/hphp/test/slow/inout/msrv/tests/bad-call-7.php.expectregex deleted file mode 120000 index cf210233bb3..00000000000 --- a/hphp/test/slow/inout/msrv/tests/bad-call-7.php.expectregex +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/bad-call-7.php.expectregex \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/bad-call-8.php b/hphp/test/slow/inout/msrv/tests/bad-call-8.php deleted file mode 100644 index 55731e3e00e..00000000000 --- a/hphp/test/slow/inout/msrv/tests/bad-call-8.php +++ /dev/null @@ -1,3 +0,0 @@ -> -function foo(inout int $x): void {} diff --git a/hphp/test/slow/inout/msrv/tests/bad-memoize.php.expectf b/hphp/test/slow/inout/msrv/tests/bad-memoize.php.expectf deleted file mode 120000 index ef8b3e1d48e..00000000000 --- a/hphp/test/slow/inout/msrv/tests/bad-memoize.php.expectf +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/bad-memoize.php.expectf \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/bad-mixed-mode-1.php b/hphp/test/slow/inout/msrv/tests/bad-mixed-mode-1.php deleted file mode 100644 index d795fd07a0b..00000000000 --- a/hphp/test/slow/inout/msrv/tests/bad-mixed-mode-1.php +++ /dev/null @@ -1,4 +0,0 @@ - 12, 'apple' => 0, 'banana' => 2); - - sort(inout $x1); - asort(inout $x2); - usort(inout $x3, ($a, $b) ==> $a < $b); - var_dump($x1, $x2, $x3); - - ksort(inout $y1); - asort(inout $y2); - usort(inout $y3, ($a, $b) ==> $a < $b); - var_dump($y1, $y2, $y3); -} - -main(); diff --git a/hphp/test/slow/inout/msrv/tests/builtin-interop.php.expect b/hphp/test/slow/inout/msrv/tests/builtin-interop.php.expect deleted file mode 120000 index 92e803efdb3..00000000000 --- a/hphp/test/slow/inout/msrv/tests/builtin-interop.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/builtin-interop.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/call-dynamic.php b/hphp/test/slow/inout/msrv/tests/call-dynamic.php deleted file mode 100644 index 7777548aca5..00000000000 --- a/hphp/test/slow/inout/msrv/tests/call-dynamic.php +++ /dev/null @@ -1,32 +0,0 @@ -getTrace()[0]['function']); - } - } finally { - echo "outer finally\n"; - } -} - -function baz($x, inout $a) { - echo "baz($x, $a)\n"; - $a = $x; - if ($x === 42) throw new Exception(); - return $x + 1; -} - -function swap(inout $a, inout $b) { - $t = $b; - $b = $a; - $a = $t; - // implicit return -} - -function empty_(inout $t) { - try { - new stdclass; - return; - } finally { - echo "empty_ finally\n"; - } -} - -function main() { - $one = 'Eat'; - $two = ' my '; - $three = 'shorts'; - $four = foo('apple', inout $one, 'orange', inout $two, $two, inout $three); - echo "$one$two$three$four\n"; - - $v = 42; - var_dump(bar(inout $v), bar(inout $v), $v, bar(inout $v), $v); - - $q = 41; - try { - baz(baz($q, inout $q), inout $q); - } catch (Exception $e) { - var_dump(array_map($a ==> $a['function'], array_slice($e->getTrace(),0,2))); - var_dump($q); - } - - $a = 'alpha'; - $b = 'omega'; - empty_(inout $a); - empty_(inout $b); - swap(inout $a, inout $b); - echo "$a $b\n"; -} - -main(); diff --git a/hphp/test/slow/inout/msrv/tests/call-static.php.expect b/hphp/test/slow/inout/msrv/tests/call-static.php.expect deleted file mode 120000 index 72201a398b5..00000000000 --- a/hphp/test/slow/inout/msrv/tests/call-static.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/call-static.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/closure.php b/hphp/test/slow/inout/msrv/tests/closure.php deleted file mode 100644 index 3cd25161cec..00000000000 --- a/hphp/test/slow/inout/msrv/tests/closure.php +++ /dev/null @@ -1,20 +0,0 @@ - { - $x = 5; - return 6; - }; - $cl3 = function (&$x) { - $x = 6; - return 7; - }; - - $x = null; - var_dump($cl1(inout $x), $x, $cl2(&$x), $x, $cl3(inout $x), $x); -} - -main((inout $x) ==> { - $x = 4; - return 5; -}); diff --git a/hphp/test/slow/inout/msrv/tests/closure.php.expect b/hphp/test/slow/inout/msrv/tests/closure.php.expect deleted file mode 120000 index bc54f0f117b..00000000000 --- a/hphp/test/slow/inout/msrv/tests/closure.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/closure.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/complex-expr.php b/hphp/test/slow/inout/msrv/tests/complex-expr.php deleted file mode 100644 index 0ecf03e635c..00000000000 --- a/hphp/test/slow/inout/msrv/tests/complex-expr.php +++ /dev/null @@ -1,100 +0,0 @@ - $a['function'], $bt))."\n"; - return 'foo'; - } - - $x1 = 24; - $y1 = 42; - $a = nontop(inout $x1, inout $y1); - var_dump($a, $x1, $y1); - - $x2 = 18; - $y2 = 81; - $a = $nontop(inout $x2, inout $y2); - var_dump($a, $x2, $y2); -} - -main('nontop'); diff --git a/hphp/test/slow/inout/msrv/tests/def-func.php.expect b/hphp/test/slow/inout/msrv/tests/def-func.php.expect deleted file mode 120000 index facff3b1fe0..00000000000 --- a/hphp/test/slow/inout/msrv/tests/def-func.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/def-func.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/double-array-get.php b/hphp/test/slow/inout/msrv/tests/double-array-get.php deleted file mode 100644 index 53aff6d23c1..00000000000 --- a/hphp/test/slow/inout/msrv/tests/double-array-get.php +++ /dev/null @@ -1,9 +0,0 @@ - $a['function'], $bt))."\n"; - return 'Hello'; -} - -function bar(&$y) { - $y = 9; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'world!'; -} - -function main($foo, $bar) { - $a = null; - $b = null; - $c = null; - $g1 = $foo(inout $a); - $g2 = $foo(&$b); - $g3 = $foo(&$c); - var_dump($a, $b, $c); - - $x = null; - $y = null; - $z = null; - $h1 = $bar(&$x); - $h2 = $bar(&$y); - $h3 = $bar(inout $z); - var_dump($x, $y, $z); - - echo "$g1, $h1\n"; - echo "$g2, $h2\n"; - echo "$g2, $h2\n"; -} - -main('foo', 'bar'); diff --git a/hphp/test/slow/inout/msrv/tests/func-interop-dynamic.php.expect b/hphp/test/slow/inout/msrv/tests/func-interop-dynamic.php.expect deleted file mode 120000 index 85319c3ba89..00000000000 --- a/hphp/test/slow/inout/msrv/tests/func-interop-dynamic.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/func-interop-dynamic.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/func-interop-static.php b/hphp/test/slow/inout/msrv/tests/func-interop-static.php deleted file mode 100644 index 62e5e540bdb..00000000000 --- a/hphp/test/slow/inout/msrv/tests/func-interop-static.php +++ /dev/null @@ -1,39 +0,0 @@ - $a['function'], $bt))."\n"; - return 'Hello'; -} - -function bar(&$y) { - $y = 9; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'world!'; -} - -function main() { - $a = null; - $b = null; - $c = null; - $g1 = foo(inout $a); - $g2 = foo(&$b); - $g3 = foo(&$c); - var_dump($a, $b, $c); - - $x = null; - $y = null; - $z = null; - $h1 = bar(&$x); - $h2 = bar(&$y); - $h3 = bar(inout $z); - var_dump($x, $y, $z); - - echo "$g1, $h1\n"; - echo "$g2, $h2\n"; - echo "$g2, $h2\n"; -} - -main(); diff --git a/hphp/test/slow/inout/msrv/tests/func-interop-static.php.expect b/hphp/test/slow/inout/msrv/tests/func-interop-static.php.expect deleted file mode 120000 index 5ce11cc1dac..00000000000 --- a/hphp/test/slow/inout/msrv/tests/func-interop-static.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/func-interop-static.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/inout-decl.php b/hphp/test/slow/inout/msrv/tests/inout-decl.php deleted file mode 100644 index 89f9c8b66dd..00000000000 --- a/hphp/test/slow/inout/msrv/tests/inout-decl.php +++ /dev/null @@ -1,92 +0,0 @@ -(inout vec $v, ...) {} -function g($q, inout dict> $r, ...) {} -function h(inout $a, inout $b, $t, inout bool $c, $a = 12) {} - -function fptr( - inout $a, - (function(inout int, inout Foo, inout float): Bar) $b -): (function(inout double, inout int, float): int) { -} - -function main($a, $b, inout $c, $d, $e) { - if ($c === 3) return; - - foo(1, 2, inout $a, 3); - bar(inout $a['x']); - f(inout $a['v']['s'], $b['x'], $c); - g($a, inout $b, $c); - h(inout $a['m'], inout $b, $c, inout $a[$e], $e); - - $x = Cls::inout; - $y = Herp::inout(inout $x); - $z = Derp::foo + $x + $y; - - return $x + $y + $z; -} - -$a = 3; -main(1, 2, inout $a, 4, 5, 6); -var_dump(Cls::inout, Derp::foo); -echo "Done.\n"; -} diff --git a/hphp/test/slow/inout/msrv/tests/inout-decl.php.expect b/hphp/test/slow/inout/msrv/tests/inout-decl.php.expect deleted file mode 120000 index b6c47669b39..00000000000 --- a/hphp/test/slow/inout/msrv/tests/inout-decl.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/inout-decl.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/inout_param_mixed_hint.php b/hphp/test/slow/inout/msrv/tests/inout_param_mixed_hint.php deleted file mode 100644 index 7c2ecafb67b..00000000000 --- a/hphp/test/slow/inout/msrv/tests/inout_param_mixed_hint.php +++ /dev/null @@ -1,13 +0,0 @@ - ['orange' => 5]]; - foo(inout $a[10]); - foo(inout $a['apple']['banana']); - foo(inout $a['apple']['orange']); - - try { - foo(inout $a[50][100]); - } catch (Exception $e) { - var_dump($e->getMessage()); - } - foo(&$a[1]); - foo(&$a[5][10]); - var_dump($a); -} - -function getOne(inout $a, $k) { - try { - foo(inout $a[$k]); - } catch (Exception $e) { - echo "Caught: ".$e->getMessage()."\n"; - } -} - -function getTwo(inout $a, $k1, $k2) { - try { - foo(inout $a[$k1][$k2]); - } catch (Exception $e) { - echo "Caught: ".$e->getMessage()."\n"; - } -} - -function checkNonStatic($a) { - getOne(inout $a, 10); - getTwo(inout $a, 'apple', 'banana'); - getTwo(inout $a, 'apple', 'orange'); - getTwo(inout $a, 50, 100); - try { - foo(&$a[1]); - } catch (Exception $e) { - echo "Caught: ".$e->getMessage()."\n"; - } - try { - foo(&$a[5][10]); - } catch (Exception $e) { - echo "Caught: ".$e->getMessage()."\n"; - } - var_dump($a); -} - -function checkNums($a) { - getTwo(inout $a, 0, 1); - getTwo(inout $a, 0, 100); - getOne(inout $a, 0); - getOne(inout $a, 50); - getTwo(inout $a, 50, 100); -} - -function main() { - checkStatic(); - $a = ['apple' => ['orange' => 5]]; - $b = dict['apple' => ['orange' => 5]]; - $c = keyset[0, 1, 2]; - $d = vec[vec[0, 1, 2], 3, 4]; - checkNonStatic($a); - checkNonStatic($b); - checkNums($c); - checkNums($d); -} - -main(); diff --git a/hphp/test/slow/inout/msrv/tests/invalid-index.php.expectf b/hphp/test/slow/inout/msrv/tests/invalid-index.php.expectf deleted file mode 120000 index 2e8f29ac709..00000000000 --- a/hphp/test/slow/inout/msrv/tests/invalid-index.php.expectf +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/invalid-index.php.expectf \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/method-dynamic.php b/hphp/test/slow/inout/msrv/tests/method-dynamic.php deleted file mode 100644 index bcf9f9b4ece..00000000000 --- a/hphp/test/slow/inout/msrv/tests/method-dynamic.php +++ /dev/null @@ -1,70 +0,0 @@ -beep(); - } -} - -class Bar extends Foo { - function beep() { return 42; } - function info2(inout $x, inout $y, inout $z) { - $z = parent::class; - return parent::info(inout $x, inout $y); - } -} - -function main($obj, $foo, $alpha, $beta, $one, $two, $bar, $arr1, $arr2) { - $a = 'beta'; - $b = 'gamma'; - $x = 41; - $r1 = $obj->$alpha(inout $a, inout $b); - $r2 = $foo::$beta(inout $x); - var_dump($a, $b, $x, $r1, $r2); - - $t = null; - $obj->$one(inout $t); - var_dump($t); - - $foo::$two(inout $t); - var_dump($t); - - $q = null; - Foo::$two(inout $q); - var_dump($q); - - $r = null; - $foo::two(inout $r); - var_dump($r); - - $self = null; - $static = null; - $parent = null; - $num = $bar->info2(inout $self, inout $static, inout $parent); - var_dump($num, $self, $static, $parent); - - $a = null; - $arr1(inout $a); - var_dump($a); - $arr2(inout $a); - var_dump($a); -} - -main(new Foo, 'Foo', 'alpha', 'beta', 'one', 'two', new Bar, - array(new Foo, 'one'), array('Foo', 'two')); diff --git a/hphp/test/slow/inout/msrv/tests/method-dynamic.php.expect b/hphp/test/slow/inout/msrv/tests/method-dynamic.php.expect deleted file mode 120000 index 97e2800ffac..00000000000 --- a/hphp/test/slow/inout/msrv/tests/method-dynamic.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-dynamic.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/method-interop-dynamic.php b/hphp/test/slow/inout/msrv/tests/method-interop-dynamic.php deleted file mode 100644 index 246a8cf53bf..00000000000 --- a/hphp/test/slow/inout/msrv/tests/method-interop-dynamic.php +++ /dev/null @@ -1,116 +0,0 @@ - $a['function'], $bt))."\n"; - return 'Hello'; - } - - function bar(&$y) { - $y = 9; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'world!'; - } - - static function fizz(inout $x) { - $x = 24; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'FIZZ'; - } - - static function buzz(&$y) { - $y = 19; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'BUZZ'; - } -} - -function main($obj, $Herp, $foo, $bar, $fizz, $buzz) { - $a = null; - $b = null; - $c = null; - $g1 = $obj->$foo(inout $a); - $g2 = $obj->$foo($b); - $g3 = $obj->$foo(&$c); - var_dump($a, $b, $c); - - $x = null; - $y = null; - $z = null; - $h1 = $obj->$bar($x); - $h2 = $obj->$bar(&$y); - $h3 = $obj->$bar(inout $z); - var_dump($x, $y, $z); - - echo "$g1, $h1\n"; - echo "$g2, $h2\n"; - echo "$g2, $h2\n"; - - $q = null; - $r = null; - $s = null; - $f1 = Herp::$fizz(inout $q); - $f2 = Herp::$fizz($r); - $f3 = Herp::$fizz(&$s); - var_dump($q, $r, $s); - - $t = null; - $u = null; - $v = null; - $k1 = Herp::$buzz(inout $t); - $k2 = Herp::$buzz($u); - $k3 = Herp::$buzz(&$v); - var_dump($t, $u, $v); - - echo "$f1, $k1\n"; - echo "$f2, $k2\n"; - echo "$f2, $k2\n"; - - $q2 = null; - $r2 = null; - $s2 = null; - $f4 = $Herp::$fizz(inout $q2); - $f5 = $Herp::$fizz($r2); - $f6 = $Herp::$fizz(&$s2); - var_dump($q2, $r2, $s2); - - $t2 = null; - $u2 = null; - $v2 = null; - $k4 = $Herp::$buzz(inout $t2); - $k5 = $Herp::$buzz($u2); - $k6 = $Herp::$buzz(&$v2); - var_dump($t2, $u2, $v2); - - echo "$f4, $k4\n"; - echo "$f5, $k5\n"; - echo "$f6, $k6\n"; - - $q3 = null; - $r3 = null; - $s3 = null; - $f7 = $Herp::fizz(inout $q3); - $f8 = $Herp::fizz($r3); - $f9 = $Herp::fizz(&$s3); - var_dump($q3, $r3, $s3); - - $t3 = null; - $u3 = null; - $v3 = null; - $k7 = $Herp::$buzz(inout $t3); - $k8 = $Herp::$buzz($u3); - $k9 = $Herp::$buzz(&$v3); - var_dump($t3, $u3, $v3); - - echo "$f7, $k7\n"; - echo "$f8, $k8\n"; - echo "$f9, $k9\n"; -} - -$obj = new Herp; -main($obj, 'Herp', 'foo', 'bar', 'fizz', 'buzz'); diff --git a/hphp/test/slow/inout/msrv/tests/method-interop-dynamic.php.expectf b/hphp/test/slow/inout/msrv/tests/method-interop-dynamic.php.expectf deleted file mode 120000 index f0b11973675..00000000000 --- a/hphp/test/slow/inout/msrv/tests/method-interop-dynamic.php.expectf +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-interop-dynamic.php.expectf \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/method-interop-dynamic.php.hphp_opts b/hphp/test/slow/inout/msrv/tests/method-interop-dynamic.php.hphp_opts deleted file mode 120000 index 9b6ad6fcf80..00000000000 --- a/hphp/test/slow/inout/msrv/tests/method-interop-dynamic.php.hphp_opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-interop-dynamic.php.hphp_opts \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/method-interop-dynamic.php.opts b/hphp/test/slow/inout/msrv/tests/method-interop-dynamic.php.opts deleted file mode 120000 index 5041995c99e..00000000000 --- a/hphp/test/slow/inout/msrv/tests/method-interop-dynamic.php.opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-interop-dynamic.php.opts \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/method-interop-static.php b/hphp/test/slow/inout/msrv/tests/method-interop-static.php deleted file mode 100644 index ca066994c9f..00000000000 --- a/hphp/test/slow/inout/msrv/tests/method-interop-static.php +++ /dev/null @@ -1,77 +0,0 @@ - $a['function'], $bt))."\n"; - return 'Hello'; - } - - function bar(&$y) { - $y = 9; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'world!'; - } - - static function fizz(inout $x) { - $x = 24; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'FIZZ'; - } - - static function buzz(&$y) { - $y = 19; - $bt = array_slice(debug_backtrace(), 0, 2); - echo implode(', ', array_map($a ==> $a['function'], $bt))."\n"; - return 'BUZZ'; - } -} - -function main() { - $obj = new Herp; - - $a = null; - $b = null; - $c = null; - $g1 = $obj->foo(inout $a); - $g2 = $obj->foo($b); - $g3 = $obj->foo(&$c); - var_dump($a, $b, $c); - - $x = null; - $y = null; - $z = null; - $h1 = $obj->bar($x); - $h2 = $obj->bar(&$y); - $h3 = $obj->bar(inout $z); - var_dump($x, $y, $z); - - echo "$g1, $h1\n"; - echo "$g2, $h2\n"; - echo "$g2, $h2\n"; - - $q = null; - $r = null; - $s = null; - $f1 = Herp::fizz(inout $q); - $f2 = Herp::fizz($r); - $f3 = Herp::fizz(&$s); - var_dump($q, $r, $s); - - $t = null; - $u = null; - $v = null; - $k1 = Herp::buzz(inout $t); - $k2 = Herp::buzz($u); - $k3 = Herp::buzz(&$v); - var_dump($t, $u, $v); - - echo "$f1, $k1\n"; - echo "$f2, $k2\n"; - echo "$f2, $k2\n"; -} - -main(); diff --git a/hphp/test/slow/inout/msrv/tests/method-interop-static.php.expectf b/hphp/test/slow/inout/msrv/tests/method-interop-static.php.expectf deleted file mode 120000 index d49f4117c4a..00000000000 --- a/hphp/test/slow/inout/msrv/tests/method-interop-static.php.expectf +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-interop-static.php.expectf \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/method-interop-static.php.hphp_opts b/hphp/test/slow/inout/msrv/tests/method-interop-static.php.hphp_opts deleted file mode 120000 index ddb4e97a403..00000000000 --- a/hphp/test/slow/inout/msrv/tests/method-interop-static.php.hphp_opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-interop-static.php.hphp_opts \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/method-interop-static.php.opts b/hphp/test/slow/inout/msrv/tests/method-interop-static.php.opts deleted file mode 120000 index 5d7961e5edd..00000000000 --- a/hphp/test/slow/inout/msrv/tests/method-interop-static.php.opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-interop-static.php.opts \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/method-static.php b/hphp/test/slow/inout/msrv/tests/method-static.php deleted file mode 100644 index 56699153747..00000000000 --- a/hphp/test/slow/inout/msrv/tests/method-static.php +++ /dev/null @@ -1,36 +0,0 @@ -alpha(inout $a, inout $b); - $r2 = Foo::beta(inout $x); - var_dump($a, $b, $x, $r1, $r2); - - $t = null; - $obj->one(inout $t); - var_dump($t); - - Foo::two(inout $t); - var_dump($t); -} - -main(new Foo); diff --git a/hphp/test/slow/inout/msrv/tests/method-static.php.expect b/hphp/test/slow/inout/msrv/tests/method-static.php.expect deleted file mode 120000 index 4421401e25d..00000000000 --- a/hphp/test/slow/inout/msrv/tests/method-static.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/method-static.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/msrv-error.php b/hphp/test/slow/inout/msrv/tests/msrv-error.php deleted file mode 100644 index c8e9e75bfb6..00000000000 --- a/hphp/test/slow/inout/msrv/tests/msrv-error.php +++ /dev/null @@ -1,11 +0,0 @@ - { - echo "[$errno] $errstr\n"; - throw new Exception(); -}); - -function foo($x, inout int $y): string { - return ($y = $x); -} - -function bar(inout int $x, inout int $y): int { - list($x, $y) = array($y, $x); - return $x + $y; -} - -function main() { - $a = 'hello'; - $b = 42; - $c = 58; - try { foo($a, inout $b); } catch (Exception $e) {} - try { foo($b, inout $c); } catch (Exception $e) {} - $r = bar(inout $b, inout $c); - var_dump($r, $b, $c); -} - -main(); diff --git a/hphp/test/slow/inout/msrv/tests/out-type-hints.php.expect b/hphp/test/slow/inout/msrv/tests/out-type-hints.php.expect deleted file mode 120000 index ed7210e824a..00000000000 --- a/hphp/test/slow/inout/msrv/tests/out-type-hints.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/out-type-hints.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/reffy-magic.php b/hphp/test/slow/inout/msrv/tests/reffy-magic.php deleted file mode 100644 index 41fa44e4511..00000000000 --- a/hphp/test/slow/inout/msrv/tests/reffy-magic.php +++ /dev/null @@ -1,21 +0,0 @@ - vec[dict['beta' => new Herp], null, new Herp, null]); - $x['alpha'][0]['beta'] = array('one' => '*BLANK*', 'two' => '*BLANK*'); - return $x; -} - -function &get_arr_ref() { - static $a; - if (!isset($a)) $a = get_arr(); - echo "get_arr_ref()\n"; - return $a; -} - -function main() { - $x = get_arr(); - $i = 1; - $t = 'alpha'; - foo( - 0, - inout $x[launder('alpha')][--$i]['beta']['one'], - inout $x[$t][++$i], - 0, - inout $x[$t.launder('')][++$i], - $i *= 2, - $t = 'red', - ); - var_dump($x); - - /* The following more general syntax is not allowed- - foo( - $i = 1, - inout get_arr_ref()[launder('alpha')][$i++], - inout get_arr_ref()[$t = launder('alpha')][$i++], - $a =& get_arr_ref(), - inout $a[$t][$i], - $i *= 2, - $t = 'red', - ); - var_dump($a); - - $i = 0; - $x = 'apple'; - Herp::$derp = get_arr(); - foo( - $x = 'baz', - inout (Herp::$derp[$t = launder('alpha')][$i++]['beta']->$x)['one'], - inout $x, - $a = 'TWO', - inout Herp::$derp[$t][$i], - $i *= 2, - $old = Herp::$derp, - ); - var_dump($x, Herp::$derp, $old); - - $i = 0; - $x = 'apple'; - $Herp = Herp::class; - $hh = 'Herp'; - Herp::$derp = get_arr(); - foo( - $x = 'alpha', - inout ${launder('hh')}::${launder('derp')}[$x][$i++], - inout Herp::${launder('derp')}[$x][$i++], - $a = 'TWO', - inout ${$hh}::$derp[$x][$i++], - $i *= 2, - $x = 0, - ); - var_dump($x, Herp::$derp); - */ - - $a = 'nope'; - $b = 'nope'; - $c = 'nope'; - foo( - $a, - inout $a, - inout $b, - $b, - inout $c, - $a, - $c, - ); - var_dump($a, $b, $c); - - $a = array('yep'); - $b = array('nope'); - $c = array('yep'); - foo( - $a, - inout $a[0], - inout $b[0], - $b, - inout $c[0], - ref(&$a), - ref(&ref(&ref(&$c))), - ); - var_dump($a[0], $b[0], $c[0]); - - /* The following more general syntax is not allowed- - $a = new stdclass; - $a->x = 'one'; - $a->y = 'two'; - $saved = $a; - foo( - &$a, - inout $a->x, - inout $a, - $a, - inout $a->y, - ); - var_dump($saved, $a); - - Herp::$derp = 'foo'; - $a = 'Herp'; - foo( - &$a, - inout $a::$derp, - inout $a, - $a, - inout $a::$derp, - ); - var_dump($a, Herp::$derp); - - $a = new stdclass; - $a->x = 'one'; - $a->y = 'two'; - $saved = $a; - foo( - &$a, - inout $a, - inout $a->x, - $a, - inout $a, - ); - var_dump($saved, $a); - - $a = new stdclass; - $a->x = 'one'; - $a->y = 'two'; - $saved = $a; - foo( - &$a, - inout $a->x, - inout $a->y, - $a = 'oops', - inout $a, - ); - var_dump($saved, $a); - */ -} - -main(); diff --git a/hphp/test/slow/inout/msrv/tests/side-effects.php.expect b/hphp/test/slow/inout/msrv/tests/side-effects.php.expect deleted file mode 120000 index 545787d19c4..00000000000 --- a/hphp/test/slow/inout/msrv/tests/side-effects.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/side-effects.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/trait-magic.php b/hphp/test/slow/inout/msrv/tests/trait-magic.php deleted file mode 100644 index 9873e406879..00000000000 --- a/hphp/test/slow/inout/msrv/tests/trait-magic.php +++ /dev/null @@ -1,77 +0,0 @@ -foo(inout $x, inout $y); - var_dump($r, $x, $y); - $r = $o->bar(inout $x); - var_dump($r, $x); - $r = $o->apple(inout $x); - var_dump($r, $x); - $r = $o->potato(inout $x); - var_dump($r, $x); - - var_dump(HerpDerp::s1(inout $x), $x); - var_dump(HerpDerp::s2(&$x), $x); - var_dump(HerpDerp::s2(inout $x)); - var_dump(HerpDerp::orange($x)); -} - -main(); diff --git a/hphp/test/slow/inout/msrv/tests/trait-magic.php.expect b/hphp/test/slow/inout/msrv/tests/trait-magic.php.expect deleted file mode 120000 index fea0f9df75a..00000000000 --- a/hphp/test/slow/inout/msrv/tests/trait-magic.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/trait-magic.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/trait-magic.php.hphp_opts b/hphp/test/slow/inout/msrv/tests/trait-magic.php.hphp_opts deleted file mode 120000 index f13391622ca..00000000000 --- a/hphp/test/slow/inout/msrv/tests/trait-magic.php.hphp_opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/trait-magic.php.hphp_opts \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/trait-magic.php.opts b/hphp/test/slow/inout/msrv/tests/trait-magic.php.opts deleted file mode 120000 index f6654dc2ef6..00000000000 --- a/hphp/test/slow/inout/msrv/tests/trait-magic.php.opts +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/trait-magic.php.opts \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/variadic-builtin.php b/hphp/test/slow/inout/msrv/tests/variadic-builtin.php deleted file mode 100644 index 342ee8c7ef6..00000000000 --- a/hphp/test/slow/inout/msrv/tests/variadic-builtin.php +++ /dev/null @@ -1,17 +0,0 @@ - 0) var_dump("wat"); - return $r; -} - -function main() { - $x = [1, 2, 3]; - foo(inout $x, 24); - foo(inout $x, 42, 'apple', 200); - foo(&$x, 8, 99, 'green'); - foo(&$x, 16); - var_dump($x); - var_dump(bar(&$x)); - var_dump(bar(inout $x)); - var_dump(bar(&$x)); - var_dump(bar(inout $x)); - var_dump($x); -} - -main(); diff --git a/hphp/test/slow/inout/msrv/tests/variadic-inout.php.expect b/hphp/test/slow/inout/msrv/tests/variadic-inout.php.expect deleted file mode 120000 index 80e8ed6db8a..00000000000 --- a/hphp/test/slow/inout/msrv/tests/variadic-inout.php.expect +++ /dev/null @@ -1 +0,0 @@ -../../tuple/tests/variadic-inout.php.expect \ No newline at end of file diff --git a/hphp/test/slow/inout/msrv/tests/xhp.php b/hphp/test/slow/inout/msrv/tests/xhp.php deleted file mode 100644 index 75124029d52..00000000000 --- a/hphp/test/slow/inout/msrv/tests/xhp.php +++ /dev/null @@ -1,12 +0,0 @@ -