Merge branch 'master' into 2022-08-26_sync_from_rust

Author: antoyo

.github/workflows/ci.yml

@@ -4,14 +4,32 @@ on:
   - push
   - pull_request
 
+env:
+  # Enable backtraces for easier debugging
+  RUST_BACKTRACE: 1
+
 jobs:
   build:
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       matrix:
-        libgccjit_version: ["libgccjit.so", "libgccjit_without_int128.so", "libgccjit12.so"]
+        libgccjit_version:
+          - { gcc: "libgccjit.so", extra: "" }
+          - { gcc: "libgccjit_without_int128.so", extra: "" }
+          - { gcc: "libgccjit12.so", extra: "--no-default-features" }
+        commands: [
+          "--mini-tests",
+          "--std-tests",
+          "--test-libcore",
+          "--extended-rand-tests",
+          "--extended-regex-example-tests",
+          "--extended-regex-tests",
+          "--test-successful-rustc --nb-parts 2 --current-part 0",
+          "--test-successful-rustc --nb-parts 2 --current-part 1",
+          "--test-failing-rustc",
+        ]
 
     steps:
     - uses: actions/checkout@v2
@@ -28,7 +46,7 @@ jobs:
       uses: dawidd6/action-download-artifact@v2
       with:
           workflow: main.yml
-          name: ${{ matrix.libgccjit_version }}
+          name: ${{ matrix.libgccjit_version.gcc }}
           path: gcc-build
           repo: antoyo/gcc
           search_artifacts: true # Because, instead, the action only check the last job ran and that won't work since we want multiple artifacts.
@@ -38,13 +56,11 @@ 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
-
     - name: Set env
       run: |
         echo "LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
         echo "LD_LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
         echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV
-
     - name: Set RUST_COMPILER_RT_ROOT
       run: echo "RUST_COMPILER_RT_ROOT="${{ env.workspace }}/llvm/compiler-rt >> $GITHUB_ENV
 
@@ -77,55 +93,42 @@ jobs:
         path: target
         key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('rust-toolchain') }}
 
-    - name: Build
-      if: matrix.libgccjit_version != 'libgccjit12.so'
-      run: |
-        ./prepare_build.sh
-        ./build.sh
-        cargo test
-        ./clean_all.sh
+    - name: Cache rust repository
+      # We only clone the rust repository for rustc tests
+      if: ${{ contains(matrix.commands, 'rustc') }}
+      uses: actions/cache@v2
+      id: cache-rust-repository
+      with:
+        path: rust
+        key: ${{ runner.os }}-packages-${{ hashFiles('rust/.git/HEAD') }}
 
     - name: Build
-      if: matrix.libgccjit_version == 'libgccjit12.so'
       run: |
         ./prepare_build.sh
-        ./build.sh --no-default-features
-        cargo test --no-default-features
+        ./build.sh ${{ matrix.libgccjit_version.extra }}
+        cargo test ${{ matrix.libgccjit_version.extra }}
         ./clean_all.sh
-
     - name: Prepare dependencies
       run: |
         git config --global user.email "user@example.com"
         git config --global user.name "User"
         ./prepare.sh
-
     # Compile is a separate step, as the actions-rs/cargo action supports error annotations
     - name: Compile
       uses: actions-rs/cargo@v1.0.3
       with:
         command: build
         args: --release
 
-    - name: Test
-      if: matrix.libgccjit_version != 'libgccjit12.so'
-      run: |
-        # Enable backtraces for easier debugging
-        export RUST_BACKTRACE=1
-
-        # Reduce amount of benchmark runs as they are slow
-        export COMPILE_RUNS=2
-        export RUN_RUNS=2
-
-        ./test.sh --release
+    - name: Add more failing tests for GCC 12
+      if: ${{ matrix.libgccjit_version.gcc == 'libgccjit12.so' }}
+      run: cat failing-ui-tests12.txt >> failing-ui-tests.txt
 
-    - name: Test
-      if: matrix.libgccjit_version == 'libgccjit12.so'
+    - name: Run tests
       run: |
-        # Enable backtraces for easier debugging
-        export RUST_BACKTRACE=1
-
-        # Reduce amount of benchmark runs as they are slow
-        export COMPILE_RUNS=2
-        export RUN_RUNS=2
-
-        ./test.sh --release --no-default-features
+        ./test.sh --release --clean --build-sysroot ${{ matrix.commands }} ${{ matrix.libgccjit_version.extra }}
+  duplicates:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: python tools/check_intrinsics_duplicates.py

Cargo.lock

@@ -27,6 +27,7 @@ gccjit = { git = "https://github.com/antoyo/gccjit.rs" }
 # Local copy.
 #gccjit = { path = "../gccjit.rs" }
 
+smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
 target-lexicon = "0.10.0"
 
 ar = "0.8.0"

Cargo.toml

@@ -127,6 +127,10 @@ To get the `rustc` command to run in `gdb`, add the `--verbose` flag to `cargo b
  * Build the stage2 compiler (`rustup toolchain link debug-current build/x86_64-unknown-linux-gnu/stage2`).
  * Clean and rebuild the codegen with `debug-current` in the file `rust-toolchain`.
 
+### How to use [mem-trace](https://github.com/antoyo/mem-trace)
+
+`rustc` needs to be built without `jemalloc` so that `mem-trace` can overload `malloc` since `jemalloc` is linked statically, so a `LD_PRELOAD`-ed library won't a chance to intercept the calls to `malloc`.
+
 ### How to build a cross-compiling libgccjit
 
 #### Building libgccjit
@@ -142,6 +146,5 @@ To get the `rustc` command to run in `gdb`, add the `--verbose` flag to `cargo b
  * Since rustc doesn't support this architecture yet, set it back to `TARGET_TRIPLE="mips-unknown-linux-gnu"` (or another target having the same attributes). Alternatively, create a [target specification file](https://book.avr-rust.com/005.1-the-target-specification-json-file.html) (note that the `arch` specified in this file must be supported by the rust compiler).
  * Set `linker='-Clinker=m68k-linux-gcc'`.
  * Set the path to the cross-compiling libgccjit in `gcc_path`.
- * Disable the 128-bit integer types if the target doesn't support them by using `let i128_type = context.new_type::<i64>();` in `context.rs` (same for u128_type).
  * Comment the line: `context.add_command_line_option("-masm=intel");` in src/base.rs.
  * (might not be necessary) Disable the compilation of libstd.so (and possibly libcore.so?).

Readme.md

@@ -0,0 +1,55 @@
+src/test/ui/alloc-error/default-alloc-error-hook.rs
+src/test/ui/allocator/custom-in-block.rs
+src/test/ui/allocator/custom-in-submodule.rs
+src/test/ui/allocator/custom.rs
+src/test/ui/allocator/hygiene.rs
+src/test/ui/allocator/no_std-alloc-error-handler-custom.rs
+src/test/ui/allocator/no_std-alloc-error-handler-default.rs
+src/test/ui/allocator/xcrate-use.rs
+src/test/ui/allocator/xcrate-use2.rs
+src/test/ui/asm/may_unwind.rs
+src/test/ui/asm/x86_64/const.rs
+src/test/ui/asm/x86_64/multiple-clobber-abi.rs
+src/test/ui/async-await/async-fn-size-moved-locals.rs
+src/test/ui/async-await/async-fn-size-uninit-locals.rs
+src/test/ui/backtrace.rs
+src/test/ui/cfg/cfg-panic.rs
+src/test/ui/debuginfo/debuginfo-emit-llvm-ir-and-split-debuginfo.rs
+src/test/ui/functions-closures/parallel-codegen-closures.rs
+src/test/ui/generator/size-moved-locals.rs
+src/test/ui/issues/issue-32518.rs
+src/test/ui/issues/issue-47364.rs
+src/test/ui/issues/issue-74564-if-expr-stack-overflow.rs
+src/test/ui/linkage-attr/linkage1.rs
+src/test/ui/lto/dylib-works.rs
+src/test/ui/mir/mir_heavy_promoted.rs
+src/test/ui/numbers-arithmetic/saturating-float-casts.rs
+src/test/ui/polymorphization/promoted-function.rs
+src/test/ui/runtime/rt-explody-panic-payloads.rs
+src/test/ui/sepcomp/sepcomp-cci.rs
+src/test/ui/sepcomp/sepcomp-extern.rs
+src/test/ui/sepcomp/sepcomp-fns-backwards.rs
+src/test/ui/sepcomp/sepcomp-fns.rs
+src/test/ui/sepcomp/sepcomp-lib.rs
+src/test/ui/sepcomp/sepcomp-statics.rs
+src/test/ui/simd/generics.rs
+src/test/ui/simd/intrinsic/float-math-pass.rs
+src/test/ui/simd/intrinsic/float-minmax-pass.rs
+src/test/ui/simd/intrinsic/generic-arithmetic-pass.rs
+src/test/ui/simd/intrinsic/generic-as.rs
+src/test/ui/simd/intrinsic/generic-bitmask-pass.rs
+src/test/ui/simd/intrinsic/generic-comparison-pass.rs
+src/test/ui/simd/intrinsic/generic-gather-pass.rs
+src/test/ui/simd/intrinsic/generic-reduction-pass.rs
+src/test/ui/simd/intrinsic/generic-select-pass.rs
+src/test/ui/simd/issue-17170.rs
+src/test/ui/simd/issue-39720.rs
+src/test/ui/simd/issue-85915-simd-ptrs.rs
+src/test/ui/simd/issue-89193.rs
+src/test/ui/simd/libm_std_can_float.rs
+src/test/ui/simd/simd-bitmask.rs
+src/test/ui/simd/type-generic-monomorphisation-extern-nonnull-ptr.rs
+src/test/ui/sse2.rs
+src/test/ui/statics/issue-91050-1.rs
+src/test/ui/statics/issue-91050-2.rs
+src/test/ui/target-feature/missing-plusminus.rs

failing-ui-tests.txt

@@ -0,0 +1,17 @@
+src/test/ui/intrinsics/const-eval-select-x86_64.rs
+src/test/ui/packed/packed-struct-drop-aligned.rs
+src/test/ui/packed/packed-struct-generic-layout.rs
+src/test/ui/packed/packed-struct-layout.rs
+src/test/ui/packed/packed-struct-optimized-enum.rs
+src/test/ui/packed/packed-struct-size.rs
+src/test/ui/packed/packed-struct-vec.rs
+src/test/ui/packed/packed-tuple-struct-layout.rs
+src/test/ui/simd/array-type.rs
+src/test/ui/simd/intrinsic/generic-arithmetic-saturating-pass.rs
+src/test/ui/simd/intrinsic/generic-cast-pass.rs
+src/test/ui/simd/intrinsic/generic-cast-pointer-width.rs
+src/test/ui/simd/intrinsic/generic-elements-pass.rs
+src/test/ui/simd/intrinsic/inlining-issue67557-ice.rs
+src/test/ui/simd/intrinsic/inlining-issue67557.rs
+src/test/ui/simd/monomorphize-shuffle-index.rs
+src/test/ui/simd/shuffle.rs

failing-ui-tests12.txt

@@ -0,0 +1,39 @@
+From c3821e02fbd6cb5ad6e06d759fccdc9073712375 Mon Sep 17 00:00:00 2001
+From: Antoni Boucher <bouanto@zoho.com>
+Date: Tue, 7 Jun 2022 21:40:13 -0400
+Subject: [PATCH] Add stdarch Cargo.toml for testing
+
+---
+ library/stdarch/Cargo.toml | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+ create mode 100644 library/stdarch/Cargo.toml
+
+diff --git a/library/stdarch/Cargo.toml b/library/stdarch/Cargo.toml
+new file mode 100644
+index 0000000..fbe0a95
+--- /dev/null
++++ b/library/stdarch/Cargo.toml
+@@ -0,0 +1,20 @@
++[workspace]
++members = [
++  "crates/core_arch",
++  "crates/std_detect",
++  "crates/stdarch-gen",
++  "examples/"
++]
++exclude = [
++  "crates/wasm-assert-instr-tests"
++]
++
++[profile.release]
++debug = true
++opt-level = 3
++incremental = true
++
++[profile.bench]
++debug = 1
++opt-level = 3
++incremental = true
+-- 
+2.26.2.7.g19db9cfb68.dirty
+

patches/0001-Add-stdarch-Cargo.toml-for-testing.patch

@@ -1,3 +1,5 @@
+#[cfg(feature="master")]
+use gccjit::FnAttribute;
 use gccjit::{FunctionType, GlobalKind, ToRValue};
 use rustc_ast::expand::allocator::{AllocatorKind, AllocatorTy, ALLOCATOR_METHODS};
 use rustc_middle::bug;
@@ -50,7 +52,8 @@ pub(crate) unsafe fn codegen(tcx: TyCtxt<'_>, mods: &mut GccContext, _module_nam
         let func = context.new_function(None, FunctionType::Exported, output.unwrap_or(void), &args, name, false);
 
         if tcx.sess.target.options.default_hidden_visibility {
-            // TODO(antoyo): set visibility.
+            #[cfg(feature="master")]
+            func.add_attribute(FnAttribute::Visibility(gccjit::Visibility::Hidden));
         }
         if tcx.sess.must_emit_unwind_tables() {
             // TODO(antoyo): emit unwind tables.
@@ -61,7 +64,8 @@ pub(crate) unsafe fn codegen(tcx: TyCtxt<'_>, mods: &mut GccContext, _module_nam
             .map(|(index, typ)| context.new_parameter(None, *typ, &format!("param{}", index)))
             .collect();
         let callee = context.new_function(None, FunctionType::Extern, output.unwrap_or(void), &args, callee, false);
-        // TODO(antoyo): set visibility.
+        #[cfg(feature="master")]
+        callee.add_attribute(FnAttribute::Visibility(gccjit::Visibility::Hidden));
 
         let block = func.new_block("entry");
 
@@ -90,6 +94,11 @@ pub(crate) unsafe fn codegen(tcx: TyCtxt<'_>, mods: &mut GccContext, _module_nam
         .collect();
     let func = context.new_function(None, FunctionType::Exported, void, &args, name, false);
 
+    if tcx.sess.target.default_hidden_visibility {
+        #[cfg(feature="master")]
+        func.add_attribute(FnAttribute::Visibility(gccjit::Visibility::Hidden));
+    }
+
     let kind =
         if has_alloc_error_handler {
             AllocatorKind::Global
@@ -102,7 +111,8 @@ pub(crate) unsafe fn codegen(tcx: TyCtxt<'_>, mods: &mut GccContext, _module_nam
         .map(|(index, typ)| context.new_parameter(None, *typ, &format!("param{}", index)))
         .collect();
     let callee = context.new_function(None, FunctionType::Extern, void, &args, callee, false);
-    //llvm::LLVMRustSetVisibility(callee, llvm::Visibility::Hidden);
+    #[cfg(feature="master")]
+    callee.add_attribute(FnAttribute::Visibility(gccjit::Visibility::Hidden));
 
     let block = func.new_block("entry");