com php-src: Make list of opcodes used for nesting calculation consistent with `zend_do_convert_call_user_func()` i n Zend/zend_compile.c:
Zend/zend_vm_def.h Zen d/zend_vm_execute.h
| From: | Tjerk Anne Meesters | Date: | Sat, 16 Aug 2014 15:47:21 +0000 |
| Subject: | com php-src: Make list of opcodes used for nesting calculation consistent with `zend_do_convert_call_user_func()` i n Zend/zend_compile.c: Zend/zend_vm_def.h Zen d/zend_vm_execute.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82121@lists.php.net to get a copy of this message | ||
Commit: a1a4ba95117cca77b6a669d01b1cf97ea4fcb507
Author: Timm Friebe <thekid@thekid.de> Sat, 16 Aug 2014 17:47:21 +0200
Parents: c3d214aa0822d00b9e2171f148126966340ef534
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a1a4ba95117cca77b6a669d01b1cf97ea4fcb507
Log:
Make list of opcodes used for nesting calculation consistent
with
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 378e3f1..4309277 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2231,7 +2231,6 @@ ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_CALL, TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV) /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -2239,15 +2238,12 @@ ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_CALL, TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV) opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 51a5476..bee9b09 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -9563,7 +9563,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_CONST_HANDLER(ZEND_OPCO /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -9571,15 +9570,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_CONST_HANDLER(ZEND_OPCO opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -10440,7 +10436,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -10448,15 +10443,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -11320,7 +11312,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -11328,15 +11319,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -12752,7 +12740,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_ /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -12760,15 +12747,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_ opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -16168,7 +16152,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZEND_OPCO /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -16176,15 +16159,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZEND_OPCO opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -18443,7 +18423,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -18451,15 +18430,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -20690,7 +20666,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -20698,15 +20673,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -24116,7 +24088,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_ /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -24124,15 +24095,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_ opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -25740,7 +25708,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CONST_HANDLER(ZEND_O /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -25748,15 +25715,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CONST_HANDLER(ZEND_O opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -27156,7 +27120,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_TMP_HANDLER(ZEND_OPC /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -27164,15 +27127,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_TMP_HANDLER(ZEND_OPC opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -28478,7 +28438,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_VAR_HANDLER(ZEND_OPC /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -28486,15 +28445,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_VAR_HANDLER(ZEND_OPC opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -30310,7 +30266,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCO /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -30318,15 +30273,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCO opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -33698,7 +33650,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CONST_HANDLER(ZEND_OPCOD /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -33706,15 +33657,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CONST_HANDLER(ZEND_OPCOD opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -35786,7 +35734,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_ /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -35794,15 +35741,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_ opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -37912,7 +37856,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_ /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -37920,15 +37863,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_ opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -41081,7 +41021,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_H /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -41089,15 +41028,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_H opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) {
zend_do_convert_call_user_func() in Zend/zend_compile.c
Changed paths:
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 378e3f1..4309277 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2231,7 +2231,6 @@ ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_CALL, TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV) /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -2239,15 +2238,12 @@ ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_CALL, TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV) opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 51a5476..bee9b09 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -9563,7 +9563,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_CONST_HANDLER(ZEND_OPCO /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -9571,15 +9570,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_CONST_HANDLER(ZEND_OPCO opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -10440,7 +10436,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -10448,15 +10443,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -11320,7 +11312,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -11328,15 +11319,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -12752,7 +12740,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_ /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -12760,15 +12747,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_ opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -16168,7 +16152,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZEND_OPCO /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -16176,15 +16159,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZEND_OPCO opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -18443,7 +18423,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -18451,15 +18430,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -20690,7 +20666,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -20698,15 +20673,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -24116,7 +24088,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_ /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -24124,15 +24095,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_ opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -25740,7 +25708,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CONST_HANDLER(ZEND_O /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -25748,15 +25715,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CONST_HANDLER(ZEND_O opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -27156,7 +27120,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_TMP_HANDLER(ZEND_OPC /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -27164,15 +27127,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_TMP_HANDLER(ZEND_OPC opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -28478,7 +28438,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_VAR_HANDLER(ZEND_OPC /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -28486,15 +28445,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_VAR_HANDLER(ZEND_OPC opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -30310,7 +30266,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCO /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -30318,15 +30273,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCO opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -33698,7 +33650,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CONST_HANDLER(ZEND_OPCOD /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -33706,15 +33657,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CONST_HANDLER(ZEND_OPCOD opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -35786,7 +35734,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_ /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -35794,15 +35741,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_ opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -37912,7 +37856,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_ /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -37920,15 +37863,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_ opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) { @@ -41081,7 +41021,6 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_H /* No exception raised: Skip over arguments until fcall opcode with correct * nesting level. Return NULL (except when return value unused) */ do { - /* fprintf(stderr, "SKIP %s => ", zend_get_opcode_name(opline->opcode)); */ opline++; if (opline->opcode == ZEND_INIT_FCALL || @@ -41089,15 +41028,12 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_H opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_METHOD_CALL || opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || - opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_NEW ) { nesting++; } else if (opline->opcode == ZEND_DO_FCALL) { nesting--; } - - /* fprintf(stderr, "%s %d\n", zend_get_opcode_name(opline->opcode), nesting); */ } while (nesting); if (RETURN_VALUE_USED(opline)) {