Merge pull request #421 from rust-lang/update/gcc

antoyo · web-flow · commit b04824a3b2f2 · 2024-02-02T12:11:57.000-05:00
Update for rebased gcc
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,19 +49,11 @@ jobs:
       run: sudo apt-get install ninja-build ripgrep llvm-14-tools
 
     - name: Download artifact
-      uses: dawidd6/action-download-artifact@v2
-      with:
-          workflow: main.yml
-          name: gcc-13
-          path: gcc-13
-          repo: antoyo/gcc
-          branch: ${{ matrix.libgccjit_version.artifacts_branch }}
-          event: push
-          search_artifacts: true # Because, instead, the action only check the last job ran and that won't work since we want multiple artifacts.
+      run: curl -LO https://github.com/antoyo/gcc/releases/latest/download/gcc-13.deb
 
     - name: Setup path to libgccjit
       run: |
-          sudo dpkg --force-overwrite -i gcc-13/gcc-13.deb
+          sudo dpkg --force-overwrite -i gcc-13.deb
           echo /usr/lib/ > gcc_path
 
     - name: Set env
@@ -95,7 +87,7 @@ jobs:
         ./y.sh prepare
 
     - name: Add more failing tests because the sysroot is not compiled with LTO
-      run: cat failing-non-lto-tests.txt >> failing-ui-tests.txt
+      run: cat tests/failing-non-lto-tests.txt >> tests/failing-ui-tests.txt
 
     - name: Run tests
       run: |
diff --git a/.github/workflows/failures.yml b/.github/workflows/failures.yml
@@ -56,20 +56,12 @@ jobs:
 
     - name: Download artifact
       if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
-      uses: dawidd6/action-download-artifact@v2
-      with:
-          workflow: main.yml
-          name: gcc-13
-          path: gcc-13
-          repo: antoyo/gcc
-          branch: ${{ matrix.libgccjit_version.artifacts_branch }}
-          event: push
-          search_artifacts: true # Because, instead, the action only check the last job ran and that won't work since we want multiple artifacts.
+      run: curl -LO https://github.com/antoyo/gcc/releases/latest/download/gcc-13.deb
 
     - name: Setup path to libgccjit
       if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
       run: |
-          sudo dpkg --force-overwrite -i gcc-13/gcc-13.deb
+          sudo dpkg --force-overwrite -i gcc-13.deb
           echo /usr/lib/ > gcc_path
 
     - name: Set env
@@ -99,7 +91,7 @@ jobs:
       run: ./y.sh prepare
 
     - name: Add more failing tests because the sysroot is not compiled with LTO
-      run: cat failing-non-lto-tests.txt >> failing-ui-tests.txt
+      run: cat tests/failing-non-lto-tests.txt >> tests/failing-ui-tests.txt
 
     - name: Run tests
       id: tests
diff --git a/.github/workflows/gcc12.yml b/.github/workflows/gcc12.yml
@@ -78,10 +78,10 @@ jobs:
         ./y.sh prepare --libgccjit12-patches
 
     - name: Add more failing tests for GCC 12
-      run: cat failing-ui-tests12.txt >> failing-ui-tests.txt
+      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 failing-non-lto-tests.txt >> failing-ui-tests.txt
+      run: cat tests/failing-non-lto-tests.txt >> tests/failing-ui-tests.txt
 
     - name: Run tests
       run: |
diff --git a/.github/workflows/m68k.yml b/.github/workflows/m68k.yml
@@ -50,14 +50,8 @@ jobs:
         sudo apt-get update
         sudo apt-get install qemu qemu-user-static
 
-    - name: Download GCC artifact
-      uses: dawidd6/action-download-artifact@v2
-      with:
-          workflow: m68k.yml
-          name: gcc-m68k-13
-          repo: cross-cg-gcc-tools/cross-gcc
-          branch: master
-          event: push
+    - name: Download artifact
+      run: curl -LO https://github.com/cross-cg-gcc-tools/cross-gcc/releases/latest/download/gcc-m68k-13.deb
 
     - name: Download VM artifact
       uses: dawidd6/action-download-artifact@v2
@@ -110,7 +104,7 @@ jobs:
         ./y.sh prepare --cross
 
     - name: Add more failing tests because the sysroot is not compiled with LTO
-      run: cat failing-non-lto-tests.txt >> failing-ui-tests.txt
+      run: cat tests/failing-non-lto-tests.txt >> tests/failing-ui-tests.txt
 
     - name: Run tests
       run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -37,19 +37,11 @@ jobs:
       run: sudo apt-get install ninja-build ripgrep
 
     - name: Download artifact
-      uses: dawidd6/action-download-artifact@v2
-      with:
-          workflow: main.yml
-          name: gcc-13
-          path: gcc-13
-          repo: antoyo/gcc
-          branch: "master"
-          event: push
-          search_artifacts: true # Because, instead, the action only check the last job ran and that won't work since we want multiple artifacts.
+      run: curl -LO https://github.com/antoyo/gcc/releases/latest/download/gcc-13.deb
 
     - name: Setup path to libgccjit
       run: |
-          sudo dpkg --force-overwrite -i gcc-13/gcc-13.deb
+          sudo dpkg --force-overwrite -i gcc-13.deb
           echo /usr/lib/ > gcc_path
 
     - name: Set env
@@ -76,7 +68,7 @@ jobs:
         echo -n 'lto = "fat"' >> build_sysroot/Cargo.toml
 
     - name: Add more failing tests because of undefined symbol errors (FIXME)
-      run: cat failing-lto-tests.txt >> failing-ui-tests.txt
+      run: cat tests/failing-lto-tests.txt >> tests/failing-ui-tests.txt
 
     - name: Run tests
       run: |
diff --git a/.github/workflows/stdarch.yml b/.github/workflows/stdarch.yml
@@ -51,19 +51,11 @@ jobs:
           sudo ln -s /usr/share/intel-sde/sde64 /usr/bin/sde64
 
     - name: Download artifact
-      uses: dawidd6/action-download-artifact@v2
-      with:
-          workflow: main.yml
-          name: gcc-13
-          path: gcc-13
-          repo: antoyo/gcc
-          branch: "master"
-          event: push
-          search_artifacts: true # Because, instead, the action only check the last job ran and that won't work since we want multiple artifacts.
+      run: curl -LO https://github.com/antoyo/gcc/releases/latest/download/gcc-13.deb
 
     - name: Setup path to libgccjit
       run: |
-          sudo dpkg --force-overwrite -i gcc-13/gcc-13.deb
+          sudo dpkg --force-overwrite -i gcc-13.deb
           echo /usr/lib/ > gcc_path
 
     - name: Set env
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,8 @@ gimple*
 res
 test-backend
 gcc_path
+cross_gcc_path
+projects
 benchmarks
 tools/llvm-project
 tools/llvmint
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/build_system/src/test.rs b/build_system/src/test.rs
@@ -988,7 +988,6 @@ where
         // one test.
         let count = files.len() / nb_parts + 1;
         let start = current_part * count;
-        let end = current_part * count + count;
         // We remove the files we don't want to test.
         for path in files.iter().skip(start).take(count) {
             remove_file(&rust_path.join(path))?;
@@ -1047,7 +1046,7 @@ fn test_failing_rustc(env: &Env, args: &TestArg) -> Result<(), String> {
             Some(Path::new("rust")),
         )?;
         // Putting back only the failing ones.
-        let path = "failing-ui-tests.txt";
+        let path = "tests/failing-ui-tests.txt";
         if let Ok(files) = std::fs::read_to_string(path) {
             for file in files
                 .split('\n')
@@ -1072,7 +1071,7 @@ fn test_failing_rustc(env: &Env, args: &TestArg) -> Result<(), String> {
 fn test_successful_rustc(env: &Env, args: &TestArg) -> Result<(), String> {
     test_rustc_inner(env, args, || {
         // Removing the failing tests.
-        let path = "failing-ui-tests.txt";
+        let path = "tests/failing-ui-tests.txt";
         if let Ok(files) = std::fs::read_to_string(path) {
             for file in files
                 .split('\n')
diff --git a/src/consts.rs b/src/consts.rs
@@ -235,7 +235,7 @@ impl<'gcc, 'tcx> CodegenCx<'gcc, 'tcx> {
 
             if !self.tcx.is_reachable_non_generic(def_id) {
                 #[cfg(feature = "master")]
-                global.add_attribute(VarAttribute::Visibility(Visibility::Hidden));
+                global.add_string_attribute(VarAttribute::Visibility(Visibility::Hidden));
             }
 
             global
diff --git a/src/mono_item.rs b/src/mono_item.rs
@@ -23,7 +23,7 @@ impl<'gcc, 'tcx> PreDefineMethods<'tcx> for CodegenCx<'gcc, 'tcx> {
         let is_tls = attrs.flags.contains(CodegenFnAttrFlags::THREAD_LOCAL);
         let global = self.define_global(symbol_name, gcc_type, is_tls, attrs.link_section);
         #[cfg(feature="master")]
-        global.add_attribute(VarAttribute::Visibility(base::visibility_to_gcc(visibility)));
+        global.add_string_attribute(VarAttribute::Visibility(base::visibility_to_gcc(visibility)));
 
         // TODO(antoyo): set linkage.
         self.instances.borrow_mut().insert(instance, global);
diff --git a/tests/failing-lto-tests.txt b/tests/failing-lto-tests.txt
diff --git a/tests/failing-non-lto-tests.txt b/tests/failing-non-lto-tests.txt
diff --git a/tests/failing-ui-tests.txt b/tests/failing-ui-tests.txt
@@ -70,3 +70,4 @@ tests/ui/async-await/deep-futures-are-freeze.rs
 tests/ui/closures/capture-unsized-by-ref.rs
 tests/ui/coroutine/resume-after-return.rs
 tests/ui/macros/rfc-2011-nicer-assert-messages/all-expr-kinds.rs
+tests/ui/intrinsics/intrinsics-integer.rs
diff --git a/tests/failing-ui-tests12.txt b/tests/failing-ui-tests12.txt
@@ -38,6 +38,5 @@ tests/ui/rust-2018/proc-macro-crate-in-paths.rs
 tests/ui/target-feature/missing-plusminus.rs
 tests/ui/sse2.rs
 tests/ui/codegen/issue-79865-llvm-miscompile.rs
-tests/ui/intrinsics/intrinsics-integer.rs
 tests/ui/std-backtrace.rs
 tests/ui/mir/alignment/packed.rs

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ impl<'gcc, 'tcx> CodegenCx<'gcc, 'tcx> {`
`235`	`235`
`236`	`236`	`if !self.tcx.is_reachable_non_generic(def_id) {`
`237`	`237`	`#[cfg(feature = "master")]`
`238`		`- global.add_attribute(VarAttribute::Visibility(Visibility::Hidden));`
	`238`	`+ global.add_string_attribute(VarAttribute::Visibility(Visibility::Hidden));`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`global`