Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

Remove dead code from ZEND_THROW 

The IS_CONST case always throws an E_ERROR two lines above that,
so no need to handle it further.
pull/678/head
Nikita Popov 12 years ago
parent
767b5eea7e
commit
80f8d20b72
2 changed files with 5 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      Zend/zend_vm_def.h
  2. 24
      Zend/zend_vm_execute.h

6
Zend/zend_vm_def.h
View File

@ -2913,7 +2913,6 @@ ZEND_VM_HANDLER(108, ZEND_THROW, CONST|TMP|VAR|CV, ANY)
{
USE_OPLINE
zval *value;
zval exception;
zend_free_op free_op1;
SAVE_OPLINE();
@ -2927,10 +2926,7 @@ ZEND_VM_HANDLER(108, ZEND_THROW, CONST|TMP|VAR|CV, ANY)
}
zend_exception_save(TSRMLS_C);
if (OP1_TYPE == IS_CONST) {
ZVAL_DUP(&exception, value);
value = &exception;
} else if (OP1_TYPE != IS_TMP_VAR) {
if (OP1_TYPE != IS_TMP_VAR) {
if (Z_REFCOUNTED_P(value)) Z_ADDREF_P(value);
}

24
Zend/zend_vm_execute.h
View File

@ -2663,7 +2663,6 @@ static int ZEND_FASTCALL ZEND_THROW_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
{
USE_OPLINE
zval *value;
zval exception;
SAVE_OPLINE();
@ -2677,10 +2676,7 @@ static int ZEND_FASTCALL ZEND_THROW_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
}
zend_exception_save(TSRMLS_C);
if (IS_CONST == IS_CONST) {
ZVAL_DUP(&exception, value);
value = &exception;
} else if (IS_CONST != IS_TMP_VAR) {
if (IS_CONST != IS_TMP_VAR) {
if (Z_REFCOUNTED_P(value)) Z_ADDREF_P(value);
}
@ -7774,7 +7770,6 @@ static int ZEND_FASTCALL ZEND_THROW_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
USE_OPLINE
zval *value;
zval exception;
zend_free_op free_op1;
SAVE_OPLINE();
@ -7788,10 +7783,7 @@ static int ZEND_FASTCALL ZEND_THROW_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
}
zend_exception_save(TSRMLS_C);
if (IS_TMP_VAR == IS_CONST) {
ZVAL_DUP(&exception, value);
value = &exception;
} else if (IS_TMP_VAR != IS_TMP_VAR) {
if (IS_TMP_VAR != IS_TMP_VAR) {
if (Z_REFCOUNTED_P(value)) Z_ADDREF_P(value);
}
@ -12842,7 +12834,6 @@ static int ZEND_FASTCALL ZEND_THROW_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
USE_OPLINE
zval *value;
zval exception;
zend_free_op free_op1;
SAVE_OPLINE();
@ -12856,10 +12847,7 @@ static int ZEND_FASTCALL ZEND_THROW_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
}
zend_exception_save(TSRMLS_C);
if (IS_VAR == IS_CONST) {
ZVAL_DUP(&exception, value);
value = &exception;
} else if (IS_VAR != IS_TMP_VAR) {
if (IS_VAR != IS_TMP_VAR) {
if (Z_REFCOUNTED_P(value)) Z_ADDREF_P(value);
}
@ -29905,7 +29893,6 @@ static int ZEND_FASTCALL ZEND_THROW_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
USE_OPLINE
zval *value;
zval exception;
SAVE_OPLINE();
@ -29919,10 +29906,7 @@ static int ZEND_FASTCALL ZEND_THROW_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
}
zend_exception_save(TSRMLS_C);
if (IS_CV == IS_CONST) {
ZVAL_DUP(&exception, value);
value = &exception;
} else if (IS_CV != IS_TMP_VAR) {
if (IS_CV != IS_TMP_VAR) {
if (Z_REFCOUNTED_P(value)) Z_ADDREF_P(value);
}

Write Preview
Loading…
Cancel
Save