From a871b842f806eff80f2bfa71d31d0d3c9c39a33a Mon Sep 17 00:00:00 2001
From: Marcus Boerger <helly@php.net>
Date: Sat, 20 May 2006 15:38:36 +0000
Subject: [PATCH] - Fix warning

---
 Zend/zend_vm_def.h     |  2 ++
 Zend/zend_vm_execute.h | 10 ++++++++++
 Zend/zend_vm_gen.php   |  2 ++
 3 files changed, 14 insertions(+)

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 9901ab06fc..251ae53524 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -3572,6 +3572,7 @@ ZEND_VM_HANDLER(148, ZEND_ISSET_ISEMPTY_PROP_OBJ, VAR|UNUSED|CV, CONST|TMP|VAR|C
 
 ZEND_VM_HANDLER(79, ZEND_EXIT, CONST|TMP|VAR|UNUSED|CV, ANY)
 {
+#ifdef ZEND_OP1_USED
 	zend_op *opline = EX(opline);
 	if (OP1_TYPE != IS_UNUSED) {
 		zend_free_op free_op1;
@@ -3584,6 +3585,7 @@ ZEND_VM_HANDLER(79, ZEND_EXIT, CONST|TMP|VAR|UNUSED|CV, ANY)
 		}
 		FREE_OP1();
 	}
+#endif
 	zend_bailout();
 	ZEND_VM_NEXT_OPCODE();
 }
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 3b24001536..178432ca5a 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -2233,6 +2233,7 @@ static int ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
 static int ZEND_EXIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
+#if 1
 	zend_op *opline = EX(opline);
 	if (IS_CONST != IS_UNUSED) {
 
@@ -2245,6 +2246,7 @@ static int ZEND_EXIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 		}
 
 	}
+#endif
 	zend_bailout();
 	ZEND_VM_NEXT_OPCODE();
 }
@@ -4742,6 +4744,7 @@ static int ZEND_ISSET_ISEMPTY_VAR_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
 static int ZEND_EXIT_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
+#if 1
 	zend_op *opline = EX(opline);
 	if (IS_TMP_VAR != IS_UNUSED) {
 		zend_free_op free_op1;
@@ -4754,6 +4757,7 @@ static int ZEND_EXIT_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 		}
 		zval_dtor(free_op1.var);
 	}
+#endif
 	zend_bailout();
 	ZEND_VM_NEXT_OPCODE();
 }
@@ -7998,6 +8002,7 @@ static int ZEND_ISSET_ISEMPTY_VAR_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
 static int ZEND_EXIT_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
+#if 1
 	zend_op *opline = EX(opline);
 	if (IS_VAR != IS_UNUSED) {
 		zend_free_op free_op1;
@@ -8010,6 +8015,7 @@ static int ZEND_EXIT_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 		}
 		if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
 	}
+#endif
 	zend_bailout();
 	ZEND_VM_NEXT_OPCODE();
 }
@@ -14541,6 +14547,7 @@ static int ZEND_CLONE_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
 static int ZEND_EXIT_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
+#if 0
 	zend_op *opline = EX(opline);
 	if (IS_UNUSED != IS_UNUSED) {
 
@@ -14553,6 +14560,7 @@ static int ZEND_EXIT_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 		}
 
 	}
+#endif
 	zend_bailout();
 	ZEND_VM_NEXT_OPCODE();
 }
@@ -20483,6 +20491,7 @@ static int ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
 static int ZEND_EXIT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
+#if 1
 	zend_op *opline = EX(opline);
 	if (IS_CV != IS_UNUSED) {
 
@@ -20495,6 +20504,7 @@ static int ZEND_EXIT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 		}
 
 	}
+#endif
 	zend_bailout();
 	ZEND_VM_NEXT_OPCODE();
 }
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index 0fe2ea922f..edfb7265b8 100644
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -338,6 +338,7 @@ function gen_code($f, $spec, $kind, $code, $op1, $op2) {
 			"/FREE_OP2_VAR_PTR\(\)/",
 			"/^#ifdef\s+ZEND_VM_SPEC\s*\n/m",
 			"/^#ifndef\s+ZEND_VM_SPEC\s*\n/m",
+			"/^#ifdef\s+ZEND_OP1_USED\s*\n/m",
 			"/ZEND_VM_C_LABEL\(\s*([A-Za-z_]*)\s*\)/m",
 			"/ZEND_VM_C_GOTO\(\s*([A-Za-z_]*)\s*\)/m",
 		),
@@ -364,6 +365,7 @@ function gen_code($f, $spec, $kind, $code, $op1, $op2) {
 			$op2_free_op_var_ptr[$op2],
 			($op1!="ANY"||$op2!="ANY")?"#if 1\n":"#if 0\n",
 			($op1!="ANY"||$op2!="ANY")?"#if 0\n":"#if 1\n",
+			($op1!="UNUSED")?"#if 1\n":"#if 0\n",
 			"\\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]):""),
 		),
-- 
2.40.0