Merge pull request #535 from rust-lang/sync_from_rust_2024_07_02

Sync from rust 2024/07/02

Author: antoyo

.github/workflows/failures.yml

@@ -94,12 +94,16 @@ jobs:
  run: cat tests/failing-non-lto-tests.txt >> tests/failing-ui-tests.txt
 
  - name: Run tests
+ # TODO: re-enable those tests for libgccjit 12.
+ if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
  id: tests
  run: |
  ${{ matrix.libgccjit_version.env_extra }} ./y.sh test --release --clean --build-sysroot --test-failing-rustc ${{ matrix.libgccjit_version.extra }} | tee output_log
  rg --text "test result" output_log >> $GITHUB_STEP_SUMMARY
 
  - name: Run failing ui pattern tests for ICE
+ # TODO: re-enable those tests for libgccjit 12.
+ if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
  id: ui-tests
  run: |
  ${{ matrix.libgccjit_version.env_extra }} ./y.sh test --release --test-failing-ui-pattern-tests ${{ matrix.libgccjit_version.extra }} | tee output_log_ui

.github/workflows/gcc12.yml

@@ -67,22 +67,24 @@ jobs:
  - name: Build
  run: |
  ./y.sh prepare --only-libcore --libgccjit12-patches
- ./y.sh build --sysroot --no-default-features --sysroot-panic-abort
- cargo test --no-default-features
- ./y.sh clean all
-
- - name: Prepare dependencies
- run: |
- git config --global user.email "user@example.com"
- git config --global user.name "User"
- ./y.sh prepare --libgccjit12-patches
-
- - name: Add more failing tests for GCC 12
- run: cat tests/failing-ui-tests12.txt >> tests/failing-ui-tests.txt
-
- - name: Add more failing tests because the sysroot is not compiled with LTO
- run: cat tests/failing-non-lto-tests.txt >> tests/failing-ui-tests.txt
-
- - name: Run tests
- run: |
- ./y.sh test --release --clean --build-sysroot ${{ matrix.commands }} --no-default-features
+ ./y.sh build --no-default-features --sysroot-panic-abort
+ # Uncomment when we no longer need to remove global variables.
+ #./y.sh build --sysroot --no-default-features --sysroot-panic-abort
+ #cargo test --no-default-features
+ #./y.sh clean all
+
+ #- name: Prepare dependencies
+ #run: |
+ #git config --global user.email "user@example.com"
+ #git config --global user.name "User"
+ #./y.sh prepare --libgccjit12-patches
+
+ #- name: Add more failing tests for GCC 12
+ #run: cat tests/failing-ui-tests12.txt >> tests/failing-ui-tests.txt
+
+ #- name: Add more failing tests because the sysroot is not compiled with LTO
+ #run: cat tests/failing-non-lto-tests.txt >> tests/failing-ui-tests.txt
+
+ #- name: Run tests
+ #run: |
+ #./y.sh test --release --clean --build-sysroot ${{ matrix.commands }} --no-default-features

.github/workflows/stdarch.yml

@@ -95,4 +95,5 @@ jobs:
  if: ${{ matrix.cargo_runner }}
  run: |
  # FIXME: these tests fail when the sysroot is compiled with LTO because of a missing symbol in proc-macro.
- STDARCH_TEST_EVERYTHING=1 CHANNEL=release CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="${{ matrix.cargo_runner }}" TARGET=x86_64-unknown-linux-gnu CG_RUSTFLAGS="-Ainternal_features" ./y.sh cargo test --manifest-path build/build_sysroot/sysroot_src/library/stdarch/Cargo.toml -- --skip rtm --skip tbm --skip sse4a
+ # TODO: remove --skip test_mm512_stream_ps when stdarch is updated in rustc.
+ STDARCH_TEST_EVERYTHING=1 CHANNEL=release CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="${{ matrix.cargo_runner }}" TARGET=x86_64-unknown-linux-gnu CG_RUSTFLAGS="-Ainternal_features" ./y.sh cargo test --manifest-path build/build_sysroot/sysroot_src/library/stdarch/Cargo.toml -- --skip rtm --skip tbm --skip sse4a --skip test_mm512_stream_ps

Cargo.lock

@@ -22,7 +22,7 @@ master = ["gccjit/master"]
 default = ["master"]
 
 [dependencies]
-gccjit = { git = "https://github.com/antoyo/gccjit.rs" }
+gccjit = "2.1"
 
 # Local copy.
 #gccjit = { path = "../gccjit.rs" }

Cargo.toml

@@ -121,8 +121,7 @@ If you compiled cg_gccjit in debug mode (aka you didn't pass `--release` to `./y
 
 ### LTO
 
-To use LTO, you need to set the variable `FAT_LTO=1` and `EMBED_LTO_BITCODE=1` in addition to setting `lto = "fat"` in the `Cargo.toml`.
-Don't set `FAT_LTO` when compiling the sysroot, though: only set `EMBED_LTO_BITCODE=1`.
+To use LTO, you need to set the variable `EMBED_LTO_BITCODE=1` in addition to setting `lto = "fat"` in the `Cargo.toml`.
 
 Failing to set `EMBED_LTO_BITCODE` will give you the following error:
 

Readme.md

@@ -387,11 +387,6 @@ impl ConfigInfo {
  rustflags.push("-Csymbol-mangling-version=v0".to_string());
  }
 
- // Since we don't support ThinLTO, disable LTO completely when not trying to do LTO.
- // TODO(antoyo): remove when we can handle ThinLTO.
- if !env.contains_key(&"FAT_LTO".to_string()) {
- rustflags.push("-Clto=off".to_string());
- }
  // FIXME(antoyo): remove once the atomic shim is gone
  if os_name == "Darwin" {
  rustflags.extend_from_slice(&[

build_system/src/config.rs

@@ -645,12 +645,16 @@ fn test_projects(env: &Env, args: &TestArg) -> Result<(), String> {
  //"https://github.com/rust-lang/cargo", // TODO: very slow, only run on master?
  ];
 
+ let mut env = env.clone();
+ let rustflags =
+ format!("{} --cap-lints allow", env.get("RUSTFLAGS").cloned().unwrap_or_default());
+ env.insert("RUSTFLAGS".to_string(), rustflags);
  let run_tests = |projects_path, iter: &mut dyn Iterator<Item = &&str>| -> Result<(), String> {
  for project in iter {
  let clone_result = git_clone_root_dir(project, projects_path, true)?;
  let repo_path = Path::new(&clone_result.repo_dir);
- run_cargo_command(&[&"build", &"--release"], Some(repo_path), env, args)?;
- run_cargo_command(&[&"test"], Some(repo_path), env, args)?;
+ run_cargo_command(&[&"build", &"--release"], Some(repo_path), &env, args)?;
+ run_cargo_command(&[&"test"], Some(repo_path), &env, args)?;
  }
 
  Ok(())
@@ -1034,18 +1038,19 @@ where
 }
 
 fn test_rustc(env: &Env, args: &TestArg) -> Result<(), String> {
- test_rustc_inner(env, args, |_| Ok(false), false, "run-make")?;
+ //test_rustc_inner(env, args, |_| Ok(false), false, "run-make")?;
  test_rustc_inner(env, args, |_| Ok(false), false, "ui")
 }
 
 fn test_failing_rustc(env: &Env, args: &TestArg) -> Result<(), String> {
- let result1 = test_rustc_inner(
+ let result1 = Ok(());
+ /*test_rustc_inner(
  env,
  args,
  retain_files_callback("tests/failing-run-make-tests.txt", "run-make"),
  false,
  "run-make",
- );
+ )*/
 
  let result2 = test_rustc_inner(
  env,
@@ -1066,13 +1071,14 @@ fn test_successful_rustc(env: &Env, args: &TestArg) -> Result<(), String> {
  false,
  "ui",
  )?;
- test_rustc_inner(
+ Ok(())
+ /*test_rustc_inner(
  env,
  args,
  remove_files_callback("tests/failing-run-make-tests.txt", "run-make"),
  false,
  "run-make",
- )
+ )*/
 }
 
 fn test_failing_ui_pattern_tests(env: &Env, args: &TestArg) -> Result<(), String> {

build_system/src/test.rs

@@ -153,7 +153,7 @@ fn array_as_slice(arr: &[u8; 3]) -> &[u8] {
  arr
 }
 
-unsafe fn use_ctlz_nonzero(a: u16) -> u16 {
+unsafe fn use_ctlz_nonzero(a: u16) -> u32 {
  intrinsics::ctlz_nonzero(a)
 }
 

example/example.rs

@@ -1,6 +1,6 @@
 #![feature(
  no_core, lang_items, intrinsics, unboxed_closures, type_ascription, extern_types,
- decl_macro, rustc_attrs, transparent_unions, auto_traits,
+ decl_macro, rustc_attrs, transparent_unions, auto_traits, freeze_impls,
  thread_local
 )]
 #![no_core]
@@ -418,6 +418,35 @@ pub fn panic(_msg: &'static str) -> ! {
  }
 }
 
+macro_rules! panic_const {
+ ($($lang:ident = $message:expr,)+) => {
+ pub mod panic_const {
+ use super::*;
+
+ $(
+ #[track_caller]
+ #[lang = stringify!($lang)]
+ pub fn $lang() -> ! {
+ panic($message);
+ }
+ )+
+ }
+ }
+}
+
+panic_const! {
+ panic_const_add_overflow = "attempt to add with overflow",
+ panic_const_sub_overflow = "attempt to subtract with overflow",
+ panic_const_mul_overflow = "attempt to multiply with overflow",
+ panic_const_div_overflow = "attempt to divide with overflow",
+ panic_const_rem_overflow = "attempt to calculate the remainder with overflow",
+ panic_const_neg_overflow = "attempt to negate with overflow",
+ panic_const_shr_overflow = "attempt to shift right with overflow",
+ panic_const_shl_overflow = "attempt to shift left with overflow",
+ panic_const_div_by_zero = "attempt to divide by zero",
+ panic_const_rem_by_zero = "attempt to calculate the remainder with a divisor of zero",
+}
+
 #[lang = "panic_cannot_unwind"]
 fn panic_cannot_unwind() -> ! {
  unsafe {
@@ -563,7 +592,7 @@ pub mod intrinsics {
  pub fn min_align_of_val<T: ?Sized>(val: *const T) -> usize;
  pub fn copy<T>(src: *const T, dst: *mut T, count: usize);
  pub fn transmute<T, U>(e: T) -> U;
- pub fn ctlz_nonzero<T>(x: T) -> T;
+ pub fn ctlz_nonzero<T>(x: T) -> u32;
  #[rustc_safe_intrinsic]
  pub fn needs_drop<T: ?Sized>() -> bool;
  #[rustc_safe_intrinsic]