Use fastcall calling convention

dstogov · dstogov · commit 6f6532d32b12 · 2019-01-15T11:14:33.000+03:00
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -2556,7 +2556,7 @@ static zend_always_inline zend_property_info *i_zend_check_ref_stdClass_assignab
 	return NULL;
 }
 
-ZEND_API zend_property_info *zend_check_ref_array_assignable(zend_reference *ref) {
+ZEND_API zend_property_info* ZEND_FASTCALL zend_check_ref_array_assignable(zend_reference *ref) {
 	return i_zend_check_ref_array_assignable(ref);
 }
 
@@ -2943,12 +2943,12 @@ static zend_always_inline zend_bool i_zend_verify_ref_assignable_zval(zend_refer
 	return 1;
 }
 
-ZEND_API zend_bool zend_verify_ref_assignable_zval(zend_reference *ref, zval *zv, zend_bool strict)
+ZEND_API zend_bool ZEND_FASTCALL zend_verify_ref_assignable_zval(zend_reference *ref, zval *zv, zend_bool strict)
 {
 	return i_zend_verify_ref_assignable_zval(ref, zv, strict);
 }
 
-ZEND_API zend_bool zend_verify_prop_assignable_by_ref(zend_property_info *prop_info, zval *orig_val, zend_bool strict) {
+ZEND_API zend_bool ZEND_FASTCALL zend_verify_prop_assignable_by_ref(zend_property_info *prop_info, zval *orig_val, zend_bool strict) {
 	zval *val = orig_val;
 	if (Z_ISREF_P(val) && ZEND_REF_HAS_TYPE_SOURCES(Z_REF_P(val))) {
 		int result;
@@ -2981,7 +2981,7 @@ ZEND_API zend_bool zend_verify_prop_assignable_by_ref(zend_property_info *prop_i
 	return 0;
 }
 
-ZEND_API void zend_ref_add_type_source(zend_property_info_source_list *source_list, zend_property_info *prop)
+ZEND_API void ZEND_FASTCALL zend_ref_add_type_source(zend_property_info_source_list *source_list, zend_property_info *prop)
 {
 	zend_property_info_list *list;
 	if (source_list->ptr == NULL) {
@@ -3004,7 +3004,7 @@ ZEND_API void zend_ref_add_type_source(zend_property_info_source_list *source_li
 	source_list->list = ZEND_PROPERTY_INFO_SOURCE_FROM_LIST(list);
 }
 
-ZEND_API void zend_ref_del_type_source(zend_property_info_source_list *source_list, zend_property_info *prop)
+ZEND_API void ZEND_FASTCALL zend_ref_del_type_source(zend_property_info_source_list *source_list, zend_property_info *prop)
 {
 	zend_property_info_list *list = ZEND_PROPERTY_INFO_SOURCE_TO_LIST(source_list->list);
 	zend_property_info **ptr, **end;
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
@@ -56,9 +56,9 @@ ZEND_API void ZEND_FASTCALL zend_check_internal_arg_type(zend_function *zf, uint
 ZEND_API int  ZEND_FASTCALL zend_check_arg_type(zend_function *zf, uint32_t arg_num, zval *arg, zval *default_value, void **cache_slot);
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_missing_arg_error(zend_execute_data *execute_data);
 
-ZEND_API zend_property_info *zend_check_ref_array_assignable(zend_reference *ref);
-ZEND_API zend_bool zend_verify_ref_assignable_zval(zend_reference *ref, zval *zv, zend_bool strict);
-ZEND_API zend_bool zend_verify_prop_assignable_by_ref(zend_property_info *prop_info, zval *orig_val, zend_bool strict);
+ZEND_API zend_property_info* ZEND_FASTCALL zend_check_ref_array_assignable(zend_reference *ref);
+ZEND_API zend_bool ZEND_FASTCALL zend_verify_ref_assignable_zval(zend_reference *ref, zval *zv, zend_bool strict);
+ZEND_API zend_bool ZEND_FASTCALL zend_verify_prop_assignable_by_ref(zend_property_info *prop_info, zval *orig_val, zend_bool strict);
 
 ZEND_API ZEND_COLD void zend_throw_ref_type_error_zval(zend_property_info *prop, zval *zv);
 ZEND_API ZEND_COLD void zend_throw_ref_type_error_type(zend_property_info *prop1, zend_property_info *prop2, zval *zv);
@@ -75,8 +75,8 @@ ZEND_API ZEND_COLD void zend_throw_ref_type_error_type(zend_property_info *prop1
 		: (ref)->sources.ptr)
 
 
-ZEND_API void zend_ref_add_type_source(zend_property_info_source_list *source_list, zend_property_info *prop);
-ZEND_API void zend_ref_del_type_source(zend_property_info_source_list *source_list, zend_property_info *prop);
+ZEND_API void ZEND_FASTCALL zend_ref_add_type_source(zend_property_info_source_list *source_list, zend_property_info *prop);
+ZEND_API void ZEND_FASTCALL zend_ref_del_type_source(zend_property_info_source_list *source_list, zend_property_info *prop);
 
 static zend_always_inline zval* zend_assign_to_variable(zval *variable_ptr, zval *value, zend_uchar value_type, zend_bool strict)
 {

Original file line number	Diff line number	Diff line change
`@@ -2556,7 +2556,7 @@ static zend_always_inline zend_property_info *i_zend_check_ref_stdClass_assignab`
`2556`	`2556`	`return NULL;`
`2557`	`2557`	`}`
`2558`	`2558`
`2559`		`-ZEND_API zend_property_info zend_check_ref_array_assignable(zend_reference ref) {`
	`2559`	`+ZEND_API zend_property_info* ZEND_FASTCALL zend_check_ref_array_assignable(zend_reference *ref) {`
`2560`	`2560`	`return i_zend_check_ref_array_assignable(ref);`
`2561`	`2561`	`}`
`2562`	`2562`
`@@ -2943,12 +2943,12 @@ static zend_always_inline zend_bool i_zend_verify_ref_assignable_zval(zend_refer`
`2943`	`2943`	`return 1;`
`2944`	`2944`	`}`
`2945`	`2945`
`2946`		`-ZEND_API zend_bool zend_verify_ref_assignable_zval(zend_reference ref, zval zv, zend_bool strict)`
	`2946`	`+ZEND_API zend_bool ZEND_FASTCALL zend_verify_ref_assignable_zval(zend_reference ref, zval zv, zend_bool strict)`
`2947`	`2947`	`{`
`2948`	`2948`	`return i_zend_verify_ref_assignable_zval(ref, zv, strict);`
`2949`	`2949`	`}`
`2950`	`2950`
`2951`		`-ZEND_API zend_bool zend_verify_prop_assignable_by_ref(zend_property_info prop_info, zval orig_val, zend_bool strict) {`
	`2951`	`+ZEND_API zend_bool ZEND_FASTCALL zend_verify_prop_assignable_by_ref(zend_property_info prop_info, zval orig_val, zend_bool strict) {`
`2952`	`2952`	`zval *val = orig_val;`
`2953`	`2953`	`if (Z_ISREF_P(val) && ZEND_REF_HAS_TYPE_SOURCES(Z_REF_P(val))) {`
`2954`	`2954`	`int result;`
`@@ -2981,7 +2981,7 @@ ZEND_API zend_bool zend_verify_prop_assignable_by_ref(zend_property_info *prop_i`
`2981`	`2981`	`return 0;`
`2982`	`2982`	`}`
`2983`	`2983`
`2984`		`-ZEND_API void zend_ref_add_type_source(zend_property_info_source_list source_list, zend_property_info prop)`
	`2984`	`+ZEND_API void ZEND_FASTCALL zend_ref_add_type_source(zend_property_info_source_list source_list, zend_property_info prop)`
`2985`	`2985`	`{`
`2986`	`2986`	`zend_property_info_list *list;`
`2987`	`2987`	`if (source_list->ptr == NULL) {`
`@@ -3004,7 +3004,7 @@ ZEND_API void zend_ref_add_type_source(zend_property_info_source_list *source_li`
`3004`	`3004`	`source_list->list = ZEND_PROPERTY_INFO_SOURCE_FROM_LIST(list);`
`3005`	`3005`	`}`
`3006`	`3006`
`3007`		`-ZEND_API void zend_ref_del_type_source(zend_property_info_source_list source_list, zend_property_info prop)`
	`3007`	`+ZEND_API void ZEND_FASTCALL zend_ref_del_type_source(zend_property_info_source_list source_list, zend_property_info prop)`
`3008`	`3008`	`{`
`3009`	`3009`	`zend_property_info_list *list = ZEND_PROPERTY_INFO_SOURCE_TO_LIST(source_list->list);`
`3010`	`3010`	`zend_property_info ptr, end;`