archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

63911: Compare opcodes of the op_array to determine different functions

Browse source
This commit is contained in:
Pedro Magalhães 2017-09-30 21:24:38 +01:00 • committed by krakjoe
parent f3545165b2
commit 179ed6e43d
No known key found for this signature in database
GPG key ID: F9BA0ADA31CBD89E
3 changed files with 33 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Zend/zend_inheritance.c
View file

@ -1165,6 +1165,11 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_s
zend_function *new_fn;
if ((existing_fn = zend_hash_find_ptr(&ce->function_table, key)) != NULL) {
/* if it is the same function regardless of where it is coming from, there is no conflict and we do not need to add it again */
if (existing_fn->op_array.opcodes == fn->op_array.opcodes) {
return;
}
if (existing_fn->common.scope == ce) {
/* members from the current class override trait methods */
/* use temporary *overriden HashTable to detect hidden conflict */