felipe Thu, 22 Apr 2010 13:28:53 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=298319
Log:
- Removed unused variables
Changed paths:
U php/php-src/trunk/Zend/zend_vm_def.h
U php/php-src/trunk/Zend/zend_vm_execute.h
Modified: php/php-src/trunk/Zend/zend_vm_def.h
===================================================================
--- php/php-src/trunk/Zend/zend_vm_def.h 2010-04-22 13:03:44 UTC (rev
298318)
+++ php/php-src/trunk/Zend/zend_vm_def.h 2010-04-22 13:28:53 UTC (rev
298319)
@@ -339,7 +339,6 @@
zval *object;
zval *property = GET_OP2_ZVAL_PTR(BP_VAR_R);
zval *value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1,
EX_Ts(), &free_op_data1, BP_VAR_R);
- znode_op *result = &opline->result;
int have_get_ptr = 0;
if (OP1_TYPE == IS_VAR && UNEXPECTED(object_ptr == NULL)) {
@@ -4500,8 +4499,6 @@
ZEND_VM_HANDLER(101, ZEND_EXT_STMT, ANY, ANY)
{
- USE_OPLINE
-
SAVE_OPLINE();
if (!EG(no_extensions)) {
zend_llist_apply_with_argument(&zend_extensions,
(llist_apply_with_arg_func_t) zend_extension_statement_handler, EX(op_array)
TSRMLS_CC);
@@ -4512,8 +4509,6 @@
ZEND_VM_HANDLER(102, ZEND_EXT_FCALL_BEGIN, ANY, ANY)
{
- USE_OPLINE
-
SAVE_OPLINE();
if (!EG(no_extensions)) {
zend_llist_apply_with_argument(&zend_extensions,
(llist_apply_with_arg_func_t) zend_extension_fcall_begin_handler, EX(op_array)
TSRMLS_CC);
Modified: php/php-src/trunk/Zend/zend_vm_execute.h
===================================================================
--- php/php-src/trunk/Zend/zend_vm_execute.h 2010-04-22 13:03:44 UTC (rev
298318)
+++ php/php-src/trunk/Zend/zend_vm_execute.h 2010-04-22 13:28:53 UTC (rev
298319)
@@ -583,8 +583,6 @@
static int ZEND_FASTCALL ZEND_EXT_STMT_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
- USE_OPLINE
-
SAVE_OPLINE();
if (!EG(no_extensions)) {
zend_llist_apply_with_argument(&zend_extensions,
(llist_apply_with_arg_func_t) zend_extension_statement_handler, EX(op_array)
TSRMLS_CC);
@@ -595,8 +593,6 @@
static int ZEND_FASTCALL
ZEND_EXT_FCALL_BEGIN_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
- USE_OPLINE
-
SAVE_OPLINE();
if (!EG(no_extensions)) {
zend_llist_apply_with_argument(&zend_extensions,
(llist_apply_with_arg_func_t) zend_extension_fcall_begin_handler, EX(op_array)
TSRMLS_CC);
@@ -10245,7 +10241,6 @@
zval *object;
zval *property = opline->op2.zv;
zval *value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1,
EX_Ts(), &free_op_data1, BP_VAR_R);
- znode_op *result = &opline->result;
int have_get_ptr = 0;
if (IS_VAR == IS_VAR && UNEXPECTED(object_ptr == NULL)) {
@@ -12225,7 +12220,6 @@
zval *object;
zval *property = _get_zval_ptr_tmp(opline->op2.var, EX_Ts(), &free_op2
TSRMLS_CC);
zval *value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1,
EX_Ts(), &free_op_data1, BP_VAR_R);
- znode_op *result = &opline->result;
int have_get_ptr = 0;
if (IS_VAR == IS_VAR && UNEXPECTED(object_ptr == NULL)) {
@@ -14150,7 +14144,6 @@
zval *object;
zval *property = _get_zval_ptr_var(opline->op2.var, EX_Ts(), &free_op2
TSRMLS_CC);
zval *value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1,
EX_Ts(), &free_op_data1, BP_VAR_R);
- znode_op *result = &opline->result;
int have_get_ptr = 0;
if (IS_VAR == IS_VAR && UNEXPECTED(object_ptr == NULL)) {
@@ -15850,7 +15843,6 @@
zval *object;
zval *property = NULL;
zval *value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1,
EX_Ts(), &free_op_data1, BP_VAR_R);
- znode_op *result = &opline->result;
int have_get_ptr = 0;
if (IS_VAR == IS_VAR && UNEXPECTED(object_ptr == NULL)) {
@@ -16751,7 +16743,6 @@
zval *object;
zval *property = _get_zval_ptr_cv_BP_VAR_R(EX_CVs(), opline->op2.var
TSRMLS_CC);
zval *value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1,
EX_Ts(), &free_op_data1, BP_VAR_R);
- znode_op *result = &opline->result;
int have_get_ptr = 0;
if (IS_VAR == IS_VAR && UNEXPECTED(object_ptr == NULL)) {
@@ -18531,7 +18522,6 @@
zval *object;
zval *property = opline->op2.zv;
zval *value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1,
EX_Ts(), &free_op_data1, BP_VAR_R);
- znode_op *result = &opline->result;
int have_get_ptr = 0;
if (IS_UNUSED == IS_VAR && UNEXPECTED(object_ptr == NULL)) {
@@ -19748,7 +19738,6 @@
zval *object;
zval *property = _get_zval_ptr_tmp(opline->op2.var, EX_Ts(), &free_op2
TSRMLS_CC);
zval *value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1,
EX_Ts(), &free_op_data1, BP_VAR_R);
- znode_op *result = &opline->result;
int have_get_ptr = 0;
if (IS_UNUSED == IS_VAR && UNEXPECTED(object_ptr == NULL)) {
@@ -20907,7 +20896,6 @@
zval *object;
zval *property = _get_zval_ptr_var(opline->op2.var, EX_Ts(), &free_op2
TSRMLS_CC);
zval *value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1,
EX_Ts(), &free_op_data1, BP_VAR_R);
- znode_op *result = &opline->result;
int have_get_ptr = 0;
if (IS_UNUSED == IS_VAR && UNEXPECTED(object_ptr == NULL)) {
@@ -22066,7 +22054,6 @@
zval *object;
zval *property = NULL;
zval *value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1,
EX_Ts(), &free_op_data1, BP_VAR_R);
- znode_op *result = &opline->result;
int have_get_ptr = 0;
if (IS_UNUSED == IS_VAR && UNEXPECTED(object_ptr == NULL)) {
@@ -22336,7 +22323,6 @@
zval *object;
zval *property = _get_zval_ptr_cv_BP_VAR_R(EX_CVs(), opline->op2.var
TSRMLS_CC);
zval *value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1,
EX_Ts(), &free_op_data1, BP_VAR_R);
- znode_op *result = &opline->result;
int have_get_ptr = 0;
if (IS_UNUSED == IS_VAR && UNEXPECTED(object_ptr == NULL)) {
@@ -25226,7 +25212,6 @@
zval *object;
zval *property = opline->op2.zv;
zval *value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1,
EX_Ts(), &free_op_data1, BP_VAR_R);
- znode_op *result = &opline->result;
int have_get_ptr = 0;
if (IS_CV == IS_VAR && UNEXPECTED(object_ptr == NULL)) {
@@ -27035,7 +27020,6 @@
zval *object;
zval *property = _get_zval_ptr_tmp(opline->op2.var, EX_Ts(), &free_op2
TSRMLS_CC);
zval *value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1,
EX_Ts(), &free_op_data1, BP_VAR_R);
- znode_op *result = &opline->result;
int have_get_ptr = 0;
if (IS_CV == IS_VAR && UNEXPECTED(object_ptr == NULL)) {
@@ -28848,7 +28832,6 @@
zval *object;
zval *property = _get_zval_ptr_var(opline->op2.var, EX_Ts(), &free_op2
TSRMLS_CC);
zval *value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1,
EX_Ts(), &free_op_data1, BP_VAR_R);
- znode_op *result = &opline->result;
int have_get_ptr = 0;
if (IS_CV == IS_VAR && UNEXPECTED(object_ptr == NULL)) {
@@ -30435,7 +30418,6 @@
zval *object;
zval *property = NULL;
zval *value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1,
EX_Ts(), &free_op_data1, BP_VAR_R);
- znode_op *result = &opline->result;
int have_get_ptr = 0;
if (IS_CV == IS_VAR && UNEXPECTED(object_ptr == NULL)) {
@@ -31235,7 +31217,6 @@
zval *object;
zval *property = _get_zval_ptr_cv_BP_VAR_R(EX_CVs(), opline->op2.var
TSRMLS_CC);
zval *value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1,
EX_Ts(), &free_op_data1, BP_VAR_R);
- znode_op *result = &opline->result;
int have_get_ptr = 0;
if (IS_CV == IS_VAR && UNEXPECTED(object_ptr == NULL)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
