Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/bootstrap-spine-gate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ jobs:
php-compiler:22.04-dev bash -lc '
set -euo pipefail
composer install --no-interaction --ignore-platform-reqs -q
script/apply-patches.sh --verify-pristine
script/apply-patches.sh

echo "=== bootstrap-inventory --check-spine ==="
Expand Down Expand Up @@ -134,6 +135,7 @@ jobs:
php-compiler:22.04-dev bash -lc "
set -euo pipefail
composer install --no-interaction --ignore-platform-reqs -q
script/apply-patches.sh --verify-pristine
script/apply-patches.sh
./script/bootstrap-loop-probe.sh ${HONEST_ARGS}
"
2 changes: 2 additions & 0 deletions .github/workflows/compiler-gate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ jobs:
php-compiler:22.04-dev bash -lc '
set -euo pipefail
composer install --no-interaction --ignore-platform-reqs -q
script/apply-patches.sh --verify-pristine
script/apply-patches.sh

# Tier 0 — syntax. Seconds. A parse error in a spine file has killed multi-hour
Expand Down Expand Up @@ -144,6 +145,7 @@ jobs:
php-compiler:22.04-dev bash -lc '
set -uo pipefail
composer install --no-interaction --ignore-platform-reqs -q
script/apply-patches.sh --verify-pristine
script/apply-patches.sh
script/differential-sweep.sh --aot --repeat 3 || true
echo
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/compliance-host-compare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ jobs:
php-compiler:hostcmp bash -lc '
set -uo pipefail
composer install --no-interaction --ignore-platform-reqs -q
script/apply-patches.sh --verify-pristine
script/apply-patches.sh
script/shard-compliance.sh --suite="$SUITE" --shards=24 --shard=${{ matrix.shard }}
'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/compliance-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ jobs:
php-compiler:22.04-dev bash -lc '
set -uo pipefail
composer install --no-interaction --ignore-platform-reqs -q
script/apply-patches.sh --verify-pristine
script/apply-patches.sh
script/shard-compliance.sh --suite="$SUITE" --shards=24 --shard=${{ matrix.shard }}
'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/compliance-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ jobs:
php-compiler:22.04-dev bash -lc '
set -uo pipefail
composer install --no-interaction --ignore-platform-reqs -q
script/apply-patches.sh --verify-pristine
script/apply-patches.sh
script/shard-compliance.sh --suite="$SUITE" --shards=24 --shard=${{ matrix.shard }}
'
Expand Down
10 changes: 5 additions & 5 deletions patches/php-llvm-structgep-assert.patch
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
--- vendor/ircmaxell/php-llvm/lib/LLVMAbstract/Builder.php
+++ vendor/ircmaxell/php-llvm/lib/LLVMAbstract/Builder.php
@@ -313,6 +313,27 @@
if (null === $struct->value) {
throw new \LogicException('LLVM struct value is null in structGep()');
}
@@ -303,6 +303,27 @@
}

public function structGep(CoreValue $struct, int $index): CoreValue {
+ if ('1' === \getenv('PHP_COMPILER_LLVM_ASSERT')) {
+ // LLVM 9 release builds do not bounds-check StructGEP: a non-struct
+ // receiver or out-of-range field index reads a garbage Type* and
Expand All @@ -28,7 +28,7 @@
return $this->llvm->factory->value($this->context, $this->llvm->lib->LLVMBuildStructGEP($this->builder, $struct->value, $index, ''));
}

@@ -329,6 +350,12 @@
@@ -319,6 +340,12 @@
}

public function zExt(CoreValue $value, CoreType $type): CoreValue {
Expand Down
Loading
Loading