Fix AOT LLVM discovery in Docker; add str_contains AOT PHPT#265
Merged
Conversation
AOT/LLVM PHPUnit helpers only looked for repo/.llvm, so the 22.04-dev image toolchain at /opt/llvm9 was ignored and 45+ tests skipped silently. Centralize resolution (repo .llvm, PHP_COMPILER_LLVM_PATH, /opt/llvm9) in LlvmToolchain, align src/llvm-env.php with script/php-env.sh, and add an AOT PHPT for str_contains(). 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
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
repo/.llvm, so tests in thephp-compiler:22.04-devimage (toolchain at/opt/llvm9) were skipped silently (45 skipped, 0 assertions). Addedtest/LlvmToolchain.phpmirroringscript/php-env.sh(repo.llvm→PHP_COMPILER_LLVM_PATH→/opt/llvm9) and wired it throughBaseTest, alltest/aot/*,ServeAotTest,ExamplesCompileTest, andJITTestsetup.src/llvm-env.phpnow uses the same resolution order so in-process PHPLLVM loads in Docker.test/fixtures/aot/cases/str_contains.phptforstr_contains()(web routing / header checks).Test output (Docker, Runforge harness)
Harness bind-mount is empty; used
./script/docker-ci-local.shpattern (tar pipe):Before this change, the same command reported
Skipped: 45withOK, but incomplete.LLVM 9 reported at
/opt/llvm9byscript/ci-local.shwhenPHP_COMPILER_LLVM_PATHis set in the image.Test plan
php vendor/bin/phpunit test/aot/inphp-compiler:22.04-dev(46 tests, 86 assertions)./script/ci-local.shin Docker (recommended before merge)Made with Cursor