Skip to content

Commit 26adba3

Browse files
committed
Micro-optimization
1 parent 6d52492 commit 26adba3

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

Zend/zend_vm_def.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ ZEND_VM_HANDLER(8, ZEND_CONCAT, CONST|TMPVAR|CV, CONST|TMPVAR|CV)
290290
!ZSTR_IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
291291
size_t len = ZSTR_LEN(op1_str);
292292

293-
str = zend_string_realloc(op1_str, len + ZSTR_LEN(op2_str), 0);
293+
str = zend_string_extend(op1_str, len + ZSTR_LEN(op2_str), 0);
294294
memcpy(ZSTR_VAL(str) + len, ZSTR_VAL(op2_str), ZSTR_LEN(op2_str)+1);
295295
ZVAL_NEW_STR(EX_VAR(opline->result.var), str);
296296
break;

Zend/zend_vm_execute.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4295,7 +4295,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_CONST_CONST_HANDLE
42954295
!ZSTR_IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
42964296
size_t len = ZSTR_LEN(op1_str);
42974297

4298-
str = zend_string_realloc(op1_str, len + ZSTR_LEN(op2_str), 0);
4298+
str = zend_string_extend(op1_str, len + ZSTR_LEN(op2_str), 0);
42994299
memcpy(ZSTR_VAL(str) + len, ZSTR_VAL(op2_str), ZSTR_LEN(op2_str)+1);
43004300
ZVAL_NEW_STR(EX_VAR(opline->result.var), str);
43014301
break;
@@ -8187,7 +8187,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_CONST_CV_HANDLER(Z
81878187
!ZSTR_IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
81888188
size_t len = ZSTR_LEN(op1_str);
81898189

8190-
str = zend_string_realloc(op1_str, len + ZSTR_LEN(op2_str), 0);
8190+
str = zend_string_extend(op1_str, len + ZSTR_LEN(op2_str), 0);
81918191
memcpy(ZSTR_VAL(str) + len, ZSTR_VAL(op2_str), ZSTR_LEN(op2_str)+1);
81928192
ZVAL_NEW_STR(EX_VAR(opline->result.var), str);
81938193
break;
@@ -10060,7 +10060,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_CONST_TMPVAR_HANDL
1006010060
!ZSTR_IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
1006110061
size_t len = ZSTR_LEN(op1_str);
1006210062

10063-
str = zend_string_realloc(op1_str, len + ZSTR_LEN(op2_str), 0);
10063+
str = zend_string_extend(op1_str, len + ZSTR_LEN(op2_str), 0);
1006410064
memcpy(ZSTR_VAL(str) + len, ZSTR_VAL(op2_str), ZSTR_LEN(op2_str)+1);
1006510065
ZVAL_NEW_STR(EX_VAR(opline->result.var), str);
1006610066
break;
@@ -36347,7 +36347,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_CV_CONST_HANDLER(Z
3634736347
!ZSTR_IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
3634836348
size_t len = ZSTR_LEN(op1_str);
3634936349

36350-
str = zend_string_realloc(op1_str, len + ZSTR_LEN(op2_str), 0);
36350+
str = zend_string_extend(op1_str, len + ZSTR_LEN(op2_str), 0);
3635136351
memcpy(ZSTR_VAL(str) + len, ZSTR_VAL(op2_str), ZSTR_LEN(op2_str)+1);
3635236352
ZVAL_NEW_STR(EX_VAR(opline->result.var), str);
3635336353
break;
@@ -43001,7 +43001,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_CV_CV_HANDLER(ZEND
4300143001
!ZSTR_IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
4300243002
size_t len = ZSTR_LEN(op1_str);
4300343003

43004-
str = zend_string_realloc(op1_str, len + ZSTR_LEN(op2_str), 0);
43004+
str = zend_string_extend(op1_str, len + ZSTR_LEN(op2_str), 0);
4300543005
memcpy(ZSTR_VAL(str) + len, ZSTR_VAL(op2_str), ZSTR_LEN(op2_str)+1);
4300643006
ZVAL_NEW_STR(EX_VAR(opline->result.var), str);
4300743007
break;
@@ -46675,7 +46675,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_CV_TMPVAR_HANDLER(
4667546675
!ZSTR_IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
4667646676
size_t len = ZSTR_LEN(op1_str);
4667746677

46678-
str = zend_string_realloc(op1_str, len + ZSTR_LEN(op2_str), 0);
46678+
str = zend_string_extend(op1_str, len + ZSTR_LEN(op2_str), 0);
4667946679
memcpy(ZSTR_VAL(str) + len, ZSTR_VAL(op2_str), ZSTR_LEN(op2_str)+1);
4668046680
ZVAL_NEW_STR(EX_VAR(opline->result.var), str);
4668146681
break;
@@ -50594,7 +50594,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_TMPVAR_CONST_HANDL
5059450594
!ZSTR_IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
5059550595
size_t len = ZSTR_LEN(op1_str);
5059650596

50597-
str = zend_string_realloc(op1_str, len + ZSTR_LEN(op2_str), 0);
50597+
str = zend_string_extend(op1_str, len + ZSTR_LEN(op2_str), 0);
5059850598
memcpy(ZSTR_VAL(str) + len, ZSTR_VAL(op2_str), ZSTR_LEN(op2_str)+1);
5059950599
ZVAL_NEW_STR(EX_VAR(opline->result.var), str);
5060050600
break;
@@ -52996,7 +52996,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_TMPVAR_CV_HANDLER(
5299652996
!ZSTR_IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
5299752997
size_t len = ZSTR_LEN(op1_str);
5299852998

52999-
str = zend_string_realloc(op1_str, len + ZSTR_LEN(op2_str), 0);
52999+
str = zend_string_extend(op1_str, len + ZSTR_LEN(op2_str), 0);
5300053000
memcpy(ZSTR_VAL(str) + len, ZSTR_VAL(op2_str), ZSTR_LEN(op2_str)+1);
5300153001
ZVAL_NEW_STR(EX_VAR(opline->result.var), str);
5300253002
break;
@@ -54160,7 +54160,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_TMPVAR_TMPVAR_HAND
5416054160
!ZSTR_IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
5416154161
size_t len = ZSTR_LEN(op1_str);
5416254162

54163-
str = zend_string_realloc(op1_str, len + ZSTR_LEN(op2_str), 0);
54163+
str = zend_string_extend(op1_str, len + ZSTR_LEN(op2_str), 0);
5416454164
memcpy(ZSTR_VAL(str) + len, ZSTR_VAL(op2_str), ZSTR_LEN(op2_str)+1);
5416554165
ZVAL_NEW_STR(EX_VAR(opline->result.var), str);
5416654166
break;

0 commit comments

Comments
 (0)