Changeset 875

Timestamp:

2012-03-31T20:32:21+02:00 (15 months ago)

Author:

moo

Message:

PHP_5_4: fix for ZEND_JMP_SET_VAR

Location:

trunk

Files:

• processor/processor.m4 (modified) (2 diffs)
• utils.c (modified) (1 diff)

trunk/processor/processor.m4

@@ -667 +667 @@
             case ZEND_JMP_SET:
 #endif
+#ifdef ZEND_JMP_SET_VAR
+            case ZEND_JMP_SET_VAR:
+#endif
                 assert(Z_OP(src->op2).jmp_addr >= processor->active_op_array_src->opcodes && Z_OP(src->op2).jmp_addr - processor->active_op_array_src->opcodes < processor->active_op_array_src->last);
                 Z_OP(dst->op2).jmp_addr = processor->active_op_array_dst->opcodes + (Z_OP(src->op2).jmp_addr - processor->active_op_array_src->opcodes);
@@ -758 +761 @@
 #ifdef ZEND_JMP_SET
                     case ZEND_JMP_SET:
+#endif
+#ifdef ZEND_JMP_SET_VAR
+            case ZEND_JMP_SET_VAR:
 #endif
                         Z_OP(opline->op2).jmp_addr = dst->opcodes + (Z_OP(opline->op2).jmp_addr - src->opcodes);

trunk/utils.c

@@ -175 +175 @@
 #ifdef ZEND_JMP_SET
             case ZEND_JMP_SET:
+#endif
+#ifdef ZEND_JMP_SET_VAR
+            case ZEND_JMP_SET_VAR:
 #endif
                 assert(Z_OP(opline->op2).jmp_addr >= op_array->opcodes && Z_OP(opline->op2).jmp_addr - op_array->opcodes < op_array->last);