Attempt to fix CI

Author: antoyo

.github/workflows/ci.yml

@@ -46,7 +46,10 @@ jobs:
 
     - name: Install packages
       # `llvm-14-tools` is needed to install the `FileCheck` binary which is used for asm tests.
-      run: sudo apt-get install ninja-build ripgrep llvm-14-tools
+      run: |
+        sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa
+        sudo apt update
+        sudo apt-get install ninja-build ripgrep llvm-14-tools gcc-13 gcc-multilib
 
     - name: Install libgccjit12
       if: matrix.libgccjit_version.gcc == 'libgccjit12.so'
@@ -71,9 +74,39 @@ jobs:
     - name: Setup path to libgccjit
       if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
       run: |
-          echo $(readlink -f gcc-build) > gcc_path
+
+          echo stddef.h
+          find / -name stddef.h 2> /dev/null || true
+          echo "************"
+
+          echo lto1
+          find / -name lto1 2> /dev/null || true
+          echo "************"
+
+          echo lto-wrapper
+          find / -name lto-wrapper 2> /dev/null || true
+          echo "************"
+
+          echo gcc
+          find / -name gcc 2> /dev/null || true
+          echo "************"
+
+          echo liblto_plugin.so
+          find / -name liblto_plugin.so 2> /dev/null || true
+          echo "************"
+
+          echo $(readlink -f gcc-build/build/gcc) > 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
+          ln gcc-build/build/gcc/libgccjit.so gcc-build/build/gcc/libgccjit.so.0
+          mkdir -p /opt/gcc/libexec/gcc/x86_64-linux-gnu/13 /opt/gcc/libexec/x86_64-linux-gnu/13/
+          cd gcc-build/build/gcc
+          chmod +x lto-wrapper lto1
+          cp *lto* /opt/gcc/libexec/gcc/x86_64-linux-gnu/13/
+          cp /usr/lib/gcc/x86_64-linux-gnu/12/libgcc_s.so /opt/gcc/libexec/x86_64-linux-gnu/13/
+          cp /usr/lib/gcc/x86_64-linux-gnu/12/libgcc.a /opt/gcc/libexec/
+          cp /usr/libexec/gcc/x86_64-linux-gnu/13/cc1 /opt/gcc/libexec/gcc/cc1
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 13
+          sudo update-alternatives --all
 
     - name: Set env
       run: |

.github/workflows/release.yml

@@ -34,7 +34,10 @@ jobs:
         path: llvm
 
     - name: Install packages
-      run: sudo apt-get install ninja-build ripgrep
+      run: |
+        sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa
+        sudo apt update
+        sudo apt-get install ninja-build ripgrep gcc-13 gcc-multilib
 
     - name: Download artifact
       uses: dawidd6/action-download-artifact@v2
@@ -49,9 +52,22 @@ jobs:
 
     - name: Setup path to libgccjit
       run: |
-          echo $(readlink -f gcc-build) > gcc_path
+          echo $(readlink -f gcc-build/build/gcc) > 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
+          ln gcc-build/build/gcc/libgccjit.so gcc-build/build/gcc/libgccjit.so.0
+          mkdir -p /opt/gcc/libexec/gcc/x86_64-linux-gnu/13 /opt/gcc/libexec/x86_64-linux-gnu/13/ /opt/gcc/bin
+          cp gcc-build/install/bin/gcc /opt/gcc/bin/gcc
+          cd gcc-build/build/gcc
+          chmod +x lto-wrapper lto1 /opt/gcc/bin/gcc
+          cp *lto* /opt/gcc/libexec/gcc/x86_64-linux-gnu/
+          #cp crt*.o /opt/gcc/libexec/x86_64-linux-gnu/13/
+          cp crt*.o /opt/gcc/libexec/x86_64-linux-gnu/
+          cp /usr/lib/gcc/x86_64-linux-gnu/12/libgcc_s.so /opt/gcc/libexec/x86_64-linux-gnu/
+          cp /usr/lib/gcc/x86_64-linux-gnu/12/libgcc.a /opt/gcc/libexec/
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 13
+          # TODO: add comment if this fixes the -fno-inline errors.
+          # TODO: do some tests locally to know which binary needs to be copied from the system installation.
+          #cp /usr/libexec/gcc/x86_64-linux-gnu/13/lto1 /opt/gcc/libexec/gcc/x86_64-linux-gnu/13/
 
     - name: Set env
       run: |
@@ -90,7 +106,7 @@ jobs:
       run: |
         ./prepare_build.sh
         ./build.sh --release --release-sysroot
-        cargo test
+        GCC_EXEC_PREFIX=/opt/gcc/libexec/gcc/x86_64-pc-linux-gnu cargo test
         ./clean_all.sh
 
     - name: Prepare dependencies

.github/workflows/stdarch.yml

@@ -34,7 +34,10 @@ jobs:
         path: llvm
 
     - name: Install packages
-      run: sudo apt-get install ninja-build ripgrep
+      run: |
+        sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa
+        sudo apt update
+        sudo apt-get install ninja-build ripgrep gcc-13 gcc-multilib
 
     - name: Install Intel Software Development Emulator
       if: ${{ matrix.cargo_runner }}
@@ -63,9 +66,21 @@ jobs:
 
     - name: Setup path to libgccjit
       run: |
-          echo $(readlink -f gcc-build) > gcc_path
+          echo $(readlink -f gcc-build/build/gcc) > 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
+          # TODO: instead, overwrite the system gcc, lto1, …?
+          ln gcc-build/build/gcc/libgccjit.so gcc-build/build/gcc/libgccjit.so.0
+          mkdir -p /opt/gcc/libexec/gcc/x86_64-linux-gnu/13 /opt/gcc/libexec/x86_64-linux-gnu/13/ /opt/gcc/bin /opt/gcc/libexec/gcc/x86_64-linux-gnu/13.0.0
+          cp gcc-build/install/bin/gcc /opt/gcc/bin/gcc
+          cd gcc-build/build/gcc
+          chmod +x lto-wrapper lto1 /opt/gcc/bin/gcc
+          cp *lto* /opt/gcc/libexec/gcc/x86_64-linux-gnu/13/
+          cp *lto* /opt/gcc/libexec/gcc/x86_64-linux-gnu/13.0.0/
+          # TODO: instead of downloading the crt files from the GCC CI, copy them from the system.
+          cp crt*.o /opt/gcc/libexec/x86_64-linux-gnu/13/
+          cp /usr/lib/gcc/x86_64-linux-gnu/12/libgcc_s.so /opt/gcc/libexec/x86_64-linux-gnu/13/
+          cp /usr/lib/gcc/x86_64-linux-gnu/12/libgcc.a /opt/gcc/libexec/
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 13
 
     - name: Set env
       run: |
@@ -104,7 +119,7 @@ jobs:
       run: |
         ./prepare_build.sh
         ./build.sh --release --release-sysroot
-        cargo test
+        GCC_EXEC_PREFIX=/opt/gcc/libexec/gcc/x86_64-pc-linux-gnu cargo test
 
     - name: Clean
       if: ${{ !matrix.cargo_runner }}

Cargo.toml

@@ -20,6 +20,7 @@ harness = false
 [features]
 default = ["master"]
 master = ["gccjit/master"]
+# TODO: add feature for LTO, given all the setup that is needed (having same versions of gcc, lto1, lto-wrapper, liblto_plugin.so)?
 
 [dependencies]
 gccjit = { git = "https://github.com/antoyo/gccjit.rs" }

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
+    # To avoid the -fno-inline errors, use /opt/gcc/bin/gcc instead of cc.
+    LIBRARY_PATH=gcc-build GCC_EXEC_PREFIX=/opt/gcc/libexec/gcc/x86_64-pc-linux-gnu RUSTFLAGS="$RUSTFLAGS -Zmir-opt-level=3 -Clinker=/opt/gcc/bin/gcc" 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'

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 $@

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

src/back/lto.rs

@@ -23,7 +23,6 @@
 use std::ffi::CString;
 use std::fs::{self, File};
 use std::path::{Path, PathBuf};
-use std::sync::atomic::Ordering;
 
 use gccjit::{OutputKind, OptimizationLevel};
 use object::read::archive::ArchiveFile;

src/back/write.rs

@@ -1,4 +1,3 @@
-use std::sync::atomic::Ordering;
 use std::{env, fs};
 
 use gccjit::OutputKind;

src/context.rs

@@ -1,6 +1,6 @@
 use std::cell::{Cell, RefCell};
 
-use gccjit::{Block, CType, Context, Function, FunctionPtrType, FunctionType, LValue, RValue, Type, FnAttribute, ToRValue};
+use gccjit::{Block, CType, Context, Function, FunctionPtrType, FunctionType, LValue, RValue, Type};
 use rustc_codegen_ssa::base::wants_msvc_seh;
 use rustc_codegen_ssa::traits::{
     BackendTypes,

src/declare.rs

@@ -1,4 +1,6 @@
-use gccjit::{Function, FunctionType, GlobalKind, LValue, RValue, Type, FnAttribute, ToRValue};
+use gccjit::{Function, FunctionType, GlobalKind, LValue, RValue, Type};
+#[cfg(feature="master")]
+use gccjit::{FnAttribute, ToRValue};
 use rustc_codegen_ssa::traits::BaseTypeMethods;
 use rustc_middle::ty::Ty;
 use rustc_span::Symbol;
@@ -115,6 +117,7 @@ fn declare_raw_fn<'gcc>(cx: &CodegenCx<'gcc, '_>, name: &str, _callconv: () /*ll
             let func = cx.context.new_function(None, cx.linkage.get(), return_type, &params, mangle_name(name), variadic);
             cx.functions.borrow_mut().insert(name.to_string(), func);
 
+            #[cfg(feature="master")]
             if name == "rust_eh_personality" {
                 // NOTE: GCC will sometimes change the personality function set on a function from
                 // rust_eh_personality to __gcc_personality_v0 as an optimization.

src/lib.rs

@@ -42,7 +42,6 @@ extern crate rustc_middle;
 extern crate rustc_session;
 extern crate rustc_span;
 extern crate rustc_target;
-extern crate tempfile;
 #[macro_use]
 extern crate tracing;
 
@@ -74,6 +73,7 @@ mod type_of;
 
 use std::any::Any;
 use std::sync::Arc;
+#[cfg(not(feature="master"))]
 use std::sync::atomic::AtomicBool;
 #[cfg(not(feature="master"))]
 use std::sync::atomic::Ordering;
@@ -140,7 +140,6 @@ impl TargetInfo {
 #[derive(Clone)]
 pub struct GccCodegenBackend {
     target_info: Arc<TargetInfo>,
-    should_combine_object_files: Arc<AtomicBool>,
     // Temporary directory used by LTO. We keep it here so that it's not removed before linking.
     temp_dir: Option<String>,
 }
@@ -345,7 +344,6 @@ pub fn __rustc_codegen_backend() -> Box<dyn CodegenBackend> {
 
     Box::new(GccCodegenBackend {
         target_info,
-        should_combine_object_files: Arc::new(AtomicBool::new(false)),
         temp_dir: None,
     })
 }

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 $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
@@ -167,9 +167,9 @@ function build_sysroot() {
 }
 
 function std_tests() {
-    #echo "[AOT] arbitrary_self_types_pointers_and_wrappers"
-    #$RUSTC example/arbitrary_self_types_pointers_and_wrappers.rs --crate-name arbitrary_self_types_pointers_and_wrappers --crate-type bin --target $TARGET_TRIPLE
-    #$RUN_WRAPPER ./target/out/arbitrary_self_types_pointers_and_wrappers
+    echo "[AOT] arbitrary_self_types_pointers_and_wrappers"
+    $RUSTC example/arbitrary_self_types_pointers_and_wrappers.rs --crate-name arbitrary_self_types_pointers_and_wrappers --crate-type bin --target $TARGET_TRIPLE
+    $RUN_WRAPPER ./target/out/arbitrary_self_types_pointers_and_wrappers
 
     echo "[AOT] alloc_system"
     $RUSTC example/alloc_system.rs --crate-type lib --target "$TARGET_TRIPLE"
@@ -178,7 +178,7 @@ function std_tests() {
     echo "[AOT] alloc_example"
     # TODO: -Clink-arg=-lgcc_s
     # TODO: -Cdefault-linker-libraries also fixes the issue.
-    PATH="$PATH:/opt/gcc/bin/" $RUSTC -Clto=yes example/alloc_example.rs -v --crate-type bin --target $TARGET_TRIPLE
+    PATH="$PATH:/opt/gcc/bin/" $RUSTC example/alloc_example.rs -v --crate-type bin --target $TARGET_TRIPLE
     $RUN_WRAPPER ./target/out/alloc_example
 
     echo "[AOT] dst_field_align"
@@ -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"
 
@@ -395,7 +396,8 @@ function test_rustc() {
     fi
 
     echo "[TEST] rustc test suite"
-    COMPILETEST_FORCE_STAGE0=1 ./x.py test --run always --stage 0 tests/ui/ --rustc-args "$RUSTC_ARGS"
+    ls ../gcc-build/build/gcc
+    LIBRARY_PATH=$(pwd)/../gcc-build/build/gcc GCC_EXEC_PREFIX=/opt/gcc/libexec/gcc/x86_64-pc-linux-gnu COMPILETEST_FORCE_STAGE0=1 strace -f ./x.py test --run always --stage 0 tests/ui/ --rustc-args "$RUSTC_ARGS"
 }
 
 function test_failing_rustc() {