- MFH

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 84df6b3f3d854e79c04736eb4a72407d4db69521..2d1591300bbe8853d01e197e2669ec7987766df5 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1309,36 +1309,27 @@ void zend_do_fetch_class_name(znode *result, znode *class_name_entry, znode *cla
        result->u.constant.value.str.len = length;
 }
 
-void zend_do_begin_class_member_function_call(TSRMLS_D)
+void zend_do_begin_class_member_function_call(znode *class_name, znode *method_name TSRMLS_DC)
 {
        unsigned char *ptr = NULL;
-       long fetch_const_op_number = get_next_op_number(CG(active_op_array));
-       zend_op *last_op = &CG(active_op_array)->opcodes[fetch_const_op_number-1];
-
-       if (last_op->opcode == ZEND_FETCH_CONSTANT) { /* regular method call */
-               /* a tmp var is leaked here */
-               last_op->opcode = ZEND_INIT_STATIC_METHOD_CALL;
-               if(last_op->op2.op_type == IS_CONST &&
-                  (sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) == Z_STRLEN(last_op->op2.u.constant) &&
-                  memcmp(Z_STRVAL(last_op->op2.u.constant), ZEND_CONSTRUCTOR_FUNC_NAME, sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) == 0) {
-                       zval_dtor(&last_op->op2.u.constant);
-                       SET_UNUSED(last_op->op2);
+       zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
+
+       opline->opcode = ZEND_INIT_STATIC_METHOD_CALL;
+       opline->op1 = *class_name;
+       opline->op2 = *method_name;
+
+       if (opline->op2.op_type == IS_CONST) {
+               if ((sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) == Z_STRLEN(opline->op2.u.constant) &&
+                   memcmp(Z_STRVAL(opline->op2.u.constant), ZEND_CONSTRUCTOR_FUNC_NAME, sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) == 0) {
+                       zval_dtor(&opline->op2.u.constant);
+                       SET_UNUSED(opline->op2);
                } else {
-                       zend_lowercase_znode_if_const(&last_op->op2);
+                       zend_str_tolower(opline->op2.u.constant.value.str.val, opline->op2.u.constant.value.str.len);
                }
-       } else if (last_op->opcode == ZEND_FETCH_R) { /* indirect method call */
-               zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
-
-               last_op->op2.u.EA.type = ZEND_FETCH_LOCAL;
-               opline->opcode = ZEND_INIT_STATIC_METHOD_CALL;
-               opline->op1 = last_op->op2;
-               opline->op2 = last_op->result;
-       } else {
-               zend_error(E_COMPILE_ERROR, "Internal compiler error - please report!");
        }
 
-
        zend_stack_push(&CG(function_call_stack), (void *) &ptr, sizeof(zend_function *));
+       zend_do_extended_fcall_begin(TSRMLS_C);
 }
 
 

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 937b17043fb95c2a4d5d77cdbdf85f445a32ba03..46e4af909a634f300aa8860773f48b53b3a6bc4e 100644 (file)
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -375,7 +375,7 @@ void zend_do_clone(znode *result, znode *expr TSRMLS_DC);
 void zend_do_begin_dynamic_function_call(znode *function_name TSRMLS_DC);
 void zend_do_fetch_class(znode *result, znode *class_name TSRMLS_DC);
 void zend_do_fetch_class_name(znode *result, znode *class_entry, znode *class_name TSRMLS_DC);
-void zend_do_begin_class_member_function_call(TSRMLS_D);
+void zend_do_begin_class_member_function_call(znode *class_name, znode *method_name TSRMLS_DC);
 void zend_do_end_function_call(znode *function_name, znode *result, znode *argument_list, int is_method, int is_dynamic_fcall TSRMLS_DC);
 void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC);
 void zend_do_handle_exception(TSRMLS_D);

diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 6d85f8be7a8745c1289742d1f41bc4888fb25fac..77dc1d0d6586e72415c4bee1ec7b0a11507d1b43 100644 (file)
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -614,12 +614,12 @@ function_call:
                T_STRING        '(' { $2.u.opline_num = zend_do_begin_function_call(&$1 TSRMLS_CC); }
                                function_call_parameter_list
                                ')' { zend_do_end_function_call(&$1, &$$, &$4, 0, $2.u.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); }
-       |       class_constant '(' { zend_do_begin_class_member_function_call(TSRMLS_C); zend_do_extended_fcall_begin(TSRMLS_C); } 
+       |       fully_qualified_class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING '(' { zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_C); } 
                        function_call_parameter_list 
-                       ')' { zend_do_end_function_call(NULL, &$$, &$4, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);}
-       |       static_member '(' { zend_do_end_variable_parse(BP_VAR_R, 0 TSRMLS_CC); zend_do_begin_class_member_function_call(TSRMLS_C); zend_do_extended_fcall_begin(TSRMLS_C); } 
+                       ')' { zend_do_end_function_call(NULL, &$$, &$6, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);}
+       | fully_qualified_class_name T_PAAMAYIM_NEKUDOTAYIM variable_without_objects '(' { zend_do_end_variable_parse(BP_VAR_R, 0 TSRMLS_CC); zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_C); } 
                        function_call_parameter_list 
-                       ')' { zend_do_end_function_call(NULL, &$$, &$4, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);}
+                       ')' { zend_do_end_function_call(NULL, &$$, &$6, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);}
        |       variable_without_objects  '(' { zend_do_end_variable_parse(BP_VAR_R, 0 TSRMLS_CC); zend_do_begin_dynamic_function_call(&$1 TSRMLS_CC); }
                        function_call_parameter_list ')'
                        { zend_do_end_function_call(&$1, &$$, &$4, 0, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);}