Throw the exception inside the non instantiable constructor

Author: Girgias

Zend/zend_compile.c

@@ -9531,6 +9531,8 @@ static void zend_compile_enum_backing_type(zend_class_entry *ce, zend_ast *enum_
 
 static ZEND_FUNCTION(non_instantiable_constructor)
 {
+	ZEND_ASSERT(hasThis());
+	zend_cannot_instantiate_class(Z_OBJCE_P(ZEND_THIS), NULL);
 }
 
 static zend_arg_info zend_non_instantiable_constructor_arg_info[1] = {0};

Zend/zend_vm_def.h

@@ -6002,13 +6002,7 @@ ZEND_VM_HANDLER(68, ZEND_NEW, UNUSED|CLASS_FETCH|CONST|VAR, UNUSED|CACHE_SLOT, N
 	}
 
 	result = EX_VAR(opline->result.var);
-	const zend_class_entry *scope = EX(func)->op_array.scope;
-	if (UNEXPECTED(!zend_check_class_is_instantiable_or_throw(ce, scope))) {
-		ZVAL_UNDEF(result);
-		HANDLE_EXCEPTION();
-	}
-
-	if (UNEXPECTED(object_init_instantiable_class(result, ce) != SUCCESS)) {
+	if (UNEXPECTED(object_init_ex(result, ce) != SUCCESS)) {
 		ZVAL_UNDEF(result);
 		HANDLE_EXCEPTION();
 	}