Check asserts early

Author: dstogov

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);

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);
 		}

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);
 		}