Changes to opcache. Fixed AST dump. Proper NULL-handling in reflection.

Author: kooldev

Zend/tests/attributes/012-ast-export.phpt

@@ -21,21 +21,19 @@ assert(0 && ($a = function () {
 
 ?>
 --EXPECTF--
-Warning: assert(): assert(0 && ($a = <<A1>>
-<<A2>>
-function ($a, <<A3(1)>> $b) {
+Warning: assert(): assert(0 && ($a = <<A1>> <<A2>> function ($a, <<A3(1)>> $b) {
 })) failed in %s on line %d
 
-Warning: assert(): assert(0 && ($a = <<A1(1, 2, 1 + 2)>>
-fn() => 1)) failed in %s on line %d
+Warning: assert(): assert(0 && ($a = <<A1(1, 2, 1 + 2)>> fn() => 1)) failed in %s on line %d
 
 Warning: assert(): assert(0 && ($a = new <<A1>> class {
     <<A1>>
     <<A2>>
     const FOO = 'foo';
     <<A2>>
     public $x;
-    <<A3>> public function a() {
+    <<A3>>
+    public function a() {
     }
 
 })) failed in %s on line %d

Zend/zend_ast.c

@@ -1446,7 +1446,7 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio
 		case ZEND_AST_METHOD:
 			decl = (zend_ast_decl *) ast;
 			if (decl->attributes) {
-				zend_bool newlines = (ast->kind == ZEND_AST_CLOSURE || ast->kind == ZEND_AST_ARROW_FUNC);
+				zend_bool newlines = !(ast->kind == ZEND_AST_CLOSURE || ast->kind == ZEND_AST_ARROW_FUNC);
 				zend_ast_export_attributes(str, decl->attributes, indent, newlines);
 			}
 			if (decl->flags & ZEND_ACC_PUBLIC) {

Zend/zend_ast.h

@@ -315,12 +315,6 @@ static zend_always_inline zend_string *zend_ast_get_constant_name(zend_ast *ast)
 	return Z_STR(((zend_ast_zval *) ast)->val);
 }
 
-static zend_always_inline HashTable *zend_ast_get_hash(zend_ast *ast) {
-	zval *zv = zend_ast_get_zval(ast);
-	ZEND_ASSERT(Z_TYPE_P(zv) == IS_ARRAY);
-	return Z_ARR_P(zv);
-}
-
 static zend_always_inline uint32_t zend_ast_get_num_children(zend_ast *ast) {
 	ZEND_ASSERT(!zend_ast_is_list(ast));
 	return ast->kind >> ZEND_AST_NUM_CHILDREN_SHIFT;
@@ -334,12 +328,6 @@ static zend_always_inline uint32_t zend_ast_get_lineno(zend_ast *ast) {
 	}
 }
 
-static zend_always_inline zend_ast *zend_ast_create_zval_from_hash(HashTable *hash) {
-	zval zv;
-	ZVAL_ARR(&zv, hash);
-	return zend_ast_create_zval(&zv);
-}
-
 static zend_always_inline zend_ast *zend_ast_create_binary_op(uint32_t opcode, zend_ast *op0, zend_ast *op1) {
 	return zend_ast_create_ex(ZEND_AST_BINARY_OP, opcode, op0, op1);
 }

ext/opcache/zend_file_cache.c

@@ -404,25 +404,23 @@ static void zend_file_cache_serialize_attribute(zval                     *zv,
                                                 zend_file_cache_metainfo *info,
                                                 void                     *buf)
 {
-	if (!IS_SERIALIZED(Z_PTR_P(zv))) {
-		zend_attribute *attr = Z_PTR_P(zv);
-		uint32_t i;
+	zend_attribute *attr = Z_PTR_P(zv);
+	uint32_t i;
 
-		SERIALIZE_PTR(Z_PTR_P(zv));
-		attr = Z_PTR_P(zv);
-		UNSERIALIZE_PTR(attr);
+	SERIALIZE_PTR(Z_PTR_P(zv));
+	attr = Z_PTR_P(zv);
+	UNSERIALIZE_PTR(attr);
 
-		if (!IS_SERIALIZED(attr->name)) {
-			SERIALIZE_STR(attr->name);
-		}
+	if (!IS_SERIALIZED(attr->name)) {
+		SERIALIZE_STR(attr->name);
+	}
 
-		if (!IS_SERIALIZED(attr->lcname)) {
-			SERIALIZE_STR(attr->lcname);
-		}
+	if (!IS_SERIALIZED(attr->lcname)) {
+		SERIALIZE_STR(attr->lcname);
+	}
 
-		for (i = 0; i < attr->argc; i++) {
-			zend_file_cache_serialize_zval(&attr->argv[i], script, info, buf);
-		}
+	for (i = 0; i < attr->argc; i++) {
+		zend_file_cache_serialize_zval(&attr->argv[i], script, info, buf);
 	}
 }
 
@@ -1175,24 +1173,22 @@ static void zend_file_cache_unserialize_zval(zval                    *zv,
 
 static void zend_file_cache_unserialize_attribute(zval *zv, zend_persistent_script *script, void *buf)
 {
-	if (!IS_UNSERIALIZED(Z_PTR_P(zv))) {
-		zend_attribute *attr;
-		uint32_t i;
+	zend_attribute *attr;
+	uint32_t i;
 
-		UNSERIALIZE_PTR(Z_PTR_P(zv));
-		attr = Z_PTR_P(zv);
+	UNSERIALIZE_PTR(Z_PTR_P(zv));
+	attr = Z_PTR_P(zv);
 
-		if (!IS_UNSERIALIZED(attr->name)) {
-			UNSERIALIZE_STR(attr->name);
-		}
+	if (!IS_UNSERIALIZED(attr->name)) {
+		UNSERIALIZE_STR(attr->name);
+	}
 
-		if (!IS_UNSERIALIZED(attr->lcname)) {
-			UNSERIALIZE_STR(attr->lcname);
-		}
+	if (!IS_UNSERIALIZED(attr->lcname)) {
+		UNSERIALIZE_STR(attr->lcname);
+	}
 
-		for (i = 0; i < attr->argc; i++) {
-			zend_file_cache_unserialize_zval(&attr->argv[i], script, buf);
-		}
+	for (i = 0; i < attr->argc; i++) {
+		zend_file_cache_unserialize_zval(&attr->argv[i], script, buf);
 	}
 }
 

ext/opcache/zend_persist.c

@@ -271,7 +271,7 @@ static HashTable *zend_persist_attributes(HashTable *attributes)
 
 		ZEND_HASH_FOREACH_VAL(attributes, v) {
 			zend_attribute *attr = Z_PTR_P(v);
-			zend_attribute *copy = zend_shared_memdup(attr, ZEND_ATTRIBUTE_SIZE(attr->argc));
+			zend_attribute *copy = zend_shared_memdup_put_free(attr, ZEND_ATTRIBUTE_SIZE(attr->argc));
 
 			zend_accel_store_interned_string(copy->name);
 			zend_accel_store_interned_string(copy->lcname);
@@ -281,7 +281,6 @@ static HashTable *zend_persist_attributes(HashTable *attributes)
 			}
 
 			ZVAL_PTR(v, copy);
-			efree(attr);
 		} ZEND_HASH_FOREACH_END();
 
 		ptr = zend_shared_memdup_put_free(attributes, sizeof(HashTable));

ext/reflection/php_reflection.c

@@ -1150,7 +1150,7 @@ static void reflect_attributes(INTERNAL_FUNCTION_PARAMETERS, HashTable *attribut
 	zend_long flags = 0;
 	zend_class_entry *base = NULL;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|Sl", &name, &flags) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|S!l", &name, &flags) == FAILURE) {
 		RETURN_THROWS();
 	}