com php-src: Use CALL_INFO flag to check if we ne ed to destroy symbol_table. This saves one me mory load on most RETURN opcodes.: Zend/zend_
compile.h Zend/zend_execute_API.c Zend/zend_vm_ def.h Zend/zend_vm_execute.h
| From: | Dmitry Stogov | Date: | Thu, 31 Mar 2016 15:47:25 +0000 |
| Subject: | com php-src: Use CALL_INFO flag to check if we ne ed to destroy symbol_table. This saves one me mory load on most RETURN opcodes.: Zend/zend_ compile.h Zend/zend_execute_API.c Zend/zend_vm_ def.h Zend/zend_vm_execute.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-91572@lists.php.net to get a copy of this message | ||
Commit: fcbe1e8edf8614b098057d5c280f6bfbbe753faf
Author: Dmitry Stogov <dmitry@zend.com> Thu, 31 Mar 2016 18:47:25 +0300
Parents: f3c70f118c54dceea02e50de526c3138c2719384
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fcbe1e8edf8614b098057d5c280f6bfbbe753faf
Log:
Use CALL_INFO flag to check if we need to destroy symbol_table.
This saves one memory load on most RETURN opcodes.
Changed paths:
M Zend/zend_compile.h
M Zend/zend_execute_API.c
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index b3ba352..90c5c8b 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -468,7 +468,7 @@ struct _zend_execute_data {
#define ZEND_CALL_TOP (1 << 1)
#define ZEND_CALL_FREE_EXTRA_ARGS (1 << 2) /* equal to IS_TYPE_REFCOUNTED */
#define ZEND_CALL_CTOR (1 << 3)
-/* Unused flag (1 << 4) */
+#define ZEND_CALL_FREE_SYMBOL_TABLE (1 << 4)
#define ZEND_CALL_CLOSURE (1 << 5)
#define ZEND_CALL_RELEASE_THIS (1 << 6)
#define ZEND_CALL_ALLOCATED (1 << 7)
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index dc2ce46..c83761c 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1480,6 +1480,7 @@ ZEND_API zend_array *zend_rebuild_symbol_table(void) /* {{{ */
return ex->symbol_table;
}
+ ZEND_ADD_CALL_FLAG(ex, ZEND_CALL_FREE_SYMBOL_TABLE);
if (EG(symtable_cache_ptr) >= EG(symtable_cache)) {
/*printf("Cache hit! Reusing %x\n", symtable_cache[symtable_cache_ptr]);*/
symbol_table = ex->symbol_table = *(EG(symtable_cache_ptr)--);
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 2557509..b430395 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2521,7 +2521,7 @@ ZEND_VM_HELPER(zend_leave_helper, ANY, ANY)
zend_object *object;
i_free_compiled_variables(execute_data);
- if (UNEXPECTED(EX(symbol_table) != NULL)) {
+ if (UNEXPECTED(call_info & ZEND_CALL_FREE_SYMBOL_TABLE)) {
zend_clean_and_cache_symbol_table(EX(symbol_table));
}
zend_vm_stack_free_extra_args_ex(call_info, execute_data);
@@ -2579,7 +2579,7 @@ ZEND_VM_HELPER(zend_leave_helper, ANY, ANY)
} else {
if (ZEND_CALL_KIND_EX(call_info) == ZEND_CALL_TOP_FUNCTION) {
i_free_compiled_variables(execute_data);
- if (UNEXPECTED(EX(symbol_table) != NULL)) {
+ if (UNEXPECTED(call_info & ZEND_CALL_FREE_SYMBOL_TABLE)) {
zend_clean_and_cache_symbol_table(EX(symbol_table));
}
zend_vm_stack_free_extra_args_ex(call_info, execute_data);
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index ac7ac15..69df98c 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -478,7 +478,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_leave_helper_SPEC(ZEND_OPCODE_
zend_object *object;
i_free_compiled_variables(execute_data);
- if (UNEXPECTED(EX(symbol_table) != NULL)) {
+ if (UNEXPECTED(call_info & ZEND_CALL_FREE_SYMBOL_TABLE)) {
zend_clean_and_cache_symbol_table(EX(symbol_table));
}
zend_vm_stack_free_extra_args_ex(call_info, execute_data);
@@ -536,7 +536,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_leave_helper_SPEC(ZEND_OPCODE_
} else {
if (ZEND_CALL_KIND_EX(call_info) == ZEND_CALL_TOP_FUNCTION) {
i_free_compiled_variables(execute_data);
- if (UNEXPECTED(EX(symbol_table) != NULL)) {
+ if (UNEXPECTED(call_info & ZEND_CALL_FREE_SYMBOL_TABLE)) {
zend_clean_and_cache_symbol_table(EX(symbol_table));
}
zend_vm_stack_free_extra_args_ex(call_info, execute_data);