Fixed edge cases in ZEND_ASSIGN_OP+ASSIGN_DIM and replaced specialize…

…d helpers with single one
php · Apr 1, 2019 · 4e1d545 · 4e1d545
1 parent 8bf2de0
commit 4e1d545
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 669 deletions.
diff --git a/ext/opcache/jit/zend_jit_disasm_x86.c b/ext/opcache/jit/zend_jit_disasm_x86.c
@@ -416,17 +416,7 @@ static int zend_jit_disasm_init(void)
 	REGISTER_HELPER(zend_jit_fetch_dim_rw_helper);
 	REGISTER_HELPER(zend_jit_fetch_dim_w_helper);
 	REGISTER_HELPER(zend_jit_assign_dim_helper);
-	REGISTER_HELPER(zend_jit_assign_dim_add_helper);
-	REGISTER_HELPER(zend_jit_assign_dim_sub_helper);
-	REGISTER_HELPER(zend_jit_assign_dim_mul_helper);
-	REGISTER_HELPER(zend_jit_assign_dim_div_helper);
-	REGISTER_HELPER(zend_jit_assign_dim_bw_or_helper);
-	REGISTER_HELPER(zend_jit_assign_dim_bw_and_helper);
-	REGISTER_HELPER(zend_jit_assign_dim_bw_xor_helper);
-	REGISTER_HELPER(zend_jit_assign_dim_sl_helper);
-	REGISTER_HELPER(zend_jit_assign_dim_sr_helper);
-	REGISTER_HELPER(zend_jit_assign_dim_mod_helper);
-	REGISTER_HELPER(zend_jit_assign_dim_concat_helper);
+	REGISTER_HELPER(zend_jit_assign_dim_op_helper);
 	REGISTER_HELPER(zend_jit_fast_assign_concat_helper);
 	REGISTER_HELPER(zend_jit_fast_concat_helper);
 	REGISTER_HELPER(zend_jit_isset_dim_helper);