Skip to content

Commit 653c9e1

Browse files
dstogovdstogov
committed
Merge branch 'PHP-7.1'
* PHP-7.1: Removed useless (double) checks for EG(exception). (Bob)
2 parents 68ee168 + 8d70b04 commit 653c9e1

File tree

3 files changed

+6
-66
lines changed

3 files changed

+6
-66
lines changed

‎Zend/zend_execute.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2940,13 +2940,13 @@ static zend_never_inline int zend_do_fcall_overloaded(zend_function *fbc, zend_e
29402940
#define ZEND_VM_SET_RELATIVE_OPCODE(opline, offset) \
29412941
ZEND_VM_SET_OPCODE(ZEND_OFFSET_TO_OPLINE(opline, offset))
29422942

2943-
#define ZEND_VM_JMP(new_op) \
2944-
if (EXPECTED(!EG(exception))) { \
2943+
#define ZEND_VM_JMP(new_op) do { \
2944+
if (UNEXPECTED(EG(exception))) { \
2945+
HANDLE_EXCEPTION(); \
2946+
} \
29452947
ZEND_VM_SET_OPCODE(new_op); \
2946-
} else { \
2947-
LOAD_OPLINE(); \
2948-
} \
2949-
ZEND_VM_CONTINUE()
2948+
ZEND_VM_CONTINUE(); \
2949+
} while (0)
29502950

29512951
#define ZEND_VM_INC_OPCODE() \
29522952
OPLINE++

‎Zend/zend_vm_def.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2709,9 +2709,6 @@ ZEND_VM_HANDLER(43, ZEND_JMPZ, CONST|TMPVAR|CV, JMP_ADDR)
27092709
opline = OP_JMP_ADDR(opline, opline->op2);
27102710
}
27112711
FREE_OP1();
2712-
if (UNEXPECTED(EG(exception) != NULL)) {
2713-
HANDLE_EXCEPTION();
2714-
}
27152712
ZEND_VM_JMP(opline);
27162713
}
27172714

@@ -2743,9 +2740,6 @@ ZEND_VM_HANDLER(44, ZEND_JMPNZ, CONST|TMPVAR|CV, JMP_ADDR)
27432740
opline++;
27442741
}
27452742
FREE_OP1();
2746-
if (UNEXPECTED(EG(exception) != NULL)) {
2747-
HANDLE_EXCEPTION();
2748-
}
27492743
ZEND_VM_JMP(opline);
27502744
}
27512745

@@ -2780,9 +2774,6 @@ ZEND_VM_HANDLER(45, ZEND_JMPZNZ, CONST|TMPVAR|CV, JMP_ADDR, JMP_ADDR)
27802774
opline = OP_JMP_ADDR(opline, opline->op2);
27812775
}
27822776
FREE_OP1();
2783-
if (UNEXPECTED(EG(exception) != NULL)) {
2784-
HANDLE_EXCEPTION();
2785-
}
27862777
ZEND_VM_JMP(opline);
27872778
}
27882779

@@ -2823,9 +2814,6 @@ ZEND_VM_HANDLER(46, ZEND_JMPZ_EX, CONST|TMPVAR|CV, JMP_ADDR)
28232814
ZVAL_FALSE(EX_VAR(opline->result.var));
28242815
opline = OP_JMP_ADDR(opline, opline->op2);
28252816
}
2826-
if (UNEXPECTED(EG(exception) != NULL)) {
2827-
HANDLE_EXCEPTION();
2828-
}
28292817
ZEND_VM_JMP(opline);
28302818
}
28312819

@@ -2863,9 +2851,6 @@ ZEND_VM_HANDLER(47, ZEND_JMPNZ_EX, CONST|TMPVAR|CV, JMP_ADDR)
28632851
ZVAL_FALSE(EX_VAR(opline->result.var));
28642852
opline++;
28652853
}
2866-
if (UNEXPECTED(EG(exception) != NULL)) {
2867-
HANDLE_EXCEPTION();
2868-
}
28692854
ZEND_VM_JMP(opline);
28702855
}
28712856

‎Zend/zend_vm_execute.h

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2706,9 +2706,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZ_SPEC_CONST_HANDLER(ZEND_O
27062706
opline = OP_JMP_ADDR(opline, opline->op2);
27072707
}
27082708

2709-
if (UNEXPECTED(EG(exception) != NULL)) {
2710-
HANDLE_EXCEPTION();
2711-
}
27122709
ZEND_VM_JMP(opline);
27132710
}
27142711

@@ -2740,9 +2737,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPNZ_SPEC_CONST_HANDLER(ZEND_
27402737
opline++;
27412738
}
27422739

2743-
if (UNEXPECTED(EG(exception) != NULL)) {
2744-
HANDLE_EXCEPTION();
2745-
}
27462740
ZEND_VM_JMP(opline);
27472741
}
27482742

@@ -2777,9 +2771,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZNZ_SPEC_CONST_HANDLER(ZEND
27772771
opline = OP_JMP_ADDR(opline, opline->op2);
27782772
}
27792773

2780-
if (UNEXPECTED(EG(exception) != NULL)) {
2781-
HANDLE_EXCEPTION();
2782-
}
27832774
ZEND_VM_JMP(opline);
27842775
}
27852776

@@ -2820,9 +2811,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZ_EX_SPEC_CONST_HANDLER(ZEN
28202811
ZVAL_FALSE(EX_VAR(opline->result.var));
28212812
opline = OP_JMP_ADDR(opline, opline->op2);
28222813
}
2823-
if (UNEXPECTED(EG(exception) != NULL)) {
2824-
HANDLE_EXCEPTION();
2825-
}
28262814
ZEND_VM_JMP(opline);
28272815
}
28282816

@@ -2860,9 +2848,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPNZ_EX_SPEC_CONST_HANDLER(ZE
28602848
ZVAL_FALSE(EX_VAR(opline->result.var));
28612849
opline++;
28622850
}
2863-
if (UNEXPECTED(EG(exception) != NULL)) {
2864-
HANDLE_EXCEPTION();
2865-
}
28662851
ZEND_VM_JMP(opline);
28672852
}
28682853

@@ -34637,9 +34622,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZ_SPEC_CV_HANDLER(ZEND_OPCO
3463734622
opline = OP_JMP_ADDR(opline, opline->op2);
3463834623
}
3463934624

34640-
if (UNEXPECTED(EG(exception) != NULL)) {
34641-
HANDLE_EXCEPTION();
34642-
}
3464334625
ZEND_VM_JMP(opline);
3464434626
}
3464534627

@@ -34671,9 +34653,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPNZ_SPEC_CV_HANDLER(ZEND_OPC
3467134653
opline++;
3467234654
}
3467334655

34674-
if (UNEXPECTED(EG(exception) != NULL)) {
34675-
HANDLE_EXCEPTION();
34676-
}
3467734656
ZEND_VM_JMP(opline);
3467834657
}
3467934658

@@ -34708,9 +34687,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZNZ_SPEC_CV_HANDLER(ZEND_OP
3470834687
opline = OP_JMP_ADDR(opline, opline->op2);
3470934688
}
3471034689

34711-
if (UNEXPECTED(EG(exception) != NULL)) {
34712-
HANDLE_EXCEPTION();
34713-
}
3471434690
ZEND_VM_JMP(opline);
3471534691
}
3471634692

@@ -34751,9 +34727,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZ_EX_SPEC_CV_HANDLER(ZEND_O
3475134727
ZVAL_FALSE(EX_VAR(opline->result.var));
3475234728
opline = OP_JMP_ADDR(opline, opline->op2);
3475334729
}
34754-
if (UNEXPECTED(EG(exception) != NULL)) {
34755-
HANDLE_EXCEPTION();
34756-
}
3475734730
ZEND_VM_JMP(opline);
3475834731
}
3475934732

@@ -34791,9 +34764,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPNZ_EX_SPEC_CV_HANDLER(ZEND_
3479134764
ZVAL_FALSE(EX_VAR(opline->result.var));
3479234765
opline++;
3479334766
}
34794-
if (UNEXPECTED(EG(exception) != NULL)) {
34795-
HANDLE_EXCEPTION();
34796-
}
3479734767
ZEND_VM_JMP(opline);
3479834768
}
3479934769

@@ -51199,9 +51169,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZ_SPEC_TMPVAR_HANDLER(ZEND_
5119951169
opline = OP_JMP_ADDR(opline, opline->op2);
5120051170
}
5120151171
zval_ptr_dtor_nogc(free_op1);
51202-
if (UNEXPECTED(EG(exception) != NULL)) {
51203-
HANDLE_EXCEPTION();
51204-
}
5120551172
ZEND_VM_JMP(opline);
5120651173
}
5120751174

@@ -51233,9 +51200,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPNZ_SPEC_TMPVAR_HANDLER(ZEND
5123351200
opline++;
5123451201
}
5123551202
zval_ptr_dtor_nogc(free_op1);
51236-
if (UNEXPECTED(EG(exception) != NULL)) {
51237-
HANDLE_EXCEPTION();
51238-
}
5123951203
ZEND_VM_JMP(opline);
5124051204
}
5124151205

@@ -51270,9 +51234,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZNZ_SPEC_TMPVAR_HANDLER(ZEN
5127051234
opline = OP_JMP_ADDR(opline, opline->op2);
5127151235
}
5127251236
zval_ptr_dtor_nogc(free_op1);
51273-
if (UNEXPECTED(EG(exception) != NULL)) {
51274-
HANDLE_EXCEPTION();
51275-
}
5127651237
ZEND_VM_JMP(opline);
5127751238
}
5127851239

@@ -51313,9 +51274,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZ_EX_SPEC_TMPVAR_HANDLER(ZE
5131351274
ZVAL_FALSE(EX_VAR(opline->result.var));
5131451275
opline = OP_JMP_ADDR(opline, opline->op2);
5131551276
}
51316-
if (UNEXPECTED(EG(exception) != NULL)) {
51317-
HANDLE_EXCEPTION();
51318-
}
5131951277
ZEND_VM_JMP(opline);
5132051278
}
5132151279

@@ -51353,9 +51311,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPNZ_EX_SPEC_TMPVAR_HANDLER(Z
5135351311
ZVAL_FALSE(EX_VAR(opline->result.var));
5135451312
opline++;
5135551313
}
51356-
if (UNEXPECTED(EG(exception) != NULL)) {
51357-
HANDLE_EXCEPTION();
51358-
}
5135951314
ZEND_VM_JMP(opline);
5136051315
}
5136151316

0 commit comments

Comments
 (0)