Fixed map_ptr slot sharing for trait/self

dstogov · dstogov · commit a8f6d44c1c36 · 2021-02-10T17:59:11.000+03:00
diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c
@@ -296,7 +296,7 @@ uint32_t zend_accel_get_type_map_ptr(zend_string *type_name, zend_class_entry *s
 	uint32_t ret;
 
 	if (zend_string_equals_literal_ci(type_name, "self")) {
-		if (!scope) {
+		if (!scope || (scope->ce_flags & ZEND_ACC_TRAIT)) {
 			return 0;
 		}
 		type_name = scope->name;

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ uint32_t zend_accel_get_type_map_ptr(zend_string type_name, zend_class_entry s`
`296`	`296`	`uint32_t ret;`
`297`	`297`
`298`	`298`	`if (zend_string_equals_literal_ci(type_name, "self")) {`
`299`		`- if (!scope) {`
	`299`	`+ if (!scope \|\| (scope->ce_flags & ZEND_ACC_TRAIT)) {`
`300`	`300`	`return 0;`
`301`	`301`	`}`
`302`	`302`	`type_name = scope->name;`