fix opcache

Author: withinboredom

Zend/zend_compile.c

@@ -2943,9 +2943,7 @@ static void zend_compile_inner_class_ref(znode *result, zend_ast *ast, uint32_t
 		zend_compile_expr(&inner_node, inner_class);
 	}
 
-	zend_op *opline = zend_emit_op(result, ZEND_FETCH_INNER_CLASS, &outer_node, &inner_node);
-	// ensure we allocate two slots to prevent an issue with static method access
-	opline->extended_value = zend_alloc_cache_slots(2);
+	zend_emit_op(result, ZEND_FETCH_INNER_CLASS, &outer_node, &inner_node);
 }
 /* }}} */
 
@@ -9222,6 +9220,7 @@ static void zend_compile_class_decl(znode *result, zend_ast *ast, bool toplevel)
 		} else {
 			name = zend_prefix_with_ns(unqualified_name);
 			ce->required_scope = NULL;
+			ce->lexical_scope = NULL;
 		}
 		name = zend_new_interned_string(name);
 		lcname = zend_string_tolower(name);

Zend/zend_execute.c

@@ -1061,7 +1061,7 @@ static zend_always_inline bool zend_check_class_visibility(const zend_class_entr
 			return 0;
 		}
 
-		return 0;
+		return 1;
 	}
 
 	// a private class is visible if it is the same class as the lexical scope and the current visibility is private
@@ -1088,14 +1088,6 @@ static zend_always_inline bool i_zend_verify_property_type(const zend_property_i
 		return 1;
 	}
 
-        // todo:
-        // 1: add a flag to the type so we can tell the type is an inner class
-        // 2: use said flag to flag the property info
-        // 3: same with parameters/args too
-        // 4: create a simple function to take a visibility flag and ce, it should return SUCCESS if the ce can be used
-        // 5: if we have an inner class in a prop/arg, we validate it can be returned (do not autoload) by looping over types
-        //    that are inner classes and looking up the ce. If it is not autoloaded, then it is not going to match the type anyway.
-
 	zend_verify_property_type_error(info, property);
 	return 0;
 }

Zend/zend_vm_execute.h

@@ -1131,6 +1131,15 @@ void zend_update_required_scope(zend_class_entry *ce)
 			ce->required_scope = r;
 		}
 	}
+
+	if (ce->lexical_scope) {
+		zend_class_entry *lexical_scope = ce->lexical_scope;
+
+		zend_class_entry *l = zend_shared_alloc_get_xlat_entry(lexical_scope);
+		if (l) {
+			ce->lexical_scope = l;
+		}
+	}
 }
 
 void zend_update_parent_ce(zend_class_entry *ce)