AOT: host-fold DOMXPath attribute-axis evaluate and relative @* query (#32003) - #35715
Merged
Conversation
…#32003). count(//@*), string(//@*), and query('@*', $ctx) hit the context-less XPath evaluate/query ABI and SIGSEGV or return empty under thin AOT. Fold via host Zend for attribute-axis location paths and //tag/@* when context comes from the prior //tag query. Co-authored-by: Cursor <cursoragent@cursor.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
count(//@*),string(//@*), and//attribute::*inJitDomXPathEvaluateUserScriptso thin AOT no longer falls through to the context-less XPath evaluate ABI (SIGSEGV).query('@*', $ctx)when$ctxis//tagitem(0) by rewriting to//tag/@*(JitDomXPathQueryUserScript).@*intryHostTreeAxisCompileTimewithout/— needs explicit context node.php-src:
ext/dom/xpath.c— attribute axis +DOMXPath::evaluate/querywith context.Verification
Not covered
maintainer_gap_dom_xpath_attr_star.phpmulti-query + user-function loop still wrong when several axis queries precedenames()— compile-timelastXPathAxisExprstatic is overwritten; tracked as follow-up to Regression: DOMXPath //@* and attribute::* return empty — Zend returns Attr nodes (ext/dom/xpath.c) #32003.Fixes #32003 (AOT evaluate/query follow-up; VM/query lengths landed earlier).
Made with Cursor