From f891bd2a4bf11208b8bf9f2ba661183f076e2296 Mon Sep 17 00:00:00 2001 From: Oguz Ulgen Date: Wed, 22 Jul 2020 17:01:42 -0700 Subject: [PATCH] Remove Def* bytecodes from hhas tests Summary: They are no longer being used since all units are merge only Reviewed By: ricklavoie, jano Differential Revision: D22601243 fbshipit-source-id: 0692df705add9c066b0a70b5694fc24fdfe06e6a --- hphp/test/quick/access_modifier.hhas | 1 - hphp/test/quick/asm_alias.hhas | 5 ----- hphp/test/quick/asm_assert_optobj.hhas | 1 - hphp/test/quick/asm_class.hhas | 5 ----- hphp/test/quick/asm_hoistable_1.hhas | 2 -- hphp/test/quick/asm_hoistable_2.hhas | 2 -- hphp/test/quick/asm_trait.hhas | 7 ------- hphp/test/quick/asm_types.hhas | 1 - hphp/test/quick/asm_user_attrs.hhas | 1 - hphp/test/quick/check_init_prop.hhas | 1 - hphp/test/quick/class_torture.hhas | 5 ----- hphp/test/quick/constructor_destructor.hhas | 1 - hphp/test/quick/def_oob.hhas | 7 ------- hphp/test/quick/def_oob.hhas.expectf | 6 ------ hphp/test/quick/hhas_fc_enum.hhas | 1 - hphp/test/slow/object/const/missing_no_dynamic.hhas | 1 - hphp/test/slow/object/const/missing_no_dynamic.hhas.expectf | 2 +- hphp/test/slow/object/const/not_all_props.hhas | 1 - hphp/test/slow/object/const/not_all_props.hhas.expectf | 2 +- hphp/test/slow/object/const/not_on_enum.hhas | 1 - hphp/test/slow/object/const/not_on_enum.hhas.expectf | 2 +- hphp/test/slow/object/const/not_on_interface.hhas | 1 - hphp/test/slow/object/const/not_on_interface.hhas.expectf | 2 +- hphp/test/slow/object/const/not_on_late_init_prop.hhas | 1 - hphp/test/slow/object/const/not_on_late_init_prop.hhas.expectf | 2 +- hphp/test/slow/object/const/not_on_trait.hhas | 1 - hphp/test/slow/object/const/not_on_trait.hhas.expectf | 2 +- .../slow/object/const/static/not_on_static_late_init_prop.hhas | 1 - .../object/const/static/not_on_static_late_init_prop.hhas.expectf | 2 +- 29 files changed, 7 insertions(+), 60 deletions(-) diff --git a/hphp/test/quick/access_modifier.hhas b/hphp/test/quick/access_modifier.hhas index a6f0e2a91ae..30cb760f1b9 100644 --- a/hphp/test/quick/access_modifier.hhas +++ b/hphp/test/quick/access_modifier.hhas @@ -38,7 +38,6 @@ .function ["__EntryPoint"("""y:0:{}""")] main() { .declvars $x; - DefCls 0 NewObjD "A" Dup NullUninit diff --git a/hphp/test/quick/asm_alias.hhas b/hphp/test/quick/asm_alias.hhas index a1f0faa5df2..688d532180a 100644 --- a/hphp/test/quick/asm_alias.hhas +++ b/hphp/test/quick/asm_alias.hhas @@ -2,11 +2,6 @@ # Test declaring type aliases .main { - DefCls 0 - DefTypeAlias 0 - DefTypeAlias 1 - DefTypeAlias 2 - DefTypeAlias 3 Int 1 RetC diff --git a/hphp/test/quick/asm_assert_optobj.hhas b/hphp/test/quick/asm_assert_optobj.hhas index 8b6b39ac1c0..e6f9bdb22ef 100644 --- a/hphp/test/quick/asm_assert_optobj.hhas +++ b/hphp/test/quick/asm_assert_optobj.hhas @@ -1,6 +1,5 @@ .hh_file 1; .main { - DefCls 0 Int 1 RetC diff --git a/hphp/test/quick/asm_class.hhas b/hphp/test/quick/asm_class.hhas index 0fa8e35278f..3adbe0ffa8a 100644 --- a/hphp/test/quick/asm_class.hhas +++ b/hphp/test/quick/asm_class.hhas @@ -4,11 +4,6 @@ # .main { - DefCls 0 - DefCls 1 - DefCls 2 - DefCls 3 - DefCls 4 Int 1 RetC diff --git a/hphp/test/quick/asm_hoistable_1.hhas b/hphp/test/quick/asm_hoistable_1.hhas index 84ba40c1133..bee4bfef8a0 100644 --- a/hphp/test/quick/asm_hoistable_1.hhas +++ b/hphp/test/quick/asm_hoistable_1.hhas @@ -3,8 +3,6 @@ # if A was marked as hoistable. .main { - DefCls 0 - DefCls 1 Int 1 RetC } diff --git a/hphp/test/quick/asm_hoistable_2.hhas b/hphp/test/quick/asm_hoistable_2.hhas index ed3ac06a1aa..a6e8547e9c0 100644 --- a/hphp/test/quick/asm_hoistable_2.hhas +++ b/hphp/test/quick/asm_hoistable_2.hhas @@ -2,8 +2,6 @@ # Test that things can get marked AlwaysHoistable .main { - DefClsNop 0 - DefClsNop 1 Int 1 RetC diff --git a/hphp/test/quick/asm_trait.hhas b/hphp/test/quick/asm_trait.hhas index 08746dd924a..054062866f4 100644 --- a/hphp/test/quick/asm_trait.hhas +++ b/hphp/test/quick/asm_trait.hhas @@ -4,13 +4,6 @@ # .main { - DefCls 0 - DefCls 1 - DefCls 2 - DefCls 3 - DefCls 4 - DefCls 5 - DefCls 6 Int 1 RetC diff --git a/hphp/test/quick/asm_types.hhas b/hphp/test/quick/asm_types.hhas index a0be38b2e43..7920f421e08 100644 --- a/hphp/test/quick/asm_types.hhas +++ b/hphp/test/quick/asm_types.hhas @@ -4,7 +4,6 @@ .adata A_0 = """Y:0:{}"""; .main { - DefCls 0 Int 1 RetC diff --git a/hphp/test/quick/asm_user_attrs.hhas b/hphp/test/quick/asm_user_attrs.hhas index 1aba2afc9b2..3e551bf0880 100644 --- a/hphp/test/quick/asm_user_attrs.hhas +++ b/hphp/test/quick/asm_user_attrs.hhas @@ -4,7 +4,6 @@ .filepath "/home/msullivan/tmp/saved-tests/user-attrs.php"; .main { - DefCls 0 Int 1 RetC } diff --git a/hphp/test/quick/check_init_prop.hhas b/hphp/test/quick/check_init_prop.hhas index 9fbde5ba606..f863e085bda 100644 --- a/hphp/test/quick/check_init_prop.hhas +++ b/hphp/test/quick/check_init_prop.hhas @@ -1,7 +1,6 @@ .hh_file 1; .main { - DefCls 0 Int 1 RetC diff --git a/hphp/test/quick/class_torture.hhas b/hphp/test/quick/class_torture.hhas index 4460025d78d..f13c6b609dd 100644 --- a/hphp/test/quick/class_torture.hhas +++ b/hphp/test/quick/class_torture.hhas @@ -4,11 +4,6 @@ .main { .declvars $x; - DefCls 0 - DefCls 1 - DefCls 2 - DefCls 4 - DefCls 6 Int 1 RetC diff --git a/hphp/test/quick/constructor_destructor.hhas b/hphp/test/quick/constructor_destructor.hhas index 327ffebcc98..52cdbb588ae 100644 --- a/hphp/test/quick/constructor_destructor.hhas +++ b/hphp/test/quick/constructor_destructor.hhas @@ -3,7 +3,6 @@ # poorly defined .main { - DefCls 0 Int 1 RetC diff --git a/hphp/test/quick/def_oob.hhas b/hphp/test/quick/def_oob.hhas index cfa91b529d6..56b3fc27130 100644 --- a/hphp/test/quick/def_oob.hhas +++ b/hphp/test/quick/def_oob.hhas @@ -1,13 +1,6 @@ .hh_file 1; -#Checks that arguments to DefCls/DefTypeAlias exist .main { - DefCls 0 - DefClsNop 1 - DefCls 3 - DefClsNop 4 - DefTypeAlias 0 - DefTypeAlias 1 Int 1 RetC diff --git a/hphp/test/quick/def_oob.hhas.expectf b/hphp/test/quick/def_oob.hhas.expectf index d493a2f56c3..d5e2d73ed6b 100644 --- a/hphp/test/quick/def_oob.hhas.expectf +++ b/hphp/test/quick/def_oob.hhas.expectf @@ -1,9 +1,3 @@ -Verification Error (unit %s func ): DefCls references nonexistent class (3) - -Verification Error (unit %s func ): DefClsNop references nonexistent class (4) - -Verification Error (unit %s func ): DefTypeAlias references nonexistent type alias (1) - Verification Error (unit %s func main): CreateCl must reference a closure defined in the same unit Verification failed for unit %s. Re-run with HHVM_VERIFY_VERBOSE=1 to see more details. diff --git a/hphp/test/quick/hhas_fc_enum.hhas b/hphp/test/quick/hhas_fc_enum.hhas index 6973a491e5b..d3aa74f40a2 100644 --- a/hphp/test/quick/hhas_fc_enum.hhas +++ b/hphp/test/quick/hhas_fc_enum.hhas @@ -2,7 +2,6 @@ # Test out making enums .main { - DefCls 0 Int 1 RetC diff --git a/hphp/test/slow/object/const/missing_no_dynamic.hhas b/hphp/test/slow/object/const/missing_no_dynamic.hhas index 0a50674e077..9702a22152f 100644 --- a/hphp/test/slow/object/const/missing_no_dynamic.hhas +++ b/hphp/test/slow/object/const/missing_no_dynamic.hhas @@ -1,7 +1,6 @@ .hh_file 1; .main (1,1) { - DefCls 0 Int 1 RetC } diff --git a/hphp/test/slow/object/const/missing_no_dynamic.hhas.expectf b/hphp/test/slow/object/const/missing_no_dynamic.hhas.expectf index b42a618a8f1..0bf71e5bd4f 100644 --- a/hphp/test/slow/object/const/missing_no_dynamic.hhas.expectf +++ b/hphp/test/slow/object/const/missing_no_dynamic.hhas.expectf @@ -1 +1 @@ -Fatal error: Assembler Error: line 17: const class missing ForbidDynamicProps attribute in %s/missing_no_dynamic.hhas on line -1 +Fatal error: Assembler Error: line 16: const class missing ForbidDynamicProps attribute in %s/missing_no_dynamic.hhas on line -1 diff --git a/hphp/test/slow/object/const/not_all_props.hhas b/hphp/test/slow/object/const/not_all_props.hhas index dc469f8a158..127bfc75ffa 100644 --- a/hphp/test/slow/object/const/not_all_props.hhas +++ b/hphp/test/slow/object/const/not_all_props.hhas @@ -1,7 +1,6 @@ .hh_file 1; .main (1,1) { - DefCls 0 Int 1 RetC } diff --git a/hphp/test/slow/object/const/not_all_props.hhas.expectf b/hphp/test/slow/object/const/not_all_props.hhas.expectf index 98a3321a5ef..3fa23e4f732 100644 --- a/hphp/test/slow/object/const/not_all_props.hhas.expectf +++ b/hphp/test/slow/object/const/not_all_props.hhas.expectf @@ -1 +1 @@ -Fatal error: Assembler Error: line 20: all instance properties of a const class must be const in %s/not_all_props.hhas on line -1 +Fatal error: Assembler Error: line 19: all instance properties of a const class must be const in %s/not_all_props.hhas on line -1 diff --git a/hphp/test/slow/object/const/not_on_enum.hhas b/hphp/test/slow/object/const/not_on_enum.hhas index d25ddf978c8..4b22923b320 100644 --- a/hphp/test/slow/object/const/not_on_enum.hhas +++ b/hphp/test/slow/object/const/not_on_enum.hhas @@ -1,7 +1,6 @@ .hh_file 1; .main (1,1) { - DefCls 0 Int 1 RetC } diff --git a/hphp/test/slow/object/const/not_on_enum.hhas.expectf b/hphp/test/slow/object/const/not_on_enum.hhas.expectf index 851e13162e4..23b485a59b3 100644 --- a/hphp/test/slow/object/const/not_on_enum.hhas.expectf +++ b/hphp/test/slow/object/const/not_on_enum.hhas.expectf @@ -1 +1 @@ -Fatal error: Assembler Error: line 17: interfaces, traits and enums may not be const in %s/not_on_enum.hhas on line -1 +Fatal error: Assembler Error: line 16: interfaces, traits and enums may not be const in %s/not_on_enum.hhas on line -1 diff --git a/hphp/test/slow/object/const/not_on_interface.hhas b/hphp/test/slow/object/const/not_on_interface.hhas index ce56c050ed8..f3edc749c5a 100644 --- a/hphp/test/slow/object/const/not_on_interface.hhas +++ b/hphp/test/slow/object/const/not_on_interface.hhas @@ -1,7 +1,6 @@ .hh_file 1; .main (1,1) { - DefCls 0 Int 1 RetC } diff --git a/hphp/test/slow/object/const/not_on_interface.hhas.expectf b/hphp/test/slow/object/const/not_on_interface.hhas.expectf index 75f14f0d385..f5fff65041a 100644 --- a/hphp/test/slow/object/const/not_on_interface.hhas.expectf +++ b/hphp/test/slow/object/const/not_on_interface.hhas.expectf @@ -1 +1 @@ -Fatal error: Assembler Error: line 17: interfaces, traits and enums may not be const in %s/not_on_interface.hhas on line -1 +Fatal error: Assembler Error: line 16: interfaces, traits and enums may not be const in %s/not_on_interface.hhas on line -1 diff --git a/hphp/test/slow/object/const/not_on_late_init_prop.hhas b/hphp/test/slow/object/const/not_on_late_init_prop.hhas index bc578be3f19..bd51d832826 100644 --- a/hphp/test/slow/object/const/not_on_late_init_prop.hhas +++ b/hphp/test/slow/object/const/not_on_late_init_prop.hhas @@ -1,7 +1,6 @@ .hh_file 1; .main (1,1) { - DefCls 0 Int 1 RetC } diff --git a/hphp/test/slow/object/const/not_on_late_init_prop.hhas.expectf b/hphp/test/slow/object/const/not_on_late_init_prop.hhas.expectf index 71fe4b537a5..1f89ec17fd8 100644 --- a/hphp/test/slow/object/const/not_on_late_init_prop.hhas.expectf +++ b/hphp/test/slow/object/const/not_on_late_init_prop.hhas.expectf @@ -1 +1 @@ -Fatal error: Assembler Error: line 18: const properties may not also be late init in %s/not_on_late_init_prop.hhas on line -1 +Fatal error: Assembler Error: line 17: const properties may not also be late init in %s/not_on_late_init_prop.hhas on line -1 diff --git a/hphp/test/slow/object/const/not_on_trait.hhas b/hphp/test/slow/object/const/not_on_trait.hhas index 9ae5b63d7ef..e4acbf5d3bb 100644 --- a/hphp/test/slow/object/const/not_on_trait.hhas +++ b/hphp/test/slow/object/const/not_on_trait.hhas @@ -1,7 +1,6 @@ .hh_file 1; .main (1,1) { - DefCls 0 Int 1 RetC } diff --git a/hphp/test/slow/object/const/not_on_trait.hhas.expectf b/hphp/test/slow/object/const/not_on_trait.hhas.expectf index b4e5aa23b70..031d7fbc33e 100644 --- a/hphp/test/slow/object/const/not_on_trait.hhas.expectf +++ b/hphp/test/slow/object/const/not_on_trait.hhas.expectf @@ -1 +1 @@ -Fatal error: Assembler Error: line 17: interfaces, traits and enums may not be const in %s/not_on_trait.hhas on line -1 +Fatal error: Assembler Error: line 16: interfaces, traits and enums may not be const in %s/not_on_trait.hhas on line -1 diff --git a/hphp/test/slow/object/const/static/not_on_static_late_init_prop.hhas b/hphp/test/slow/object/const/static/not_on_static_late_init_prop.hhas index ccc4c0869a8..be8850eb843 100644 --- a/hphp/test/slow/object/const/static/not_on_static_late_init_prop.hhas +++ b/hphp/test/slow/object/const/static/not_on_static_late_init_prop.hhas @@ -1,7 +1,6 @@ .hh_file 1; .main (1,1) { - DefCls 0 Int 1 RetC } diff --git a/hphp/test/slow/object/const/static/not_on_static_late_init_prop.hhas.expectf b/hphp/test/slow/object/const/static/not_on_static_late_init_prop.hhas.expectf index 4add13b8adf..c095a83d3c2 100644 --- a/hphp/test/slow/object/const/static/not_on_static_late_init_prop.hhas.expectf +++ b/hphp/test/slow/object/const/static/not_on_static_late_init_prop.hhas.expectf @@ -1 +1 @@ -Fatal error: Assembler Error: line 18: const properties may not also be late init in %s/not_on_static_late_init_prop.hhas on line -1 +Fatal error: Assembler Error: line 17: const properties may not also be late init in %s/not_on_static_late_init_prop.hhas on line -1 -- 2.11.4.GIT