Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:79332
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain zend.com designates 209.85.220.180 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <CAFMT4Np+-oSRYkZcajHcw0eqzXrs1gvGkhNB-nRxk39wO1S1dA@mail.gmail.com>
References: <CA+9eiLs+3CXmHcu0wsP76reFseWw=oFTKD_Svn20zCh=kzdMZg@mail.gmail.com>
	<CAFMT4Np+-oSRYkZcajHcw0eqzXrs1gvGkhNB-nRxk39wO1S1dA@mail.gmail.com>
Date: Mon, 1 Dec 2014 12:02:41 +0400
Message-ID: <CA+9eiLvnVqRYnbd2h+EOiP2Tww+6OEcsGMw+4qfi8z=7Xk8DNA@mail.gmail.com>
To: Levi Morrison <levim@php.net>
Cc: Nikita Popov <nikita.ppv@gmail.com>, Xinchen Hui <xinchen.h@zend.com>, Anatol Belski <ab@php.net>, 
	PHP Internals <internals@lists.php.net>
Content-Type: multipart/alternative; boundary=001a113659d0e3fddf05092308f4
Subject: Re: [PHP-DEV] Use zend_string* for op_array->arg_info[].name and class_name
From: dmitry@zend.com (Dmitry Stogov)

--001a113659d0e3fddf05092308f4
Content-Type: text/plain; charset=UTF-8

Hi Levi,

I understood, that you don't see a big problems with the patch. :)

According to your suggestions, It's possible to do it in this way, but it's
going to be slower, because it would require additional memory allocation,
but I agree that duplicating logic in the code isn't good.
It must be better to write something like the following (I didn't test it,
but it'll work):

I'll update the patch.

Thanks. Dmitry.

char *class_name;
size_t class_name_len;

if (fe->type == ZEND_INTERNAL_FUNCTION) {
    class_name = ((zend_internal_arg_info*)fe_
arg_info)->class_name;
    class_name_len = strlen(class_name);
} else {
    class_name = fe_arg_info->class_name->val;
    class_name_len = fe_arg_info->
class_name->len;
 }

if (class_name_len == sizeof("parent")-1 &&
!zend_binary_strcasecmp(class_name, "parent", sizeof("parent")-1,
sizeof("parent")-1) &&
proto->common.scope) {
    fe_class_name = zend_string_copy(proto->common.scope->name);
} else if (class_name_len == sizeof("self")-1 &&
!zend_binary_strcasecmp(class_name, "self", sizeof("self")-1,
sizeof("self")-1) &&
fe->common.scope) {
    fe_class_name = zend_string_copy(fe->common.scope->name);
} else {
    fe_class_name = class_name;
}


On Fri, Nov 28, 2014 at 11:19 PM, Levi Morrison <levim@php.net> wrote:

> > Please review the patch
> https://gist.github.com/dstogov/47a39aff37f0a6441ea0
>
> Instead of duplicating logic in two places I'd rather grab the
> relevant data first, then do the logic once:
>
> zend_string *class_name;
> if (fe->type == ZEND_INTERNAL_FUNCTION) {
>     class_name = zend_string_init(
>             ((zend_internal_arg_info*)fe_arg_info)->class_name,
>             strlen(((zend_internal_arg_info*)fe_arg_info)->class_name), 0
>     );
> } else {
>     class_name = zend_string_dup(fe_arg_info->class_name);
> }
>
> if (!zend_string_equals_literal_ci(class_name, "parent") &&
> proto->common.scope) {
>     fe_class_name = zend_string_copy(proto->common.scope->name);
> } else if (!zend_string_equals_literal_ci(class_name, "self") &&
> fe->common.scope) {
>     fe_class_name = zend_string_copy(fe->common.scope->name);
> } else {
>     fe_class_name = class_name;
> }
> zend_string_release(class_name);
>

--001a113659d0e3fddf05092308f4--