JMPZ/JMPNZ/JMPZNZ optimization

2 files changed, 451 insertions, 447 deletions

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 739906f6c8..6d3c7719e3 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2089,9 +2089,6 @@ ZEND_VM_HANDLER(42, ZEND_JMP, ANY, ANY)
 {
 	USE_OPLINE
 
-#if DEBUG_ZEND>=2
-	printf("Jumping to %d\n", opline->op1.opline_num);
-#endif
 	ZEND_VM_SET_OPCODE(opline->op1.jmp_addr);
 	ZEND_VM_CONTINUE();
 }
@@ -2101,29 +2098,30 @@ ZEND_VM_HANDLER(43, ZEND_JMPZ, CONST|TMP|VAR|CV, ANY)
 	USE_OPLINE
 	zend_free_op free_op1;
 	zval *val;
-	int ret;
 
 	SAVE_OPLINE();
 	val = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);
 
-	if (OP1_TYPE == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		ret = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		ret = i_zend_is_true(val TSRMLS_CC);
-		FREE_OP1();
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (OP1_TYPE == IS_TMP_VAR) {
+		if (Z_TYPE_P(val) == IS_TRUE) {			
+			ZEND_VM_SET_OPCODE(opline + 1);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	if (!ret) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE();
-	}
 
-	ZEND_VM_NEXT_OPCODE();
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		opline++;
+	} else {
+		opline = opline->op2.jmp_addr;
+	}
+	FREE_OP1();
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
+	}
+	ZEND_VM_JMP(opline);
 }
 
 ZEND_VM_HANDLER(44, ZEND_JMPNZ, CONST|TMP|VAR|CV, ANY)
@@ -2131,29 +2129,30 @@ ZEND_VM_HANDLER(44, ZEND_JMPNZ, CONST|TMP|VAR|CV, ANY)
 	USE_OPLINE
 	zend_free_op free_op1;
 	zval *val;
-	int ret;
 
 	SAVE_OPLINE();
 	val = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);
 
-	if (OP1_TYPE == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		ret = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		ret = i_zend_is_true(val TSRMLS_CC);
-		FREE_OP1();
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (OP1_TYPE == IS_TMP_VAR) {
+		if (Z_TYPE_P(val) == IS_TRUE) {
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZEND_VM_SET_OPCODE(opline + 1);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	if (ret) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE();
-	}
 
-	ZEND_VM_NEXT_OPCODE();
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		opline = opline->op2.jmp_addr;
+	} else {
+		opline++;
+	}
+	FREE_OP1();
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
+	}
+	ZEND_VM_JMP(opline);
 }
 
 ZEND_VM_HANDLER(45, ZEND_JMPZNZ, CONST|TMP|VAR|CV, ANY)
@@ -2161,33 +2160,30 @@ ZEND_VM_HANDLER(45, ZEND_JMPZNZ, CONST|TMP|VAR|CV, ANY)
 	USE_OPLINE
 	zend_free_op free_op1;
 	zval *val;
-	int retval;
 
 	SAVE_OPLINE();
 	val = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);
 
-	if (OP1_TYPE == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		retval = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		retval = i_zend_is_true(val TSRMLS_CC);
-		FREE_OP1();
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (OP1_TYPE == IS_TMP_VAR) {
+		if (EXPECTED(Z_TYPE_P(val) == IS_TRUE)) {
+			ZEND_VM_SET_RELATIVE_OPCODE(opline, opline->extended_value);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	if (EXPECTED(retval != 0)) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp on true to %d\n", opline->extended_value);
-#endif
-		ZEND_VM_SET_RELATIVE_OPCODE(opline, opline->extended_value);
-		ZEND_VM_CONTINUE(); /* CHECK_ME */
+
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		opline = (zend_op*)(((char*)opline) + opline->extended_value);
 	} else {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp on false to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE(); /* CHECK_ME */
+		opline = opline->op2.jmp_addr;
 	}
+	FREE_OP1();
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
+	}
+	ZEND_VM_JMP(opline);
 }
 
 ZEND_VM_HANDLER(46, ZEND_JMPZ_EX, CONST|TMP|VAR|CV, ANY)
@@ -2195,29 +2191,34 @@ ZEND_VM_HANDLER(46, ZEND_JMPZ_EX, CONST|TMP|VAR|CV, ANY)
 	USE_OPLINE
 	zend_free_op free_op1;
 	zval *val;
-	int retval;
 
 	SAVE_OPLINE();
 	val = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);
 
-	if (OP1_TYPE == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		retval = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		retval = i_zend_is_true(val TSRMLS_CC);
-		FREE_OP1();
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (OP1_TYPE == IS_TMP_VAR) {
+		if (Z_TYPE_P(val) == IS_TRUE) {
+			ZVAL_TRUE(EX_VAR(opline->result.var));
+			ZEND_VM_SET_OPCODE(opline + 1);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZVAL_FALSE(EX_VAR(opline->result.var));
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	ZVAL_BOOL(EX_VAR(opline->result.var), retval);
-	if (!retval) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE();
+
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		ZVAL_TRUE(EX_VAR(opline->result.var));
+		opline++;
+	} else {
+		ZVAL_FALSE(EX_VAR(opline->result.var));
+		opline = opline->op2.jmp_addr;
 	}
-	ZEND_VM_NEXT_OPCODE();
+	FREE_OP1();
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
+	}
+	ZEND_VM_JMP(opline);
 }
 
 ZEND_VM_HANDLER(47, ZEND_JMPNZ_EX, CONST|TMP|VAR|CV, ANY)
@@ -2225,29 +2226,33 @@ ZEND_VM_HANDLER(47, ZEND_JMPNZ_EX, CONST|TMP|VAR|CV, ANY)
 	USE_OPLINE
 	zend_free_op free_op1;
 	zval *val;
-	int retval;
 
 	SAVE_OPLINE();
 	val = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);
 
-	if (OP1_TYPE == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		retval = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		retval = i_zend_is_true(val TSRMLS_CC);
-		FREE_OP1();
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (OP1_TYPE == IS_TMP_VAR) {
+		if (Z_TYPE_P(val) == IS_TRUE) {
+			ZVAL_TRUE(EX_VAR(opline->result.var));
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZVAL_FALSE(EX_VAR(opline->result.var));
+			ZEND_VM_SET_OPCODE(opline + 1);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	ZVAL_BOOL(EX_VAR(opline->result.var), retval);
-	if (retval) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE();
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		ZVAL_TRUE(EX_VAR(opline->result.var));
+		opline = opline->op2.jmp_addr;
+	} else {
+		ZVAL_FALSE(EX_VAR(opline->result.var));
+		opline++;
 	}
-	ZEND_VM_NEXT_OPCODE();
+	FREE_OP1();
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
+	}
+	ZEND_VM_JMP(opline);
 }
 
 ZEND_VM_HANDLER(70, ZEND_FREE, TMP|VAR, ANY)
@@ -4820,9 +4825,6 @@ ZEND_VM_HANDLER(152, ZEND_JMP_SET, CONST|TMP|VAR|CV, ANY)
 			zval_opt_copy_ctor(EX_VAR(opline->result.var));
 		}
 		FREE_OP1_IF_VAR();
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
 		ZEND_VM_JMP(opline->op2.jmp_addr);
 	}
 
@@ -4850,9 +4852,6 @@ ZEND_VM_HANDLER(158, ZEND_JMP_SET_VAR, CONST|TMP|VAR|CV, ANY)
 			}
 		}
 		FREE_OP1_IF_VAR();
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
 		ZEND_VM_JMP(opline->op2.jmp_addr);
 	}
 
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index ad7d4511d7..7241cf49c7 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -699,9 +699,6 @@ static int ZEND_FASTCALL  ZEND_JMP_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
 	USE_OPLINE
 
-#if DEBUG_ZEND>=2
-	printf("Jumping to %d\n", opline->op1.opline_num);
-#endif
 	ZEND_VM_SET_OPCODE(opline->op1.jmp_addr);
 	ZEND_VM_CONTINUE();
 }
@@ -2386,29 +2383,30 @@ static int ZEND_FASTCALL  ZEND_JMPZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 	USE_OPLINE
 
 	zval *val;
-	int ret;
 
 	SAVE_OPLINE();
 	val = opline->op1.zv;
 
-	if (IS_CONST == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		ret = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		ret = i_zend_is_true(val TSRMLS_CC);
-
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (IS_CONST == IS_TMP_VAR) {
+		if (Z_TYPE_P(val) == IS_TRUE) {
+			ZEND_VM_SET_OPCODE(opline + 1);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	if (!ret) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE();
+
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		opline++;
+	} else {
+		opline = opline->op2.jmp_addr;
 	}
 
-	ZEND_VM_NEXT_OPCODE();
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
+	}
+	ZEND_VM_JMP(opline);
 }
 
 static int ZEND_FASTCALL  ZEND_JMPNZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -2416,29 +2414,30 @@ static int ZEND_FASTCALL  ZEND_JMPNZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 	USE_OPLINE
 
 	zval *val;
-	int ret;
 
 	SAVE_OPLINE();
 	val = opline->op1.zv;
 
-	if (IS_CONST == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		ret = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		ret = i_zend_is_true(val TSRMLS_CC);
-
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (IS_CONST == IS_TMP_VAR) {
+		if (Z_TYPE_P(val) == IS_TRUE) {
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZEND_VM_SET_OPCODE(opline + 1);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	if (ret) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE();
+
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		opline = opline->op2.jmp_addr;
+	} else {
+		opline++;
 	}
 
-	ZEND_VM_NEXT_OPCODE();
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
+	}
+	ZEND_VM_JMP(opline);
 }
 
 static int ZEND_FASTCALL  ZEND_JMPZNZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -2446,33 +2445,30 @@ static int ZEND_FASTCALL  ZEND_JMPZNZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
 	USE_OPLINE
 
 	zval *val;
-	int retval;
 
 	SAVE_OPLINE();
 	val = opline->op1.zv;
 
-	if (IS_CONST == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		retval = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		retval = i_zend_is_true(val TSRMLS_CC);
-
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (IS_CONST == IS_TMP_VAR) {
+		if (EXPECTED(Z_TYPE_P(val) == IS_TRUE)) {
+			ZEND_VM_SET_RELATIVE_OPCODE(opline, opline->extended_value);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	if (EXPECTED(retval != 0)) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp on true to %d\n", opline->extended_value);
-#endif
-		ZEND_VM_SET_RELATIVE_OPCODE(opline, opline->extended_value);
-		ZEND_VM_CONTINUE(); /* CHECK_ME */
+
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		opline = (zend_op*)(((char*)opline) + opline->extended_value);
 	} else {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp on false to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE(); /* CHECK_ME */
+		opline = opline->op2.jmp_addr;
+	}
+
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
 	}
+	ZEND_VM_JMP(opline);
 }
 
 static int ZEND_FASTCALL  ZEND_JMPZ_EX_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -2480,29 +2476,34 @@ static int ZEND_FASTCALL  ZEND_JMPZ_EX_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_AR
 	USE_OPLINE
 
 	zval *val;
-	int retval;
 
 	SAVE_OPLINE();
 	val = opline->op1.zv;
 
-	if (IS_CONST == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		retval = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		retval = i_zend_is_true(val TSRMLS_CC);
-
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (IS_CONST == IS_TMP_VAR) {
+		if (Z_TYPE_P(val) == IS_TRUE) {
+			ZVAL_TRUE(EX_VAR(opline->result.var));
+			ZEND_VM_SET_OPCODE(opline + 1);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZVAL_FALSE(EX_VAR(opline->result.var));
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	ZVAL_BOOL(EX_VAR(opline->result.var), retval);
-	if (!retval) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE();
+
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		ZVAL_TRUE(EX_VAR(opline->result.var));
+		opline++;
+	} else {
+		ZVAL_FALSE(EX_VAR(opline->result.var));
+		opline = opline->op2.jmp_addr;
 	}
-	ZEND_VM_NEXT_OPCODE();
+
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
+	}
+	ZEND_VM_JMP(opline);
 }
 
 static int ZEND_FASTCALL  ZEND_JMPNZ_EX_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -2510,29 +2511,33 @@ static int ZEND_FASTCALL  ZEND_JMPNZ_EX_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
 	USE_OPLINE
 
 	zval *val;
-	int retval;
 
 	SAVE_OPLINE();
 	val = opline->op1.zv;
 
-	if (IS_CONST == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		retval = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		retval = i_zend_is_true(val TSRMLS_CC);
-
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (IS_CONST == IS_TMP_VAR) {
+		if (Z_TYPE_P(val) == IS_TRUE) {
+			ZVAL_TRUE(EX_VAR(opline->result.var));
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZVAL_FALSE(EX_VAR(opline->result.var));
+			ZEND_VM_SET_OPCODE(opline + 1);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	ZVAL_BOOL(EX_VAR(opline->result.var), retval);
-	if (retval) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE();
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		ZVAL_TRUE(EX_VAR(opline->result.var));
+		opline = opline->op2.jmp_addr;
+	} else {
+		ZVAL_FALSE(EX_VAR(opline->result.var));
+		opline++;
 	}
-	ZEND_VM_NEXT_OPCODE();
+
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
+	}
+	ZEND_VM_JMP(opline);
 }
 
 static int ZEND_FASTCALL  ZEND_DO_FCALL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -3176,9 +3181,6 @@ static int ZEND_FASTCALL  ZEND_JMP_SET_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_AR
 			zval_opt_copy_ctor(EX_VAR(opline->result.var));
 		}
 
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
 		ZEND_VM_JMP(opline->op2.jmp_addr);
 	}
 
@@ -3205,9 +3207,6 @@ static int ZEND_FASTCALL  ZEND_JMP_SET_VAR_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLE
 			}
 		}
 
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
 		ZEND_VM_JMP(opline->op2.jmp_addr);
 	}
 
@@ -7507,29 +7506,30 @@ static int ZEND_FASTCALL  ZEND_JMPZ_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 	USE_OPLINE
 	zend_free_op free_op1;
 	zval *val;
-	int ret;
 
 	SAVE_OPLINE();
 	val = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
 
-	if (IS_TMP_VAR == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		ret = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		ret = i_zend_is_true(val TSRMLS_CC);
-		zval_dtor(free_op1.var);
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (IS_TMP_VAR == IS_TMP_VAR) {
+		if (Z_TYPE_P(val) == IS_TRUE) {
+			ZEND_VM_SET_OPCODE(opline + 1);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	if (!ret) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE();
-	}
 
-	ZEND_VM_NEXT_OPCODE();
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		opline++;
+	} else {
+		opline = opline->op2.jmp_addr;
+	}
+	zval_dtor(free_op1.var);
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
+	}
+	ZEND_VM_JMP(opline);
 }
 
 static int ZEND_FASTCALL  ZEND_JMPNZ_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -7537,29 +7537,30 @@ static int ZEND_FASTCALL  ZEND_JMPNZ_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 	USE_OPLINE
 	zend_free_op free_op1;
 	zval *val;
-	int ret;
 
 	SAVE_OPLINE();
 	val = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
 
-	if (IS_TMP_VAR == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		ret = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		ret = i_zend_is_true(val TSRMLS_CC);
-		zval_dtor(free_op1.var);
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (IS_TMP_VAR == IS_TMP_VAR) {
+		if (Z_TYPE_P(val) == IS_TRUE) {
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZEND_VM_SET_OPCODE(opline + 1);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	if (ret) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE();
-	}
 
-	ZEND_VM_NEXT_OPCODE();
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		opline = opline->op2.jmp_addr;
+	} else {
+		opline++;
+	}
+	zval_dtor(free_op1.var);
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
+	}
+	ZEND_VM_JMP(opline);
 }
 
 static int ZEND_FASTCALL  ZEND_JMPZNZ_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -7567,33 +7568,30 @@ static int ZEND_FASTCALL  ZEND_JMPZNZ_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 	USE_OPLINE
 	zend_free_op free_op1;
 	zval *val;
-	int retval;
 
 	SAVE_OPLINE();
 	val = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
 
-	if (IS_TMP_VAR == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		retval = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		retval = i_zend_is_true(val TSRMLS_CC);
-		zval_dtor(free_op1.var);
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (IS_TMP_VAR == IS_TMP_VAR) {
+		if (EXPECTED(Z_TYPE_P(val) == IS_TRUE)) {
+			ZEND_VM_SET_RELATIVE_OPCODE(opline, opline->extended_value);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	if (EXPECTED(retval != 0)) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp on true to %d\n", opline->extended_value);
-#endif
-		ZEND_VM_SET_RELATIVE_OPCODE(opline, opline->extended_value);
-		ZEND_VM_CONTINUE(); /* CHECK_ME */
+
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		opline = (zend_op*)(((char*)opline) + opline->extended_value);
 	} else {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp on false to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE(); /* CHECK_ME */
+		opline = opline->op2.jmp_addr;
+	}
+	zval_dtor(free_op1.var);
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
 	}
+	ZEND_VM_JMP(opline);
 }
 
 static int ZEND_FASTCALL  ZEND_JMPZ_EX_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -7601,29 +7599,34 @@ static int ZEND_FASTCALL  ZEND_JMPZ_EX_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 	USE_OPLINE
 	zend_free_op free_op1;
 	zval *val;
-	int retval;
 
 	SAVE_OPLINE();
 	val = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
 
-	if (IS_TMP_VAR == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		retval = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		retval = i_zend_is_true(val TSRMLS_CC);
-		zval_dtor(free_op1.var);
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (IS_TMP_VAR == IS_TMP_VAR) {
+		if (Z_TYPE_P(val) == IS_TRUE) {
+			ZVAL_TRUE(EX_VAR(opline->result.var));
+			ZEND_VM_SET_OPCODE(opline + 1);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZVAL_FALSE(EX_VAR(opline->result.var));
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	ZVAL_BOOL(EX_VAR(opline->result.var), retval);
-	if (!retval) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE();
+
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		ZVAL_TRUE(EX_VAR(opline->result.var));
+		opline++;
+	} else {
+		ZVAL_FALSE(EX_VAR(opline->result.var));
+		opline = opline->op2.jmp_addr;
 	}
-	ZEND_VM_NEXT_OPCODE();
+	zval_dtor(free_op1.var);
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
+	}
+	ZEND_VM_JMP(opline);
 }
 
 static int ZEND_FASTCALL  ZEND_JMPNZ_EX_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -7631,29 +7634,33 @@ static int ZEND_FASTCALL  ZEND_JMPNZ_EX_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG
 	USE_OPLINE
 	zend_free_op free_op1;
 	zval *val;
-	int retval;
 
 	SAVE_OPLINE();
 	val = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
 
-	if (IS_TMP_VAR == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		retval = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		retval = i_zend_is_true(val TSRMLS_CC);
-		zval_dtor(free_op1.var);
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (IS_TMP_VAR == IS_TMP_VAR) {
+		if (Z_TYPE_P(val) == IS_TRUE) {
+			ZVAL_TRUE(EX_VAR(opline->result.var));
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZVAL_FALSE(EX_VAR(opline->result.var));
+			ZEND_VM_SET_OPCODE(opline + 1);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	ZVAL_BOOL(EX_VAR(opline->result.var), retval);
-	if (retval) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE();
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		ZVAL_TRUE(EX_VAR(opline->result.var));
+		opline = opline->op2.jmp_addr;
+	} else {
+		ZVAL_FALSE(EX_VAR(opline->result.var));
+		opline++;
 	}
-	ZEND_VM_NEXT_OPCODE();
+	zval_dtor(free_op1.var);
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
+	}
+	ZEND_VM_JMP(opline);
 }
 
 static int ZEND_FASTCALL  ZEND_FREE_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -8311,9 +8318,6 @@ static int ZEND_FASTCALL  ZEND_JMP_SET_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 			zval_opt_copy_ctor(EX_VAR(opline->result.var));
 		}
 
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
 		ZEND_VM_JMP(opline->op2.jmp_addr);
 	}
 
@@ -8341,9 +8345,6 @@ static int ZEND_FASTCALL  ZEND_JMP_SET_VAR_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_
 			}
 		}
 
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
 		ZEND_VM_JMP(opline->op2.jmp_addr);
 	}
 
@@ -12567,29 +12568,30 @@ static int ZEND_FASTCALL  ZEND_JMPZ_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 	USE_OPLINE
 	zend_free_op free_op1;
 	zval *val;
-	int ret;
 
 	SAVE_OPLINE();
 	val = _get_zval_ptr_var_deref(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
 
-	if (IS_VAR == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		ret = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		ret = i_zend_is_true(val TSRMLS_CC);
-		zval_ptr_dtor_nogc(free_op1.var);
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (IS_VAR == IS_TMP_VAR) {
+		if (Z_TYPE_P(val) == IS_TRUE) {
+			ZEND_VM_SET_OPCODE(opline + 1);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	if (!ret) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE();
-	}
 
-	ZEND_VM_NEXT_OPCODE();
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		opline++;
+	} else {
+		opline = opline->op2.jmp_addr;
+	}
+	zval_ptr_dtor_nogc(free_op1.var);
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
+	}
+	ZEND_VM_JMP(opline);
 }
 
 static int ZEND_FASTCALL  ZEND_JMPNZ_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -12597,29 +12599,30 @@ static int ZEND_FASTCALL  ZEND_JMPNZ_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 	USE_OPLINE
 	zend_free_op free_op1;
 	zval *val;
-	int ret;
 
 	SAVE_OPLINE();
 	val = _get_zval_ptr_var_deref(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
 
-	if (IS_VAR == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		ret = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		ret = i_zend_is_true(val TSRMLS_CC);
-		zval_ptr_dtor_nogc(free_op1.var);
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (IS_VAR == IS_TMP_VAR) {
+		if (Z_TYPE_P(val) == IS_TRUE) {
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZEND_VM_SET_OPCODE(opline + 1);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	if (ret) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE();
-	}
 
-	ZEND_VM_NEXT_OPCODE();
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		opline = opline->op2.jmp_addr;
+	} else {
+		opline++;
+	}
+	zval_ptr_dtor_nogc(free_op1.var);
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
+	}
+	ZEND_VM_JMP(opline);
 }
 
 static int ZEND_FASTCALL  ZEND_JMPZNZ_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -12627,33 +12630,30 @@ static int ZEND_FASTCALL  ZEND_JMPZNZ_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 	USE_OPLINE
 	zend_free_op free_op1;
 	zval *val;
-	int retval;
 
 	SAVE_OPLINE();
 	val = _get_zval_ptr_var_deref(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
 
-	if (IS_VAR == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		retval = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		retval = i_zend_is_true(val TSRMLS_CC);
-		zval_ptr_dtor_nogc(free_op1.var);
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (IS_VAR == IS_TMP_VAR) {
+		if (EXPECTED(Z_TYPE_P(val) == IS_TRUE)) {
+			ZEND_VM_SET_RELATIVE_OPCODE(opline, opline->extended_value);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	if (EXPECTED(retval != 0)) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp on true to %d\n", opline->extended_value);
-#endif
-		ZEND_VM_SET_RELATIVE_OPCODE(opline, opline->extended_value);
-		ZEND_VM_CONTINUE(); /* CHECK_ME */
+
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		opline = (zend_op*)(((char*)opline) + opline->extended_value);
 	} else {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp on false to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE(); /* CHECK_ME */
+		opline = opline->op2.jmp_addr;
+	}
+	zval_ptr_dtor_nogc(free_op1.var);
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
 	}
+	ZEND_VM_JMP(opline);
 }
 
 static int ZEND_FASTCALL  ZEND_JMPZ_EX_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -12661,29 +12661,34 @@ static int ZEND_FASTCALL  ZEND_JMPZ_EX_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 	USE_OPLINE
 	zend_free_op free_op1;
 	zval *val;
-	int retval;
 
 	SAVE_OPLINE();
 	val = _get_zval_ptr_var_deref(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
 
-	if (IS_VAR == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		retval = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		retval = i_zend_is_true(val TSRMLS_CC);
-		zval_ptr_dtor_nogc(free_op1.var);
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (IS_VAR == IS_TMP_VAR) {
+		if (Z_TYPE_P(val) == IS_TRUE) {
+			ZVAL_TRUE(EX_VAR(opline->result.var));
+			ZEND_VM_SET_OPCODE(opline + 1);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZVAL_FALSE(EX_VAR(opline->result.var));
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	ZVAL_BOOL(EX_VAR(opline->result.var), retval);
-	if (!retval) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE();
+
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		ZVAL_TRUE(EX_VAR(opline->result.var));
+		opline++;
+	} else {
+		ZVAL_FALSE(EX_VAR(opline->result.var));
+		opline = opline->op2.jmp_addr;
 	}
-	ZEND_VM_NEXT_OPCODE();
+	zval_ptr_dtor_nogc(free_op1.var);
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
+	}
+	ZEND_VM_JMP(opline);
 }
 
 static int ZEND_FASTCALL  ZEND_JMPNZ_EX_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -12691,29 +12696,33 @@ static int ZEND_FASTCALL  ZEND_JMPNZ_EX_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
 	USE_OPLINE
 	zend_free_op free_op1;
 	zval *val;
-	int retval;
 
 	SAVE_OPLINE();
 	val = _get_zval_ptr_var_deref(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
 
-	if (IS_VAR == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		retval = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		retval = i_zend_is_true(val TSRMLS_CC);
-		zval_ptr_dtor_nogc(free_op1.var);
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (IS_VAR == IS_TMP_VAR) {
+		if (Z_TYPE_P(val) == IS_TRUE) {
+			ZVAL_TRUE(EX_VAR(opline->result.var));
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZVAL_FALSE(EX_VAR(opline->result.var));
+			ZEND_VM_SET_OPCODE(opline + 1);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	ZVAL_BOOL(EX_VAR(opline->result.var), retval);
-	if (retval) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE();
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		ZVAL_TRUE(EX_VAR(opline->result.var));
+		opline = opline->op2.jmp_addr;
+	} else {
+		ZVAL_FALSE(EX_VAR(opline->result.var));
+		opline++;
 	}
-	ZEND_VM_NEXT_OPCODE();
+	zval_ptr_dtor_nogc(free_op1.var);
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
+	}
+	ZEND_VM_JMP(opline);
 }
 
 static int ZEND_FASTCALL  ZEND_FREE_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -13602,9 +13611,6 @@ static int ZEND_FASTCALL  ZEND_JMP_SET_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 			zval_opt_copy_ctor(EX_VAR(opline->result.var));
 		}
 		zval_ptr_dtor_nogc(free_op1.var);
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
 		ZEND_VM_JMP(opline->op2.jmp_addr);
 	}
 
@@ -13632,9 +13638,6 @@ static int ZEND_FASTCALL  ZEND_JMP_SET_VAR_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_
 			}
 		}
 		zval_ptr_dtor_nogc(free_op1.var);
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
 		ZEND_VM_JMP(opline->op2.jmp_addr);
 	}
 
@@ -29638,29 +29641,30 @@ static int ZEND_FASTCALL  ZEND_JMPZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 	USE_OPLINE
 
 	zval *val;
-	int ret;
 
 	SAVE_OPLINE();
 	val = _get_zval_ptr_cv_deref_BP_VAR_R(execute_data, opline->op1.var TSRMLS_CC);
 
-	if (IS_CV == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		ret = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		ret = i_zend_is_true(val TSRMLS_CC);
-
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (IS_CV == IS_TMP_VAR) {
+		if (Z_TYPE_P(val) == IS_TRUE) {
+			ZEND_VM_SET_OPCODE(opline + 1);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	if (!ret) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE();
+
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		opline++;
+	} else {
+		opline = opline->op2.jmp_addr;
 	}
 
-	ZEND_VM_NEXT_OPCODE();
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
+	}
+	ZEND_VM_JMP(opline);
 }
 
 static int ZEND_FASTCALL  ZEND_JMPNZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -29668,29 +29672,30 @@ static int ZEND_FASTCALL  ZEND_JMPNZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 	USE_OPLINE
 
 	zval *val;
-	int ret;
 
 	SAVE_OPLINE();
 	val = _get_zval_ptr_cv_deref_BP_VAR_R(execute_data, opline->op1.var TSRMLS_CC);
 
-	if (IS_CV == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		ret = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		ret = i_zend_is_true(val TSRMLS_CC);
-
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (IS_CV == IS_TMP_VAR) {
+		if (Z_TYPE_P(val) == IS_TRUE) {
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZEND_VM_SET_OPCODE(opline + 1);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	if (ret) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE();
+
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		opline = opline->op2.jmp_addr;
+	} else {
+		opline++;
 	}
 
-	ZEND_VM_NEXT_OPCODE();
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
+	}
+	ZEND_VM_JMP(opline);
 }
 
 static int ZEND_FASTCALL  ZEND_JMPZNZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -29698,33 +29703,30 @@ static int ZEND_FASTCALL  ZEND_JMPZNZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 	USE_OPLINE
 
 	zval *val;
-	int retval;
 
 	SAVE_OPLINE();
 	val = _get_zval_ptr_cv_deref_BP_VAR_R(execute_data, opline->op1.var TSRMLS_CC);
 
-	if (IS_CV == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		retval = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		retval = i_zend_is_true(val TSRMLS_CC);
-
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (IS_CV == IS_TMP_VAR) {
+		if (EXPECTED(Z_TYPE_P(val) == IS_TRUE)) {
+			ZEND_VM_SET_RELATIVE_OPCODE(opline, opline->extended_value);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	if (EXPECTED(retval != 0)) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp on true to %d\n", opline->extended_value);
-#endif
-		ZEND_VM_SET_RELATIVE_OPCODE(opline, opline->extended_value);
-		ZEND_VM_CONTINUE(); /* CHECK_ME */
+
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		opline = (zend_op*)(((char*)opline) + opline->extended_value);
 	} else {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp on false to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE(); /* CHECK_ME */
+		opline = opline->op2.jmp_addr;
 	}
+
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
+	}
+	ZEND_VM_JMP(opline);
 }
 
 static int ZEND_FASTCALL  ZEND_JMPZ_EX_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -29732,29 +29734,34 @@ static int ZEND_FASTCALL  ZEND_JMPZ_EX_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 	USE_OPLINE
 
 	zval *val;
-	int retval;
 
 	SAVE_OPLINE();
 	val = _get_zval_ptr_cv_deref_BP_VAR_R(execute_data, opline->op1.var TSRMLS_CC);
 
-	if (IS_CV == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		retval = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		retval = i_zend_is_true(val TSRMLS_CC);
-
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (IS_CV == IS_TMP_VAR) {
+		if (Z_TYPE_P(val) == IS_TRUE) {
+			ZVAL_TRUE(EX_VAR(opline->result.var));
+			ZEND_VM_SET_OPCODE(opline + 1);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZVAL_FALSE(EX_VAR(opline->result.var));
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	ZVAL_BOOL(EX_VAR(opline->result.var), retval);
-	if (!retval) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE();
+
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		ZVAL_TRUE(EX_VAR(opline->result.var));
+		opline++;
+	} else {
+		ZVAL_FALSE(EX_VAR(opline->result.var));
+		opline = opline->op2.jmp_addr;
 	}
-	ZEND_VM_NEXT_OPCODE();
+
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
+	}
+	ZEND_VM_JMP(opline);
 }
 
 static int ZEND_FASTCALL  ZEND_JMPNZ_EX_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -29762,29 +29769,33 @@ static int ZEND_FASTCALL  ZEND_JMPNZ_EX_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 	USE_OPLINE
 
 	zval *val;
-	int retval;
 
 	SAVE_OPLINE();
 	val = _get_zval_ptr_cv_deref_BP_VAR_R(execute_data, opline->op1.var TSRMLS_CC);
 
-	if (IS_CV == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
-		retval = (Z_TYPE_P(val) == IS_TRUE);
-	} else {
-		retval = i_zend_is_true(val TSRMLS_CC);
-
-		if (UNEXPECTED(EG(exception) != NULL)) {
-			HANDLE_EXCEPTION();
+	if (IS_CV == IS_TMP_VAR) {
+		if (Z_TYPE_P(val) == IS_TRUE) {
+			ZVAL_TRUE(EX_VAR(opline->result.var));
+			ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
+			ZEND_VM_CONTINUE();
+		} else if (EXPECTED(Z_TYPE_P(val) <= IS_TRUE)) {
+			ZVAL_FALSE(EX_VAR(opline->result.var));
+			ZEND_VM_SET_OPCODE(opline + 1);
+			ZEND_VM_CONTINUE();
 		}
 	}
-	ZVAL_BOOL(EX_VAR(opline->result.var), retval);
-	if (retval) {
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
-		ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
-		ZEND_VM_CONTINUE();
+	if (i_zend_is_true(val TSRMLS_CC)) {
+		ZVAL_TRUE(EX_VAR(opline->result.var));
+		opline = opline->op2.jmp_addr;
+	} else {
+		ZVAL_FALSE(EX_VAR(opline->result.var));
+		opline++;
 	}
-	ZEND_VM_NEXT_OPCODE();
+
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		HANDLE_EXCEPTION();
+	}
+	ZEND_VM_JMP(opline);
 }
 
 static int ZEND_FASTCALL  ZEND_RETURN_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -30506,9 +30517,6 @@ static int ZEND_FASTCALL  ZEND_JMP_SET_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 			zval_opt_copy_ctor(EX_VAR(opline->result.var));
 		}
 
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
 		ZEND_VM_JMP(opline->op2.jmp_addr);
 	}
 
@@ -30535,9 +30543,6 @@ static int ZEND_FASTCALL  ZEND_JMP_SET_VAR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_A
 			}
 		}
 
-#if DEBUG_ZEND>=2
-		printf("Conditional jmp to %d\n", opline->op2.opline_num);
-#endif
 		ZEND_VM_JMP(opline->op2.jmp_addr);
 	}