From 4dce16aaf897eec1912b44beb32c8c81f4c1abc3 Mon Sep 17 00:00:00 2001
From: Antoni Boucher <bouanto@zoho.com>
Date: Fri, 18 Aug 2023 18:38:24 -0400
Subject: [PATCH] Attempt to fix CI

---
 .github/workflows/ci.yml       | 2 ++
 .github/workflows/release.yml  | 2 ++
 .github/workflows/stdarch.yml  | 2 ++
 build_sysroot/build_sysroot.sh | 3 ++-
 cargo.sh                       | 3 ++-
 failing-ui-tests.txt           | 8 ++++++++
 test.sh                        | 3 ++-
 7 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d2b7724a221..83168eab9e7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -74,6 +74,8 @@ jobs:
           echo $(readlink -f gcc-build) > gcc_path
           # NOTE: the filename is still libgccjit.so even when the artifact name is different.
           ln gcc-build/libgccjit.so gcc-build/libgccjit.so.0
+          mkdir -p /opt/gcc/libexec/gcc/x86_64-linux-gnu/11
+          cp gcc-build/*lto* /opt/gcc/libexec/gcc/x86_64-linux-gnu/11/
 
     - name: Set env
       run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c4e99469bc2..cbe95a01193 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -52,6 +52,8 @@ jobs:
           echo $(readlink -f gcc-build) > gcc_path
           # NOTE: the filename is still libgccjit.so even when the artifact name is different.
           ln gcc-build/libgccjit.so gcc-build/libgccjit.so.0
+          mkdir -p /opt/gcc/libexec/gcc/x86_64-linux-gnu/11
+          cp gcc-build/*lto* /opt/gcc/libexec/gcc/x86_64-linux-gnu/11/
 
     - name: Set env
       run: |
diff --git a/.github/workflows/stdarch.yml b/.github/workflows/stdarch.yml
index 21b6a0d3a93..50e6d41ddac 100644
--- a/.github/workflows/stdarch.yml
+++ b/.github/workflows/stdarch.yml
@@ -66,6 +66,8 @@ jobs:
           echo $(readlink -f gcc-build) > gcc_path
           # NOTE: the filename is still libgccjit.so even when the artifact name is different.
           ln gcc-build/libgccjit.so gcc-build/libgccjit.so.0
+          mkdir -p /opt/gcc/libexec/gcc/x86_64-linux-gnu/11
+          cp gcc-build/*lto* /opt/gcc/libexec/gcc/x86_64-linux-gnu/11/
 
     - name: Set env
       run: |
diff --git a/build_sysroot/build_sysroot.sh b/build_sysroot/build_sysroot.sh
index 5275fd7eb8d..af9b98d1fa4 100755
--- a/build_sysroot/build_sysroot.sh
+++ b/build_sysroot/build_sysroot.sh
@@ -19,7 +19,8 @@ rm -r sysroot/ 2>/dev/null || true
 export RUSTFLAGS="$RUSTFLAGS -Z force-unstable-if-unmarked"
 if [[ "$1" == "--release" ]]; then
     sysroot_channel='release'
-    LIBRARY_PATH=/home/bouanto/Ordinateur/Programmation/Projets/gcc-repo/gcc-build/build/gcc GCC_EXEC_PREFIX=/opt/gcc/libexec/gcc/x86_64-pc-linux-gnu RUSTFLAGS="$RUSTFLAGS -Zmir-opt-level=3" cargo build --target $TARGET_TRIPLE --release
+    # FIXME: make LIBRARY_PATH something approciate in the CI.
+    LIBRARY_PATH=gcc-build GCC_EXEC_PREFIX=/opt/gcc/libexec/gcc/x86_64-pc-linux-gnu RUSTFLAGS="$RUSTFLAGS -Zmir-opt-level=3" cargo build --target $TARGET_TRIPLE --release
     #CG_GCCJIT_DUMP_TREE_ALL=1 CG_GCCJIT_KEEP_INTERMEDIATES=1 RUSTFLAGS="$RUSTFLAGS -Zmir-opt-level=3" cargo build --target $TARGET_TRIPLE --release
 else
     sysroot_channel='debug'
diff --git a/cargo.sh b/cargo.sh
index 17bfd7e9726..9c1ec7a461b 100755
--- a/cargo.sh
+++ b/cargo.sh
@@ -21,4 +21,5 @@ cmd=$1
 shift
 
 # TODO: remove LIBRARY_PATH and GCC_EXEC_PREFIX. Those are used to debug the LTO front-end.
-LIBRARY_PATH=/home/bouanto/Ordinateur/Programmation/Projets/gcc-repo/gcc-build/build/gcc GCC_EXEC_PREFIX=/opt/gcc/libexec/gcc/x86_64-pc-linux-gnu PATH=$PATH:/opt/gcc/bin RUSTDOCFLAGS="$RUSTFLAGS" cargo +${TOOLCHAIN} $cmd $@
+#LIBRARY_PATH=/home/bouanto/Ordinateur/Programmation/Projets/gcc-repo/gcc-build/build/gcc GCC_EXEC_PREFIX=/opt/gcc/libexec/gcc/x86_64-pc-linux-gnu
+PATH=$PATH:/opt/gcc/bin RUSTDOCFLAGS="$RUSTFLAGS" cargo +${TOOLCHAIN} $cmd $@
diff --git a/failing-ui-tests.txt b/failing-ui-tests.txt
index fe0df3347bb..3e015307ae7 100644
--- a/failing-ui-tests.txt
+++ b/failing-ui-tests.txt
@@ -70,3 +70,11 @@ tests/ui/panics/nested_panic_caught.rs
 tests/ui/simd/intrinsic/generic-bswap-byte.rs
 tests/ui/const_prop/ice-issue-111353.rs
 tests/ui/process/println-with-broken-pipe.rs
+tests/ui/panic-runtime/lto-abort.rs
+tests/ui/lto/thin-lto-inlines2.rs
+tests/ui/lto/weak-works.rs
+tests/ui/lto/thin-lto-inlines.rs
+tests/ui/lto/thin-lto-global-allocator.rs
+tests/ui/lto/msvc-imp-present.rs
+tests/ui/lto/lto-thin-rustc-loads-linker-plugin.rs
+tests/ui/lto/all-crates.rs
diff --git a/test.sh b/test.sh
index 64e3da0b6e8..5d609bd6364 100755
--- a/test.sh
+++ b/test.sh
@@ -151,7 +151,7 @@ function clean() {
 
 function mini_tests() {
     echo "[BUILD] mini_core"
-    $RUSTC example/mini_core.rs --crate-name mini_core --crate-type lib,dylib --target $TARGET_TRIPLE
+    GCC_EXEC_PREFIX=/opt/gcc/libexec/gcc/x86_64-pc-linux-gnu strace -f $RUSTC example/mini_core.rs --crate-name mini_core --crate-type lib,dylib --target $TARGET_TRIPLE
 
     echo "[BUILD] example"
     $RUSTC example/example.rs --crate-type lib --target $TARGET_TRIPLE
@@ -337,6 +337,7 @@ function extended_sysroot_tests() {
 }
 
 function test_rustc() {
+    # FIXME: LTO UI tests probably fail because GCC_EXEC_PREFIX is not set.
     echo
     echo "[TEST] rust-lang/rust"