Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed double ZEND_TICKS opcode generation for declare()

Conflicts:
	Zend/zend_compile.c

2 files changed, 23 insertions, 0 deletions

diff --git a/Zend/tests/declare_005.phpt b/Zend/tests/declare_005.phpt
new file mode 100644
index 0000000000..8f5adcfbd2
--- /dev/null
+++ b/Zend/tests/declare_005.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Testing declare statement with ticks
+--SKIPIF--
+--FILE--
+<?php
+register_tick_function(function () { echo "tick\n"; });
+function foo() { }
+
+declare(ticks=1) {
+
+$statement;
+foo();
+
+}
+?>
+--EXPECTF--
+tick
+tick
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index e655e8480c..3ae9567a94 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1881,6 +1881,11 @@ static zend_op *zend_emit_op_tmp(znode *result, zend_uchar opcode, znode *op1, z
 
 static void zend_emit_tick(void) /* {{{ */
 {
+	/* This prevents a double TICK generated by the parser statement of "declare()" */
+	if (CG(active_op_array)->last && CG(active_op_array)->opcodes[CG(active_op_array)->last - 1].opcode == ZEND_TICKS) {
+		return;
+	}
+	
 	zend_op *opline = get_next_op(CG(active_op_array));
 
 	opline->opcode = ZEND_TICKS;