Drop HAS_UNLINKED_USES flag

Instead always use the unlinked_uses table, which is already used
if opcache is used. Not much point in having a different mechanism
for the non-opcache case.

Author: nikic

Zend/zend_compile.h

@@ -241,7 +241,7 @@ typedef struct _zend_oparray_context {
 /* or IS_CONSTANT_VISITED_MARK                            |     |     |     */
 #define ZEND_CLASS_CONST_IS_CASE         (1 << 6)  /*     |     |     |  X  */
 /*                                                        |     |     |     */
-/* Class Flags (unused: 15,30,31)                         |     |     |     */
+/* Class Flags (unused: 15,21,30,31)                      |     |     |     */
 /* ===========                                            |     |     |     */
 /*                                                        |     |     |     */
 /* Special class types                                    |     |     |     */
@@ -285,9 +285,6 @@ typedef struct _zend_oparray_context {
 /* Class is linked apart from variance obligations.       |     |     |     */
 #define ZEND_ACC_NEARLY_LINKED           (1 << 20) /*  X  |     |     |     */
 /*                                                        |     |     |     */
-/* Whether this class was used in its unlinked state.     |     |     |     */
-#define ZEND_ACC_HAS_UNLINKED_USES       (1 << 21) /*  X  |     |     |     */
-/*                                                        |     |     |     */
 /* stored in opcache (may be partially)                   |     |     |     */
 #define ZEND_ACC_CACHED                  (1 << 22) /*  X  |     |     |     */
 /*                                                        |     |     |     */

Zend/zend_execute_API.c

@@ -1055,15 +1055,11 @@ ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, zend_string *
 			if ((flags & ZEND_FETCH_CLASS_ALLOW_UNLINKED) ||
 				((flags & ZEND_FETCH_CLASS_ALLOW_NEARLY_LINKED) &&
 					(ce->ce_flags & ZEND_ACC_NEARLY_LINKED))) {
-				if (ce->ce_flags & ZEND_ACC_IMMUTABLE) {
-					if (!CG(unlinked_uses)) {
-						ALLOC_HASHTABLE(CG(unlinked_uses));
-						zend_hash_init(CG(unlinked_uses), 0, NULL, NULL, 0);
-					}
-					zend_hash_index_add_empty_element(CG(unlinked_uses), (zend_long)(zend_uintptr_t)ce);
-				} else {
-					ce->ce_flags |= ZEND_ACC_HAS_UNLINKED_USES;
+				if (!CG(unlinked_uses)) {
+					ALLOC_HASHTABLE(CG(unlinked_uses));
+					zend_hash_init(CG(unlinked_uses), 0, NULL, NULL, 0);
 				}
+				zend_hash_index_add_empty_element(CG(unlinked_uses), (zend_long)(zend_uintptr_t)ce);
 				return ce;
 			}
 			return NULL;

Zend/zend_inheritance.c

@@ -2570,10 +2570,8 @@ static void check_unrecoverable_load_failure(zend_class_entry *ce) {
 	 * to remove the class from the class table and throw an exception, because there is already
 	 * a dependence on the inheritance hierarchy of this specific class. Instead we fall back to
 	 * a fatal error, as would happen if we did not allow exceptions in the first place. */
-	if ((ce->ce_flags & ZEND_ACC_HAS_UNLINKED_USES)
-	 || ((ce->ce_flags & ZEND_ACC_IMMUTABLE)
-	  && CG(unlinked_uses)
-	  && zend_hash_index_del(CG(unlinked_uses), (zend_long)(zend_uintptr_t)ce) == SUCCESS)) {
+	if (CG(unlinked_uses)
+			&& zend_hash_index_del(CG(unlinked_uses), (zend_long)(zend_uintptr_t)ce) == SUCCESS) {
 		zend_exception_uncaught_error(
 			"During inheritance of %s with variance dependencies", ZSTR_VAL(ce->name));
 	}
@@ -2847,20 +2845,16 @@ ZEND_API zend_class_entry *zend_do_link_class(zend_class_entry *ce, zend_string
 		ce = zend_lazy_class_load(ce);
 		zv = zend_hash_find_known_hash(CG(class_table), key);
 		Z_CE_P(zv) = ce;
-		if (CG(unlinked_uses)
-		 && zend_hash_index_del(CG(unlinked_uses), (zend_long)(zend_uintptr_t)proto) == SUCCESS) {
-			ce->ce_flags |= ZEND_ACC_HAS_UNLINKED_USES;
-		}
 	} else if (ce->ce_flags & ZEND_ACC_FILE_CACHED) {
 		/* Lazy class loading */
 		ce = zend_lazy_class_load(ce);
 		ce->ce_flags &= ~ZEND_ACC_FILE_CACHED;
 		zv = zend_hash_find_known_hash(CG(class_table), key);
 		Z_CE_P(zv) = ce;
-		if (CG(unlinked_uses)
-		 && zend_hash_index_del(CG(unlinked_uses), (zend_long)(zend_uintptr_t)proto) == SUCCESS) {
-			ce->ce_flags |= ZEND_ACC_HAS_UNLINKED_USES;
-		}
+	}
+
+	if (CG(unlinked_uses)) {
+		zend_hash_index_del(CG(unlinked_uses), (zend_long)(zend_uintptr_t) ce);
 	}
 
 	orig_linking_class = CG(current_linking_class);