get working with opcache

Author: withinboredom

Zend/zend_compile.c

@@ -9164,6 +9164,7 @@ static void zend_compile_class_decl(znode *result, zend_ast *ast, bool toplevel)
 
 			zval name_zv;
 			ZVAL_STR(&name_zv, name);
+			GC_ADDREF(name);
 
 			// configure the current ce->flags for a nested class. This should only include:
 			// - final
@@ -9182,8 +9183,12 @@ static void zend_compile_class_decl(znode *result, zend_ast *ast, bool toplevel)
 			// - a constant that contains the name of the nested class
 			// this "tricks" the engine into thinking that the nested class is a normal class
 			zend_type t = ZEND_TYPE_INIT_CODE(IS_STRING, 0, 0);
-			zend_declare_typed_property(CG(active_class_entry), unqualified_name, &name_zv, propFlags | ZEND_ACC_STATIC | ZEND_ACC_READONLY, decl->doc_comment, t);
-			zend_declare_class_constant_ex(CG(active_class_entry), unqualified_name, &name_zv, propFlags, decl->doc_comment);
+			zval propz, constz;
+			ZVAL_COPY_OR_DUP(&propz, &name_zv);
+			ZVAL_COPY_OR_DUP(&constz, &name_zv);
+			zend_declare_typed_property(CG(active_class_entry), unqualified_name, &propz, propFlags | ZEND_ACC_STATIC | ZEND_ACC_READONLY, decl->doc_comment, t);
+			zend_declare_class_constant_ex(CG(active_class_entry), unqualified_name, &constz, propFlags, decl->doc_comment);
+			ZVAL_PTR_DTOR(&name_zv);
 
 			// if a class is private or protected, we need to require scope for type checks
 			ce->required_scope = propFlags & (ZEND_ACC_PROTECTED|ZEND_ACC_PRIVATE) ? CG(active_class_entry) : NULL;

ext/opcache/zend_persist.c

@@ -1117,6 +1117,18 @@ zend_class_entry *zend_persist_class_entry(zend_class_entry *orig_ce)
 	return ce;
 }
 
+void zend_update_required_scope(zend_class_entry *ce)
+{
+	if (ce->required_scope) {
+		zend_class_entry *required_scope = ce->required_scope;
+
+		zend_class_entry *r = zend_shared_alloc_get_xlat_entry(required_scope);
+		if (r) {
+			ce->required_scope = r;
+		}
+	}
+}
+
 void zend_update_parent_ce(zend_class_entry *ce)
 {
 	if (ce->ce_flags & ZEND_ACC_LINKED) {
@@ -1290,6 +1302,7 @@ static void zend_accel_persist_class_table(HashTable *class_table)
 		if (EXPECTED(Z_TYPE(p->val) != IS_ALIAS_PTR)) {
 			ce = Z_PTR(p->val);
 			zend_update_parent_ce(ce);
+			zend_update_required_scope(ce);
 		}
 	} ZEND_HASH_FOREACH_END();
 #ifdef HAVE_JIT