Check asserts early

dstogov · dstogov · commit c5159b383218 · 2020-03-12T22:26:30.000+03:00
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -1075,14 +1075,14 @@ ZEND_API int do_bind_class(zval *lcname, zend_string *lc_parent_name) /* {{{ */
 			return FAILURE;
 		} else {
 			do {
+				ZEND_ASSERT(EG(current_execute_data)->func->op_array.fn_flags & ZEND_ACC_PRELOADED);
 				if (zend_preload_autoload
 				  && zend_preload_autoload(EG(current_execute_data)->func->op_array.filename) == SUCCESS) {
 					zv = zend_hash_find_ex(EG(class_table), Z_STR_P(rtd_key), 1);
 					if (EXPECTED(zv != NULL)) {
 						break;
 					}
 				}
-				ZEND_ASSERT(EG(current_execute_data)->func->op_array.fn_flags & ZEND_ACC_PRELOADED);
 				zend_error_noreturn(E_ERROR, "Class %s wasn't preloaded", Z_STRVAL_P(lcname));
 				return FAILURE;
 			} while (0);
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -7318,14 +7318,14 @@ ZEND_VM_HANDLER(146, ZEND_DECLARE_ANON_CLASS, ANY, ANY, CACHE_SLOT)
 		if (UNEXPECTED(zv == NULL)) {
 			SAVE_OPLINE();
 			do {
+				ZEND_ASSERT(EX(func)->op_array.fn_flags & ZEND_ACC_PRELOADED);
 				if (zend_preload_autoload
 				  && zend_preload_autoload(EX(func)->op_array.filename) == SUCCESS) {
 					zv = zend_hash_find_ex(EG(class_table), rtd_key, 1);
 					if (EXPECTED(zv != NULL)) {
 						break;
 					}
 				}
-				ZEND_ASSERT(EX(func)->op_array.fn_flags & ZEND_ACC_PRELOADED);
 				zend_error_noreturn(E_ERROR, "Anonymous class wasn't preloaded");
 			} while (0);
 		}
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -2450,14 +2450,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DECLARE_ANON_CLASS_SPEC_HANDLE
 		if (UNEXPECTED(zv == NULL)) {
 			SAVE_OPLINE();
 			do {
+				ZEND_ASSERT(EX(func)->op_array.fn_flags & ZEND_ACC_PRELOADED);
 				if (zend_preload_autoload
 				  && zend_preload_autoload(EX(func)->op_array.filename) == SUCCESS) {
 					zv = zend_hash_find_ex(EG(class_table), rtd_key, 1);
 					if (EXPECTED(zv != NULL)) {
 						break;
 					}
 				}
-				ZEND_ASSERT(EX(func)->op_array.fn_flags & ZEND_ACC_PRELOADED);
 				zend_error_noreturn(E_ERROR, "Anonymous class wasn't preloaded");
 			} while (0);
 		}

Original file line number	Diff line number	Diff line change
`@@ -7318,14 +7318,14 @@ ZEND_VM_HANDLER(146, ZEND_DECLARE_ANON_CLASS, ANY, ANY, CACHE_SLOT)`
`7318`	`7318`	`if (UNEXPECTED(zv == NULL)) {`
`7319`	`7319`	`SAVE_OPLINE();`
`7320`	`7320`	`do {`
	`7321`	`+ ZEND_ASSERT(EX(func)->op_array.fn_flags & ZEND_ACC_PRELOADED);`
`7321`	`7322`	`if (zend_preload_autoload`
`7322`	`7323`	`&& zend_preload_autoload(EX(func)->op_array.filename) == SUCCESS) {`
`7323`	`7324`	`zv = zend_hash_find_ex(EG(class_table), rtd_key, 1);`
`7324`	`7325`	`if (EXPECTED(zv != NULL)) {`
`7325`	`7326`	`break;`
`7326`	`7327`	`}`
`7327`	`7328`	`}`
`7328`		`- ZEND_ASSERT(EX(func)->op_array.fn_flags & ZEND_ACC_PRELOADED);`
`7329`	`7329`	`zend_error_noreturn(E_ERROR, "Anonymous class wasn't preloaded");`
`7330`	`7330`	`} while (0);`
`7331`	`7331`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2450,14 +2450,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DECLARE_ANON_CLASS_SPEC_HANDLE`
`2450`	`2450`	`if (UNEXPECTED(zv == NULL)) {`
`2451`	`2451`	`SAVE_OPLINE();`
`2452`	`2452`	`do {`
	`2453`	`+ ZEND_ASSERT(EX(func)->op_array.fn_flags & ZEND_ACC_PRELOADED);`
`2453`	`2454`	`if (zend_preload_autoload`
`2454`	`2455`	`&& zend_preload_autoload(EX(func)->op_array.filename) == SUCCESS) {`
`2455`	`2456`	`zv = zend_hash_find_ex(EG(class_table), rtd_key, 1);`
`2456`	`2457`	`if (EXPECTED(zv != NULL)) {`
`2457`	`2458`	`break;`
`2458`	`2459`	`}`
`2459`	`2460`	`}`
`2460`		`- ZEND_ASSERT(EX(func)->op_array.fn_flags & ZEND_ACC_PRELOADED);`
`2461`	`2461`	`zend_error_noreturn(E_ERROR, "Anonymous class wasn't preloaded");`
`2462`	`2462`	`} while (0);`
`2463`	`2463`	`}`