ntroduce infrastructure for supplying information about arguments,

including:

- Whether or not to pass by ref (replaces the old arg_types, with arg_info)
- Argument name (for future use, maybe introspection)
- Class/Interface name (for type hints)
- If a class/interface name is available, whether to allow a null instance

Both user and builtin functions share the same data structures.

To declare a builtin function that expects its first arg to be an instance
of class 'Person', its second argument as a regular arg, and its third by
reference, use:

ZEND_BEGIN_ARG_INFO(my_func_arg_info, 0)
    ZEND_ARG_OBJ_INFO(0, someone, Person, 1)
    ZEND_ARG_PASS_INFO(0)
    ZEND_ARG_PASS_INFO(1)
ZEND_END_ARG_INFO();

and use my_func_arg_info as the arg_info parameter to the ZEND_FE() family
of macros.

The first arg to each ZEND_ARG_*() macro is whether or not to pass by ref.

The boolean arg to ZEND_BEGIN_ARG_INFO() tells the engine whether to treat
the arguments for which there's no explicit information as pass by reference
or not.
The boolean argument to ZEND_ARG_OBJ_INFO() (4th arg) is whether or not to allownull values.

1 files changed, 10 insertions, 4 deletions

diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index ea3732f56e..6afead0c7f 100644
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -77,7 +77,8 @@ void init_op_array(zend_op_array *op_array, zend_uchar type, int initial_ops_siz
     op_array->doc_comment = NULL;
     op_array->doc_comment_len = 0;
 
-	op_array->arg_types = NULL;
+	op_array->arg_info = NULL;
+	op_array->num_args = 0;
 
 	op_array->scope = NULL;
 
@@ -190,6 +191,7 @@ ZEND_API void destroy_op_array(zend_op_array *op_array TSRMLS_DC)
 {
 	zend_op *opline = op_array->opcodes;
 	zend_op *end = op_array->opcodes+op_array->last;
+	zend_uint i;
 
 	if (op_array->static_variables) {
 		zend_hash_destroy(op_array->static_variables);
@@ -224,15 +226,19 @@ ZEND_API void destroy_op_array(zend_op_array *op_array TSRMLS_DC)
     if (op_array->doc_comment) {
         efree(op_array->doc_comment);
     }
-	if (op_array->arg_types) {
-		efree(op_array->arg_types);
-	}
 	if (op_array->brk_cont_array) {
 		efree(op_array->brk_cont_array);
 	}
 	if (op_array->done_pass_two) {
 		zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_op_array_dtor_handler, op_array TSRMLS_CC);
 	}
+	if (op_array->arg_info) {
+		for (i=0; i<op_array->num_args; i++) {
+			efree(op_array->arg_info[i].name);
+			efree(op_array->arg_info[i].class_name);
+		}
+		efree(op_array->arg_info);
+	}
 }