Skip to content

Commit 43b7e28

Browse files
committed
Merge commit '59a81c2ca1edc88ad3ac4b27a8e03977ffb8e73a' into subtree-update_cg_gcc_2025_01_12
1 parent c6f258d commit 43b7e28

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+828
-1522
lines changed

Diff for: .github/workflows/ci.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ jobs:
2222
- { gcc: "gcc-13.deb" }
2323
- { gcc: "gcc-13-without-int128.deb" }
2424
commands: [
25-
"--mini-tests",
2625
"--std-tests",
2726
# FIXME: re-enable asm tests when GCC can emit in the right syntax.
2827
# "--asm-tests",
@@ -79,6 +78,7 @@ jobs:
7978
run: |
8079
./y.sh prepare --only-libcore
8180
./y.sh build --sysroot
81+
./y.sh test --mini-tests
8282
cargo test
8383
8484
- name: Run y.sh cargo build
@@ -87,17 +87,14 @@ jobs:
8787
8888
- name: Clean
8989
run: |
90-
./y.sh clean all
90+
./y.sh clean all
9191
9292
- name: Prepare dependencies
9393
run: |
9494
git config --global user.email "[email protected]"
9595
git config --global user.name "User"
9696
./y.sh prepare
9797
98-
- name: Add more failing tests because the sysroot is not compiled with LTO
99-
run: cat tests/failing-non-lto-tests.txt >> tests/failing-ui-tests.txt
100-
10198
- name: Run tests
10299
run: |
103100
./y.sh test --release --clean --build-sysroot ${{ matrix.commands }}

Diff for: .github/workflows/failures.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -90,23 +90,20 @@ jobs:
9090
if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
9191
run: ./y.sh prepare
9292

93-
- name: Add more failing tests because the sysroot is not compiled with LTO
94-
run: cat tests/failing-non-lto-tests.txt >> tests/failing-ui-tests.txt
95-
9693
- name: Run tests
9794
# TODO: re-enable those tests for libgccjit 12.
9895
if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
9996
id: tests
10097
run: |
101-
${{ matrix.libgccjit_version.env_extra }} ./y.sh test --release --clean --build-sysroot --test-failing-rustc ${{ matrix.libgccjit_version.extra }} | tee output_log
98+
${{ matrix.libgccjit_version.env_extra }} ./y.sh test --release --clean --build-sysroot --test-failing-rustc ${{ matrix.libgccjit_version.extra }} 2>&1 | tee output_log
10299
rg --text "test result" output_log >> $GITHUB_STEP_SUMMARY
103100
104101
- name: Run failing ui pattern tests for ICE
105102
# TODO: re-enable those tests for libgccjit 12.
106103
if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
107104
id: ui-tests
108105
run: |
109-
${{ matrix.libgccjit_version.env_extra }} ./y.sh test --release --test-failing-ui-pattern-tests ${{ matrix.libgccjit_version.extra }} | tee output_log_ui
106+
${{ matrix.libgccjit_version.env_extra }} ./y.sh test --release --test-failing-ui-pattern-tests ${{ matrix.libgccjit_version.extra }} 2>&1 | tee output_log_ui
110107
if grep -q "the compiler unexpectedly panicked" output_log_ui; then
111108
echo "Error: 'the compiler unexpectedly panicked' found in output logs. CI Error!!"
112109
exit 1

Diff for: .github/workflows/gcc12.yml

-3
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,6 @@ jobs:
8282
#- name: Add more failing tests for GCC 12
8383
#run: cat tests/failing-ui-tests12.txt >> tests/failing-ui-tests.txt
8484

85-
#- name: Add more failing tests because the sysroot is not compiled with LTO
86-
#run: cat tests/failing-non-lto-tests.txt >> tests/failing-ui-tests.txt
87-
8885
#- name: Run tests
8986
#run: |
9087
#./y.sh test --release --clean --build-sysroot ${{ matrix.commands }} --no-default-features

Diff for: .github/workflows/m68k.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
commands: [
26-
"--mini-tests",
2726
"--std-tests",
2827
# TODO(antoyo): fix those on m68k.
2928
#"--test-libcore",
@@ -93,6 +92,7 @@ jobs:
9392
run: |
9493
./y.sh prepare --only-libcore --cross
9594
./y.sh build --sysroot --features compiler_builtins/no-f16-f128 --target-triple m68k-unknown-linux-gnu
95+
./y.sh test --mini-tests
9696
CG_GCC_TEST_TARGET=m68k-unknown-linux-gnu cargo test
9797
./y.sh clean all
9898
@@ -102,9 +102,6 @@ jobs:
102102
git config --global user.name "User"
103103
./y.sh prepare --cross
104104
105-
- name: Add more failing tests because the sysroot is not compiled with LTO
106-
run: cat tests/failing-non-lto-tests.txt >> tests/failing-ui-tests.txt
107-
108105
- name: Run tests
109106
run: |
110107
./y.sh test --release --clean --build-sysroot --sysroot-features compiler_builtins/no-f16-f128 ${{ matrix.commands }}

Diff for: .github/workflows/release.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313

1414
jobs:
1515
build:
16-
runs-on: ubuntu-latest
16+
runs-on: ubuntu-22.04
1717

1818
strategy:
1919
fail-fast: false
@@ -54,6 +54,7 @@ jobs:
5454
run: |
5555
./y.sh prepare --only-libcore
5656
EMBED_LTO_BITCODE=1 ./y.sh build --sysroot --release --release-sysroot
57+
./y.sh test --mini-tests
5758
cargo test
5859
./y.sh clean all
5960
@@ -70,4 +71,9 @@ jobs:
7071
run: |
7172
# FIXME(antoyo): we cannot enable LTO for stdarch tests currently because of some failing LTO tests using proc-macros.
7273
echo -n 'lto = "fat"' >> build_system/build_sysroot/Cargo.toml
73-
EMBED_LTO_BITCODE=1 ./y.sh test --release --clean --release-sysroot --build-sysroot ${{ matrix.commands }}
74+
EMBED_LTO_BITCODE=1 ./y.sh test --release --clean --release-sysroot --build-sysroot --keep-lto-tests ${{ matrix.commands }}
75+
76+
- name: Run y.sh cargo build
77+
run: |
78+
EMBED_LTO_BITCODE=1 CHANNEL="release" ./y.sh cargo build --release --manifest-path tests/hello-world/Cargo.toml
79+
# TODO: grep the asm output for "call my_func" and fail if it is found.

Diff for: .github/workflows/stdarch.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,6 @@ jobs:
7373
echo "LD_LIBRARY_PATH="$(./y.sh info | grep -v Using) >> $GITHUB_ENV
7474
echo "LIBRARY_PATH="$(./y.sh info | grep -v Using) >> $GITHUB_ENV
7575
76-
- name: Build (part 2)
77-
run: |
78-
cargo test
79-
8076
- name: Clean
8177
if: ${{ !matrix.cargo_runner }}
8278
run: |
@@ -92,6 +88,7 @@ jobs:
9288
if: ${{ !matrix.cargo_runner }}
9389
run: |
9490
./y.sh test --release --clean --release-sysroot --build-sysroot --mini-tests --std-tests --test-libcore
91+
cargo test
9592
9693
- name: Run stdarch tests
9794
if: ${{ !matrix.cargo_runner }}

Diff for: Cargo.lock

+147-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Cargo.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,16 @@ master = ["gccjit/master"]
2222
default = ["master"]
2323

2424
[dependencies]
25-
gccjit = "2.2"
25+
gccjit = "2.4"
2626
#gccjit = { git = "https://github.com/rust-lang/gccjit.rs" }
2727

2828
# Local copy.
2929
#gccjit = { path = "../gccjit.rs" }
3030

3131
[dev-dependencies]
32-
lang_tester = "0.8.0"
3332
boml = "0.3.1"
33+
lang_tester = "0.8.0"
34+
tempfile = "3.7.1"
3435

3536
[profile.dev]
3637
# By compiling dependencies with optimizations, performing tests gets much faster.

0 commit comments

Comments
 (0)