From: Dmitry Stogov <dmitry@php.net>
Date: Mon, 18 Sep 2006 12:03:21 +0000 (+0000)
Subject: Fixed non-specialized executor
X-Git-Tag: RELEASE_1_0_0RC1~1642
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5bda51a5c09a90144d94581bdd1db5987b200dde;p=php

Fixed non-specialized executor
---

diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index e81597d6af..a6ce7f737f 100644
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -342,6 +342,8 @@ function gen_code($f, $spec, $kind, $code, $op1, $op2) {
 			"/defined\(ZEND_VM_SPEC\)/m",
 			"/ZEND_VM_C_LABEL\(\s*([A-Za-z_]*)\s*\)/m",
 			"/ZEND_VM_C_GOTO\(\s*([A-Za-z_]*)\s*\)/m",
+			"/^#if\s+1\s*\\|\\|.*[^\\\\]$/m",
+			"/^#if\s+0\s*&&.*[^\\\\]$/m"
 		),
 		array(
 			$op1_type[$op1],
@@ -370,6 +372,8 @@ function gen_code($f, $spec, $kind, $code, $op1, $op2) {
 			($op1!="ANY"||$op2!="ANY")?"1":"0",
 			"\\1".(($spec && $kind != ZEND_VM_KIND_CALL)?("_SPEC".$prefix[$op1].$prefix[$op2]):""),
 			"goto \\1".(($spec && $kind != ZEND_VM_KIND_CALL)?("_SPEC".$prefix[$op1].$prefix[$op2]):""),
+			"#if 1",
+			"#if 0",
 		),
 		$code);