Fix GH-9967 Add support for generating custom function, class const, and property attributes in stubs #10170

kocsismate · 2022-12-26T21:50:14Z

No description provided.

TimWolla

Changes to the stub generator LGTM as far as I can tell. Ideally also add an actual test to zend_test to verify the attribute is applied properly.

ext/zend_test/test.stub.php

TimWolla

LGTM now, thanks!

ext/zend_test/tests/gen_stub_test_02.phpt

kocsismate · 2022-12-30T22:16:53Z

I've just realized that we could add support for generating attributes for class constants and properties as well... So I also implemented this feature.

P.S. Another thing I noticed is that gen_stub.php cannot generate multiple attributes for the same symbol, otherwise there is a variable name collision in the generated code. I'll fix this in a followup PR.

kocsismate · 2022-12-30T22:23:21Z

build/gen_stub.php

        } else {
-            $template = "\tzend_declare_property_ex(class_entry, $nameCode, &$zvalName, %s, NULL);\n";


It was necessary to change to zend_declare_typed_property, because unfortunately zend_declare_property_ex doesn't return the zend_property_info.

kocsismate · 2022-12-30T22:24:48Z

build/gen_stub.php

            if (!$php82MinimumCompatibility) {
-                $code .= "#if (PHP_VERSION_ID >= " . PHP_82_VERSION_ID . ")\n";
+                $code .= "#if (PHP_VERSION_ID >= " . PHP_82_VERSION_ID . ")";


this endline character was superfluous

kocsismate · 2022-12-30T22:51:57Z

P.S. Another thing I noticed is that gen_stub.php cannot generate multiple attributes for the same symbol, otherwise there is a variable name collision in the generated code. I'll fix this in a followup PR.

Sorry, it was a false alarm. :)

kocsismate · 2022-12-31T10:06:26Z

P.S. Another thing I noticed is that gen_stub.php cannot generate multiple attributes for the same symbol, otherwise there is a variable name collision in the generated code. I'll fix this in a followup PR.

Sorry, it was a false alarm. :)

Update: No, it's not when an attribute is repeatable.

kocsismate · 2022-12-31T10:25:12Z

It seems to me that the new attributes cause some issues in the JIT engine :/

kocsismate · 2023-01-01T10:03:08Z

Sorry, I rebased to the wrong branch (master instead of PHP-8.2) after a conflict resolution. :/ So I had to squash my previous commits into one and cherry-pick it to PHP-8.2

ext/zend_test/tests/gen_stub_test_02.phpt

TimWolla

I don't have any further remarks.

…t, and property attributes in stubs

iluuu1994 · 2023-07-04T07:29:48Z

Unfortunately, as mentioned in the commit comments this caused multiple issues.

It broke compilation of C++ files including arginfo.h files.
It reported a leak that turned out to be harmless.
It broke the ASAN build.

I was able to fix 1 and 2 in this PR. However, I was unable to reproduce the ASAN failure locally and as such could not fix it.

Since Máté is absent atm I reverted the changes for now. Please re-apply the changes to master and check if the build passes once you're back. 🙂

iluuu1994 · 2023-07-04T22:26:29Z

Turns out the ASAN error was caused by 9f4bd30 which I also reverted for now. I will try to find the cause tomorrow.

iluuu1994 · 2023-08-14T12:03:38Z

@kocsismate Reminder: This commit was never re-applied. #11582 contained fixed that should work now, I'd prefer only applying this to master though.

kocsismate · 2023-08-14T12:10:01Z

@iluuu1994 Thanks for the reminder! I was aware, but was busy with other stuff, and I didn't really know whether there was really an ASAN failure (or just due to 9f4bd30). Could you please re-add your fix? And then I'll reapply my changes in master.

iluuu1994 · 2023-08-14T12:22:13Z

@kocsismate No worries, I might have a clue why you were buy 😉👶 The ASAN failure was just caused by 9f4bd30 but tbh I completely forgot what I did to fix it. It's best if you apply my fixed in #11582 on top of your changes here in a new PR, so that they can be tested together.

kocsismate requested review from TimWolla and bwoebi December 26, 2022 21:50

github-actions bot added Category: Build System Extension: zend_test labels Dec 26, 2022

kocsismate mentioned this pull request Dec 26, 2022

Support 8.0 attributes in extension stubs #9967

Closed

TimWolla reviewed Dec 29, 2022

View reviewed changes

ext/zend_test/test.stub.php Outdated Show resolved Hide resolved

TimWolla self-requested a review December 29, 2022 18:28

TimWolla approved these changes Dec 29, 2022

View reviewed changes

ext/zend_test/tests/gen_stub_test_02.phpt Outdated Show resolved Hide resolved

github-actions bot added Extension: dom Extension: pdo (core) Extension: soap Extension: standard labels Dec 30, 2022

kocsismate commented Dec 30, 2022

View reviewed changes

TimWolla self-requested a review December 30, 2022 22:26

github-actions bot added the Category: Engine label Dec 30, 2022

kocsismate changed the title ~~Fix GH-9967 Add support for generating custom function attributes in stubs~~ Fix GH-9967 Add support for generating custom function, class const, and property attributes in stubs Dec 31, 2022

github-actions bot added the Extension: oci8 label Dec 31, 2022

kocsismate force-pushed the stub-func-attributes branch from 02cb104 to e4b76d7 Compare January 1, 2023 09:55

github-actions bot added Category: Optimizer Extension: com_dotnet Extension: curl Extension: date Extension: enchant Extension: ffi Extension: fileinfo Extension: filter labels Jan 1, 2023

kocsismate removed the Extension: zend_test label Jan 1, 2023

TimWolla reviewed Jan 1, 2023

View reviewed changes

ext/zend_test/tests/gen_stub_test_02.phpt Outdated Show resolved Hide resolved

github-actions bot added Extension: dom Extension: oci8 Extension: pdo (core) Extension: soap Extension: standard Extension: zend_test labels Jan 17, 2023

TimWolla approved these changes Jan 17, 2023

View reviewed changes

kocsismate force-pushed the stub-func-attributes branch from d11c94a to bac8040 Compare June 8, 2023 18:32

kocsismate force-pushed the stub-func-attributes branch 5 times, most recently from b2a274f to ff0f695 Compare July 2, 2023 12:03

kocsismate added 3 commits July 2, 2023 21:58

Fix phpGH-9967 Add support for generating custom function, class cons…

13bb8bb

…t, and property attributes in stubs

Fix unrelated test failure and apply suggestion from code review

d16c6fe

Remove trait test

2abe28b

kocsismate force-pushed the stub-func-attributes branch from ff0f695 to 2abe28b Compare July 2, 2023 19:58

kocsismate closed this in 45a3f17 Jul 3, 2023

kocsismate deleted the stub-func-attributes branch July 3, 2023 09:17

kocsismate mentioned this pull request Aug 15, 2023

Fix GH-9967 Add support for generating custom function, class const, and property attributes in stubs #11978

Merged

kocsismate mentioned this pull request Sep 6, 2023

Compile error on MacOS with C++ extension when using ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX #12123

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix GH-9967 Add support for generating custom function, class const, and property attributes in stubs #10170

Fix GH-9967 Add support for generating custom function, class const, and property attributes in stubs #10170

kocsismate commented Dec 26, 2022

TimWolla left a comment

TimWolla left a comment

kocsismate commented Dec 30, 2022

kocsismate Dec 30, 2022 •

edited

Loading

kocsismate Dec 30, 2022

kocsismate commented Dec 30, 2022

kocsismate commented Dec 31, 2022

kocsismate commented Dec 31, 2022

kocsismate commented Jan 1, 2023

TimWolla left a comment

iluuu1994 commented Jul 4, 2023

iluuu1994 commented Jul 4, 2023 •

edited

Loading

iluuu1994 commented Aug 14, 2023

kocsismate commented Aug 14, 2023

iluuu1994 commented Aug 14, 2023

		} else {
		$template = "\tzend_declare_property_ex(class_entry, $nameCode, &$zvalName, %s, NULL);\n";

Fix GH-9967 Add support for generating custom function, class const, and property attributes in stubs #10170

Fix GH-9967 Add support for generating custom function, class const, and property attributes in stubs #10170

Conversation

kocsismate commented Dec 26, 2022

TimWolla left a comment

Choose a reason for hiding this comment

TimWolla left a comment

Choose a reason for hiding this comment

kocsismate commented Dec 30, 2022

kocsismate Dec 30, 2022 • edited Loading

Choose a reason for hiding this comment

kocsismate Dec 30, 2022

Choose a reason for hiding this comment

kocsismate commented Dec 30, 2022

kocsismate commented Dec 31, 2022

kocsismate commented Dec 31, 2022

kocsismate commented Jan 1, 2023

TimWolla left a comment

Choose a reason for hiding this comment

iluuu1994 commented Jul 4, 2023

iluuu1994 commented Jul 4, 2023 • edited Loading

iluuu1994 commented Aug 14, 2023

kocsismate commented Aug 14, 2023

iluuu1994 commented Aug 14, 2023

kocsismate Dec 30, 2022 •

edited

Loading

iluuu1994 commented Jul 4, 2023 •

edited

Loading