diff options
Diffstat (limited to 'ext/opcache')
| -rw-r--r-- | ext/opcache/Optimizer/compact_literals.c | 31 | ||||
| -rw-r--r-- | ext/opcache/zend_file_cache.c | 6 | ||||
| -rw-r--r-- | ext/opcache/zend_persist.c | 3 | ||||
| -rw-r--r-- | ext/opcache/zend_persist_calc.c | 3 |
4 files changed, 27 insertions, 16 deletions
diff --git a/ext/opcache/Optimizer/compact_literals.c b/ext/opcache/Optimizer/compact_literals.c index c72e8f6772..c20ddbd183 100644 --- a/ext/opcache/Optimizer/compact_literals.c +++ b/ext/opcache/Optimizer/compact_literals.c @@ -128,6 +128,7 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx void *checkpoint = zend_arena_checkpoint(ctx->arena); if (op_array->last_literal) { + cache_size = 0; info = (literal_info*)zend_arena_calloc(&ctx->arena, op_array->last_literal, sizeof(literal_info)); /* Mark literals of specific types */ @@ -286,6 +287,19 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx case ZEND_BIND_GLOBAL: LITERAL_INFO(opline->op2.constant, LITERAL_GLOBAL, 0, 1, 1); break; + case ZEND_RECV_INIT: + LITERAL_INFO(opline->op2.constant, LITERAL_VALUE, 0, 0, 1); + if (Z_CACHE_SLOT(op_array->literals[opline->op2.constant]) != -1) { + Z_CACHE_SLOT(op_array->literals[opline->op2.constant]) = cache_size; + cache_size += sizeof(void *); + } + break; + case ZEND_RECV: + case ZEND_VERIFY_RETURN_TYPE: + if (opline->op2.num != -1) { + opline->op2.num = cache_size; + cache_size += sizeof(void *); + } default: if (ZEND_OP1_TYPE(opline) == IS_CONST) { LITERAL_INFO(opline->op1.constant, LITERAL_VALUE, 1, 0, 1); @@ -319,7 +333,7 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx #endif /* Merge equal constants */ - j = 0; cache_size = 0; + j = 0; zend_hash_init(&hash, op_array->last_literal, NULL, NULL, 0); map = (int*)zend_arena_alloc(&ctx->arena, op_array->last_literal * sizeof(int)); memset(map, 0, op_array->last_literal * sizeof(int)); @@ -331,15 +345,24 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx } switch (Z_TYPE(op_array->literals[i])) { case IS_NULL: - if (l_null < 0) { - l_null = j; + if ((info[i].flags & LITERAL_MAY_MERGE)) { + if (l_null < 0) { + l_null = j; + if (i != j) { + op_array->literals[j] = op_array->literals[i]; + info[j] = info[i]; + } + j++; + } + map[i] = l_null; + } else { + map[i] = j; if (i != j) { op_array->literals[j] = op_array->literals[i]; info[j] = info[i]; } j++; } - map[i] = l_null; break; case IS_FALSE: if (l_false < 0) { diff --git a/ext/opcache/zend_file_cache.c b/ext/opcache/zend_file_cache.c index 10a149c9f6..219bb50820 100644 --- a/ext/opcache/zend_file_cache.c +++ b/ext/opcache/zend_file_cache.c @@ -438,9 +438,6 @@ static void zend_file_cache_serialize_op_array(zend_op_array *op_arra if (!IS_SERIALIZED(p->class_name)) { SERIALIZE_STR(p->class_name); } - if (p->class_name && !IS_SERIALIZED(p->lower_class_name)) { - SERIALIZE_STR(p->lower_class_name); - } p++; } } @@ -965,9 +962,6 @@ static void zend_file_cache_unserialize_op_array(zend_op_array *op_arr if (!IS_UNSERIALIZED(p->class_name)) { UNSERIALIZE_STR(p->class_name); } - if (p->class_name && !IS_UNSERIALIZED(p->lower_class_name)) { - UNSERIALIZE_STR(p->lower_class_name); - } p++; } } diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c index 585c34f46e..09eebe0d02 100644 --- a/ext/opcache/zend_persist.c +++ b/ext/opcache/zend_persist.c @@ -581,9 +581,6 @@ static void zend_persist_op_array_ex(zend_op_array *op_array, zend_persistent_sc } if (arg_info[i].class_name) { zend_accel_store_interned_string(arg_info[i].class_name); - if (arg_info[i].lower_class_name) { - zend_accel_store_interned_string(arg_info[i].lower_class_name); - } } } } diff --git a/ext/opcache/zend_persist_calc.c b/ext/opcache/zend_persist_calc.c index d721db2feb..98412109a5 100644 --- a/ext/opcache/zend_persist_calc.c +++ b/ext/opcache/zend_persist_calc.c @@ -225,9 +225,6 @@ static void zend_persist_op_array_calc_ex(zend_op_array *op_array) } if (arg_info[i].class_name) { ADD_INTERNED_STRING(arg_info[i].class_name, 1); - if (arg_info[i].lower_class_name) { - ADD_INTERNED_STRING(arg_info[i].lower_class_name, 1); - } } } } |