com php-src: Remove now unused function_filenames struct. : Zend/zend_compile.c Zend/zend_globals.h
| From: | Ferenc Kovacs | Date: | Sat, 09 Nov 2013 02:32:09 +0000 |
| Subject: | com php-src: Remove now unused function_filenames struct. : Zend/zend_compile.c Zend/zend_globals.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74279@lists.php.net to get a copy of this message | ||
Commit: 95675dfba9e417667e1e093084b27fd8f93d8724
Author: Adam Harvey <aharvey@php.net> Fri, 8 Nov 2013 21:32:09 -0500
Parents: 1ea01f55dbfbefd3b351f05c405e85ac778cdee7
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=95675dfba9e417667e1e093084b27fd8f93d8724
Log:
Remove now unused function_filenames struct.
Changed paths:
M Zend/zend_compile.c
M Zend/zend_globals.h
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 228fe6f..bd90477 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -206,7 +206,6 @@ void zend_init_compiler_data_structures(TSRMLS_D) /* {{{ */
CG(current_import) = NULL;
CG(current_import_function) = NULL;
CG(current_import_const) = NULL;
- zend_hash_init(&CG(function_filenames), 0, NULL, NULL, 0);
zend_hash_init(&CG(const_filenames), 0, NULL, NULL, 0);
init_compiler_declarables(TSRMLS_C);
zend_stack_init(&CG(context_stack));
@@ -246,7 +245,6 @@ void shutdown_compiler(TSRMLS_D) /* {{{ */
zend_stack_destroy(&CG(list_stack));
zend_hash_destroy(&CG(filenames_table));
zend_llist_destroy(&CG(open_files));
- zend_hash_destroy(&CG(function_filenames));
zend_hash_destroy(&CG(const_filenames));
zend_stack_destroy(&CG(context_stack));
}
@@ -1744,7 +1742,6 @@ void zend_do_begin_function_declaration(znode *function_token, znode
*function_n
CALCULATE_LITERAL_HASH(opline->op2.constant);
opline->extended_value = ZEND_DECLARE_FUNCTION;
zend_hash_quick_update(CG(function_table), Z_STRVAL(key), Z_STRLEN(key),
Z_HASH_P(&CONSTANT(opline->op1.constant)), &op_array, sizeof(zend_op_array), (void **)
&CG(active_op_array));
- zend_hash_add(&CG(function_filenames), lcname, strlen(lcname)+1, CG(compiled_filename),
strlen(CG(compiled_filename))+1, NULL);
zend_stack_push(&CG(context_stack), (void *) &CG(context), sizeof(CG(context)));
zend_init_compiler_context(TSRMLS_C);
str_efree(lcname);
diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
index 19c29c6..27d471f 100644
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@ -136,7 +136,6 @@ struct _zend_compiler_globals {
zend_bool in_namespace;
zend_bool has_bracketed_namespaces;
- HashTable function_filenames;
HashTable const_filenames;
zend_compiler_context context;