Removed useless (double) checks for EG(exception). (Bob)

dstogov · dstogov · commit 8d70b04a1c33 · 2016-11-22T11:50:48.000+03:00
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -2937,13 +2937,13 @@ static zend_never_inline int zend_do_fcall_overloaded(zend_function *fbc, zend_e
 #define ZEND_VM_SET_RELATIVE_OPCODE(opline, offset) \
 	ZEND_VM_SET_OPCODE(ZEND_OFFSET_TO_OPLINE(opline, offset))
 
-#define ZEND_VM_JMP(new_op) \
-	if (EXPECTED(!EG(exception))) { \
+#define ZEND_VM_JMP(new_op) do { \
+		if (UNEXPECTED(EG(exception))) { \
+			HANDLE_EXCEPTION(); \
+		} \
 		ZEND_VM_SET_OPCODE(new_op); \
-	} else { \
-		LOAD_OPLINE(); \
-	} \
-	ZEND_VM_CONTINUE()
+		ZEND_VM_CONTINUE(); \
+	} while (0)
 
 #define ZEND_VM_INC_OPCODE() \
 	OPLINE++
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -2709,9 +2709,6 @@ ZEND_VM_HANDLER(43, ZEND_JMPZ, CONST|TMPVAR|CV, JMP_ADDR)
 		opline = OP_JMP_ADDR(opline, opline->op2);
 	}
 	FREE_OP1();
-	if (UNEXPECTED(EG(exception) != NULL)) {
-		HANDLE_EXCEPTION();
-	}
 	ZEND_VM_JMP(opline);
 }
 
@@ -2743,9 +2740,6 @@ ZEND_VM_HANDLER(44, ZEND_JMPNZ, CONST|TMPVAR|CV, JMP_ADDR)
 		opline++;
 	}
 	FREE_OP1();
-	if (UNEXPECTED(EG(exception) != NULL)) {
-		HANDLE_EXCEPTION();
-	}
 	ZEND_VM_JMP(opline);
 }
 
@@ -2780,9 +2774,6 @@ ZEND_VM_HANDLER(45, ZEND_JMPZNZ, CONST|TMPVAR|CV, JMP_ADDR, JMP_ADDR)
 		opline = OP_JMP_ADDR(opline, opline->op2);
 	}
 	FREE_OP1();
-	if (UNEXPECTED(EG(exception) != NULL)) {
-		HANDLE_EXCEPTION();
-	}
 	ZEND_VM_JMP(opline);
 }
 
@@ -2823,9 +2814,6 @@ ZEND_VM_HANDLER(46, ZEND_JMPZ_EX, CONST|TMPVAR|CV, JMP_ADDR)
 		ZVAL_FALSE(EX_VAR(opline->result.var));
 		opline = OP_JMP_ADDR(opline, opline->op2);
 	}
-	if (UNEXPECTED(EG(exception) != NULL)) {
-		HANDLE_EXCEPTION();
-	}
 	ZEND_VM_JMP(opline);
 }
 
@@ -2863,9 +2851,6 @@ ZEND_VM_HANDLER(47, ZEND_JMPNZ_EX, CONST|TMPVAR|CV, JMP_ADDR)
 		ZVAL_FALSE(EX_VAR(opline->result.var));
 		opline++;
 	}
-	if (UNEXPECTED(EG(exception) != NULL)) {
-		HANDLE_EXCEPTION();
-	}
 	ZEND_VM_JMP(opline);
 }
 
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -2706,9 +2706,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZ_SPEC_CONST_HANDLER(ZEND_O
 		opline = OP_JMP_ADDR(opline, opline->op2);
 	}
 
-	if (UNEXPECTED(EG(exception) != NULL)) {
-		HANDLE_EXCEPTION();
-	}
 	ZEND_VM_JMP(opline);
 }
 
@@ -2740,9 +2737,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPNZ_SPEC_CONST_HANDLER(ZEND_
 		opline++;
 	}
 
-	if (UNEXPECTED(EG(exception) != NULL)) {
-		HANDLE_EXCEPTION();
-	}
 	ZEND_VM_JMP(opline);
 }
 
@@ -2777,9 +2771,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZNZ_SPEC_CONST_HANDLER(ZEND
 		opline = OP_JMP_ADDR(opline, opline->op2);
 	}
 
-	if (UNEXPECTED(EG(exception) != NULL)) {
-		HANDLE_EXCEPTION();
-	}
 	ZEND_VM_JMP(opline);
 }
 
@@ -2820,9 +2811,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZ_EX_SPEC_CONST_HANDLER(ZEN
 		ZVAL_FALSE(EX_VAR(opline->result.var));
 		opline = OP_JMP_ADDR(opline, opline->op2);
 	}
-	if (UNEXPECTED(EG(exception) != NULL)) {
-		HANDLE_EXCEPTION();
-	}
 	ZEND_VM_JMP(opline);
 }
 
@@ -2860,9 +2848,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPNZ_EX_SPEC_CONST_HANDLER(ZE
 		ZVAL_FALSE(EX_VAR(opline->result.var));
 		opline++;
 	}
-	if (UNEXPECTED(EG(exception) != NULL)) {
-		HANDLE_EXCEPTION();
-	}
 	ZEND_VM_JMP(opline);
 }
 
@@ -34707,9 +34692,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZ_SPEC_CV_HANDLER(ZEND_OPCO
 		opline = OP_JMP_ADDR(opline, opline->op2);
 	}
 
-	if (UNEXPECTED(EG(exception) != NULL)) {
-		HANDLE_EXCEPTION();
-	}
 	ZEND_VM_JMP(opline);
 }
 
@@ -34741,9 +34723,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPNZ_SPEC_CV_HANDLER(ZEND_OPC
 		opline++;
 	}
 
-	if (UNEXPECTED(EG(exception) != NULL)) {
-		HANDLE_EXCEPTION();
-	}
 	ZEND_VM_JMP(opline);
 }
 
@@ -34778,9 +34757,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZNZ_SPEC_CV_HANDLER(ZEND_OP
 		opline = OP_JMP_ADDR(opline, opline->op2);
 	}
 
-	if (UNEXPECTED(EG(exception) != NULL)) {
-		HANDLE_EXCEPTION();
-	}
 	ZEND_VM_JMP(opline);
 }
 
@@ -34821,9 +34797,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZ_EX_SPEC_CV_HANDLER(ZEND_O
 		ZVAL_FALSE(EX_VAR(opline->result.var));
 		opline = OP_JMP_ADDR(opline, opline->op2);
 	}
-	if (UNEXPECTED(EG(exception) != NULL)) {
-		HANDLE_EXCEPTION();
-	}
 	ZEND_VM_JMP(opline);
 }
 
@@ -34861,9 +34834,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPNZ_EX_SPEC_CV_HANDLER(ZEND_
 		ZVAL_FALSE(EX_VAR(opline->result.var));
 		opline++;
 	}
-	if (UNEXPECTED(EG(exception) != NULL)) {
-		HANDLE_EXCEPTION();
-	}
 	ZEND_VM_JMP(opline);
 }
 
@@ -51296,9 +51266,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZ_SPEC_TMPVAR_HANDLER(ZEND_
 		opline = OP_JMP_ADDR(opline, opline->op2);
 	}
 	zval_ptr_dtor_nogc(free_op1);
-	if (UNEXPECTED(EG(exception) != NULL)) {
-		HANDLE_EXCEPTION();
-	}
 	ZEND_VM_JMP(opline);
 }
 
@@ -51330,9 +51297,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPNZ_SPEC_TMPVAR_HANDLER(ZEND
 		opline++;
 	}
 	zval_ptr_dtor_nogc(free_op1);
-	if (UNEXPECTED(EG(exception) != NULL)) {
-		HANDLE_EXCEPTION();
-	}
 	ZEND_VM_JMP(opline);
 }
 
@@ -51367,9 +51331,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZNZ_SPEC_TMPVAR_HANDLER(ZEN
 		opline = OP_JMP_ADDR(opline, opline->op2);
 	}
 	zval_ptr_dtor_nogc(free_op1);
-	if (UNEXPECTED(EG(exception) != NULL)) {
-		HANDLE_EXCEPTION();
-	}
 	ZEND_VM_JMP(opline);
 }
 
@@ -51410,9 +51371,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZ_EX_SPEC_TMPVAR_HANDLER(ZE
 		ZVAL_FALSE(EX_VAR(opline->result.var));
 		opline = OP_JMP_ADDR(opline, opline->op2);
 	}
-	if (UNEXPECTED(EG(exception) != NULL)) {
-		HANDLE_EXCEPTION();
-	}
 	ZEND_VM_JMP(opline);
 }
 
@@ -51450,9 +51408,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPNZ_EX_SPEC_TMPVAR_HANDLER(Z
 		ZVAL_FALSE(EX_VAR(opline->result.var));
 		opline++;
 	}
-	if (UNEXPECTED(EG(exception) != NULL)) {
-		HANDLE_EXCEPTION();
-	}
 	ZEND_VM_JMP(opline);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2709,9 +2709,6 @@ ZEND_VM_HANDLER(43, ZEND_JMPZ, CONST\|TMPVAR\|CV, JMP_ADDR)`
`2709`	`2709`	`opline = OP_JMP_ADDR(opline, opline->op2);`
`2710`	`2710`	`}`
`2711`	`2711`	`FREE_OP1();`
`2712`		`- if (UNEXPECTED(EG(exception) != NULL)) {`
`2713`		`- HANDLE_EXCEPTION();`
`2714`		`- }`
`2715`	`2712`	`ZEND_VM_JMP(opline);`
`2716`	`2713`	`}`
`2717`	`2714`
`@@ -2743,9 +2740,6 @@ ZEND_VM_HANDLER(44, ZEND_JMPNZ, CONST\|TMPVAR\|CV, JMP_ADDR)`
`2743`	`2740`	`opline++;`
`2744`	`2741`	`}`
`2745`	`2742`	`FREE_OP1();`
`2746`		`- if (UNEXPECTED(EG(exception) != NULL)) {`
`2747`		`- HANDLE_EXCEPTION();`
`2748`		`- }`
`2749`	`2743`	`ZEND_VM_JMP(opline);`
`2750`	`2744`	`}`
`2751`	`2745`
`@@ -2780,9 +2774,6 @@ ZEND_VM_HANDLER(45, ZEND_JMPZNZ, CONST\|TMPVAR\|CV, JMP_ADDR, JMP_ADDR)`
`2780`	`2774`	`opline = OP_JMP_ADDR(opline, opline->op2);`
`2781`	`2775`	`}`
`2782`	`2776`	`FREE_OP1();`
`2783`		`- if (UNEXPECTED(EG(exception) != NULL)) {`
`2784`		`- HANDLE_EXCEPTION();`
`2785`		`- }`
`2786`	`2777`	`ZEND_VM_JMP(opline);`
`2787`	`2778`	`}`
`2788`	`2779`
`@@ -2823,9 +2814,6 @@ ZEND_VM_HANDLER(46, ZEND_JMPZ_EX, CONST\|TMPVAR\|CV, JMP_ADDR)`
`2823`	`2814`	`ZVAL_FALSE(EX_VAR(opline->result.var));`
`2824`	`2815`	`opline = OP_JMP_ADDR(opline, opline->op2);`
`2825`	`2816`	`}`
`2826`		`- if (UNEXPECTED(EG(exception) != NULL)) {`
`2827`		`- HANDLE_EXCEPTION();`
`2828`		`- }`
`2829`	`2817`	`ZEND_VM_JMP(opline);`
`2830`	`2818`	`}`
`2831`	`2819`
`@@ -2863,9 +2851,6 @@ ZEND_VM_HANDLER(47, ZEND_JMPNZ_EX, CONST\|TMPVAR\|CV, JMP_ADDR)`
`2863`	`2851`	`ZVAL_FALSE(EX_VAR(opline->result.var));`
`2864`	`2852`	`opline++;`
`2865`	`2853`	`}`
`2866`		`- if (UNEXPECTED(EG(exception) != NULL)) {`
`2867`		`- HANDLE_EXCEPTION();`
`2868`		`- }`
`2869`	`2854`	`ZEND_VM_JMP(opline);`
`2870`	`2855`	`}`
`2871`	`2856`
Original file line number	Diff line number	Diff line change
`@@ -2706,9 +2706,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZ_SPEC_CONST_HANDLER(ZEND_O`
`2706`	`2706`	`opline = OP_JMP_ADDR(opline, opline->op2);`
`2707`	`2707`	`}`
`2708`	`2708`
`2709`		`- if (UNEXPECTED(EG(exception) != NULL)) {`
`2710`		`- HANDLE_EXCEPTION();`
`2711`		`- }`
`2712`	`2709`	`ZEND_VM_JMP(opline);`
`2713`	`2710`	`}`
`2714`	`2711`
`@@ -2740,9 +2737,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPNZ_SPEC_CONST_HANDLER(ZEND_`
`2740`	`2737`	`opline++;`
`2741`	`2738`	`}`
`2742`	`2739`
`2743`		`- if (UNEXPECTED(EG(exception) != NULL)) {`
`2744`		`- HANDLE_EXCEPTION();`
`2745`		`- }`
`2746`	`2740`	`ZEND_VM_JMP(opline);`
`2747`	`2741`	`}`
`2748`	`2742`
`@@ -2777,9 +2771,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZNZ_SPEC_CONST_HANDLER(ZEND`
`2777`	`2771`	`opline = OP_JMP_ADDR(opline, opline->op2);`
`2778`	`2772`	`}`
`2779`	`2773`
`2780`		`- if (UNEXPECTED(EG(exception) != NULL)) {`
`2781`		`- HANDLE_EXCEPTION();`
`2782`		`- }`
`2783`	`2774`	`ZEND_VM_JMP(opline);`
`2784`	`2775`	`}`
`2785`	`2776`
`@@ -2820,9 +2811,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZ_EX_SPEC_CONST_HANDLER(ZEN`
`2820`	`2811`	`ZVAL_FALSE(EX_VAR(opline->result.var));`
`2821`	`2812`	`opline = OP_JMP_ADDR(opline, opline->op2);`
`2822`	`2813`	`}`
`2823`		`- if (UNEXPECTED(EG(exception) != NULL)) {`
`2824`		`- HANDLE_EXCEPTION();`
`2825`		`- }`
`2826`	`2814`	`ZEND_VM_JMP(opline);`
`2827`	`2815`	`}`
`2828`	`2816`
`@@ -2860,9 +2848,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPNZ_EX_SPEC_CONST_HANDLER(ZE`
`2860`	`2848`	`ZVAL_FALSE(EX_VAR(opline->result.var));`
`2861`	`2849`	`opline++;`
`2862`	`2850`	`}`
`2863`		`- if (UNEXPECTED(EG(exception) != NULL)) {`
`2864`		`- HANDLE_EXCEPTION();`
`2865`		`- }`
`2866`	`2851`	`ZEND_VM_JMP(opline);`
`2867`	`2852`	`}`
`2868`	`2853`
`@@ -34707,9 +34692,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZ_SPEC_CV_HANDLER(ZEND_OPCO`
`34707`	`34692`	`opline = OP_JMP_ADDR(opline, opline->op2);`
`34708`	`34693`	`}`
`34709`	`34694`
`34710`		`- if (UNEXPECTED(EG(exception) != NULL)) {`
`34711`		`- HANDLE_EXCEPTION();`
`34712`		`- }`
`34713`	`34695`	`ZEND_VM_JMP(opline);`
`34714`	`34696`	`}`
`34715`	`34697`
`@@ -34741,9 +34723,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPNZ_SPEC_CV_HANDLER(ZEND_OPC`
`34741`	`34723`	`opline++;`
`34742`	`34724`	`}`
`34743`	`34725`
`34744`		`- if (UNEXPECTED(EG(exception) != NULL)) {`
`34745`		`- HANDLE_EXCEPTION();`
`34746`		`- }`
`34747`	`34726`	`ZEND_VM_JMP(opline);`
`34748`	`34727`	`}`
`34749`	`34728`
`@@ -34778,9 +34757,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZNZ_SPEC_CV_HANDLER(ZEND_OP`
`34778`	`34757`	`opline = OP_JMP_ADDR(opline, opline->op2);`
`34779`	`34758`	`}`
`34780`	`34759`
`34781`		`- if (UNEXPECTED(EG(exception) != NULL)) {`
`34782`		`- HANDLE_EXCEPTION();`
`34783`		`- }`
`34784`	`34760`	`ZEND_VM_JMP(opline);`
`34785`	`34761`	`}`
`34786`	`34762`
`@@ -34821,9 +34797,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZ_EX_SPEC_CV_HANDLER(ZEND_O`
`34821`	`34797`	`ZVAL_FALSE(EX_VAR(opline->result.var));`
`34822`	`34798`	`opline = OP_JMP_ADDR(opline, opline->op2);`
`34823`	`34799`	`}`
`34824`		`- if (UNEXPECTED(EG(exception) != NULL)) {`
`34825`		`- HANDLE_EXCEPTION();`
`34826`		`- }`
`34827`	`34800`	`ZEND_VM_JMP(opline);`
`34828`	`34801`	`}`
`34829`	`34802`
`@@ -34861,9 +34834,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPNZ_EX_SPEC_CV_HANDLER(ZEND_`
`34861`	`34834`	`ZVAL_FALSE(EX_VAR(opline->result.var));`
`34862`	`34835`	`opline++;`
`34863`	`34836`	`}`
`34864`		`- if (UNEXPECTED(EG(exception) != NULL)) {`
`34865`		`- HANDLE_EXCEPTION();`
`34866`		`- }`
`34867`	`34837`	`ZEND_VM_JMP(opline);`
`34868`	`34838`	`}`
`34869`	`34839`
`@@ -51296,9 +51266,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZ_SPEC_TMPVAR_HANDLER(ZEND_`
`51296`	`51266`	`opline = OP_JMP_ADDR(opline, opline->op2);`
`51297`	`51267`	`}`
`51298`	`51268`	`zval_ptr_dtor_nogc(free_op1);`
`51299`		`- if (UNEXPECTED(EG(exception) != NULL)) {`
`51300`		`- HANDLE_EXCEPTION();`
`51301`		`- }`
`51302`	`51269`	`ZEND_VM_JMP(opline);`
`51303`	`51270`	`}`
`51304`	`51271`
`@@ -51330,9 +51297,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPNZ_SPEC_TMPVAR_HANDLER(ZEND`
`51330`	`51297`	`opline++;`
`51331`	`51298`	`}`
`51332`	`51299`	`zval_ptr_dtor_nogc(free_op1);`
`51333`		`- if (UNEXPECTED(EG(exception) != NULL)) {`
`51334`		`- HANDLE_EXCEPTION();`
`51335`		`- }`
`51336`	`51300`	`ZEND_VM_JMP(opline);`
`51337`	`51301`	`}`
`51338`	`51302`
`@@ -51367,9 +51331,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZNZ_SPEC_TMPVAR_HANDLER(ZEN`
`51367`	`51331`	`opline = OP_JMP_ADDR(opline, opline->op2);`
`51368`	`51332`	`}`
`51369`	`51333`	`zval_ptr_dtor_nogc(free_op1);`
`51370`		`- if (UNEXPECTED(EG(exception) != NULL)) {`
`51371`		`- HANDLE_EXCEPTION();`
`51372`		`- }`
`51373`	`51334`	`ZEND_VM_JMP(opline);`
`51374`	`51335`	`}`
`51375`	`51336`
`@@ -51410,9 +51371,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZ_EX_SPEC_TMPVAR_HANDLER(ZE`
`51410`	`51371`	`ZVAL_FALSE(EX_VAR(opline->result.var));`
`51411`	`51372`	`opline = OP_JMP_ADDR(opline, opline->op2);`
`51412`	`51373`	`}`
`51413`		`- if (UNEXPECTED(EG(exception) != NULL)) {`
`51414`		`- HANDLE_EXCEPTION();`
`51415`		`- }`
`51416`	`51374`	`ZEND_VM_JMP(opline);`
`51417`	`51375`	`}`
`51418`	`51376`
`@@ -51450,9 +51408,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPNZ_EX_SPEC_TMPVAR_HANDLER(Z`
`51450`	`51408`	`ZVAL_FALSE(EX_VAR(opline->result.var));`
`51451`	`51409`	`opline++;`
`51452`	`51410`	`}`
`51453`		`- if (UNEXPECTED(EG(exception) != NULL)) {`
`51454`		`- HANDLE_EXCEPTION();`
`51455`		`- }`
`51456`	`51411`	`ZEND_VM_JMP(opline);`
`51457`	`51412`	`}`
`51458`	`51413`