Skip to content

Commit

Permalink
Merge pull request #1 from pierrejoye/master
Browse files Browse the repository at this point in the history
Fix build
  • Loading branch information
Clint Priest committed Oct 16, 2012
2 parents ec72ee6 + a345eee commit 4b8ea6a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Zend/zend_compile.c
Original file line number Diff line number Diff line change
Expand Up @@ -7851,13 +7851,13 @@ zend_accessor_info *zend_get_accessor_info_from_function(zend_function *func TSR

zend_accessor_info *zend_get_accessor_from_init_static_method_call(zend_op_array *op_array, zend_op *opline, const char **context_name_out TSRMLS_DC) /* {{{ */
{
zval *op1zv=NULL, *op2zv=NULL;

/* Unsure if we can rely on .zv to be resolved here already, normally resolved in pass_two on about line 597 */
if(!opline || !opline->opcode == ZEND_INIT_STATIC_METHOD_CALL) {
return NULL;
}

zval *op1zv=NULL, *op2zv=NULL;

if (opline->op1_type == IS_CONST) {
if(opline->op2.constant < op_array->last_literal) { /* constant may already be translated to zv by pass_two() */
op1zv = &op_array->literals[opline->op1.constant].constant;
Expand Down

0 comments on commit 4b8ea6a

Please sign in to comment.