Opcache?

Author: TimWolla

ext/opcache/zend_persist.c

@@ -169,12 +169,18 @@ static void zend_hash_persist(HashTable *ht)
 	}
 }
 
+static void zend_persist_op_array(zval *zv);
+
 static zend_ast *zend_persist_ast(zend_ast *ast)
 {
 	uint32_t i;
 	zend_ast *node;
 
-	if (ast->kind == ZEND_AST_ZVAL || ast->kind == ZEND_AST_CONSTANT) {
+	if (ast->kind == ZEND_AST_CLOSURE_CONSTEXPR) {
+		uint32_t children = zend_ast_get_num_children(ast);
+		node = zend_shared_memdup(ast, zend_ast_size(children));
+		zend_persist_op_array(zend_ast_get_zval(node->child[0]));
+	} else if (ast->kind == ZEND_AST_ZVAL || ast->kind == ZEND_AST_CONSTANT) {
 		zend_ast_zval *copy = zend_shared_memdup(ast, sizeof(zend_ast_zval));
 		zend_persist_zval(&copy->val);
 		node = (zend_ast *) copy;

ext/opcache/zend_persist_calc.c

@@ -71,11 +71,16 @@ static void zend_hash_persist_calc(HashTable *ht)
 	}
 }
 
+static void zend_persist_op_array_calc(zval *zv);
+
 static void zend_persist_ast_calc(zend_ast *ast)
 {
 	uint32_t i;
 
-	if (ast->kind == ZEND_AST_ZVAL || ast->kind == ZEND_AST_CONSTANT) {
+	if (ast->kind == ZEND_AST_CLOSURE_CONSTEXPR) {
+		ADD_SIZE(sizeof(zend_ast_zval));
+		zend_persist_op_array_calc(zend_ast_get_zval(ast->child[0]));
+	} else if (ast->kind == ZEND_AST_ZVAL || ast->kind == ZEND_AST_CONSTANT) {
 		ADD_SIZE(sizeof(zend_ast_zval));
 		zend_persist_zval_calc(&((zend_ast_zval*)(ast))->val);
 	} else if (zend_ast_is_list(ast)) {