Skip to content

Commit 521ed6e

Browse files
committed
Merge commit 'dda103b1e33c4902deca8bccf614991ada781fa6' into sync_cg_clif-2023-09-06
2 parents a5b2ac6 + dda103b commit 521ed6e

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

compiler/rustc_codegen_cranelift/docs/usage.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ These are a few functions that allow you to easily run rust code from the shell
5454

5555
```bash
5656
function jit_naked() {
57-
echo "$@" | $cg_clif_dir/dist/rustc-clif - -Zunstable-features -Cllvm-args=mode=jit -Cprefer-dynamic
57+
echo "$@" | $cg_clif_dir/dist/rustc-clif - -Zunstable-options -Cllvm-args=mode=jit-lazy -Cprefer-dynamic
5858
}
5959

6060
function jit() {

compiler/rustc_codegen_cranelift/patches/stdlib-lock.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ version = 3
44

55
[[package]]
66
name = "addr2line"
7-
version = "0.20.0"
7+
version = "0.21.0"
88
source = "registry+https://github.com/rust-lang/crates.io-index"
9-
checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
9+
checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
1010
dependencies = [
1111
"compiler_builtins",
1212
"gimli",
@@ -140,9 +140,9 @@ dependencies = [
140140

141141
[[package]]
142142
name = "gimli"
143-
version = "0.27.2"
143+
version = "0.28.0"
144144
source = "registry+https://github.com/rust-lang/crates.io-index"
145-
checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
145+
checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
146146
dependencies = [
147147
"compiler_builtins",
148148
"rustc-std-workspace-alloc",
@@ -205,9 +205,9 @@ dependencies = [
205205

206206
[[package]]
207207
name = "object"
208-
version = "0.31.1"
208+
version = "0.32.0"
209209
source = "registry+https://github.com/rust-lang/crates.io-index"
210-
checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
210+
checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe"
211211
dependencies = [
212212
"compiler_builtins",
213213
"memchr",
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2023-08-08"
2+
channel = "nightly-2023-09-06"
33
components = ["rust-src", "rustc-dev", "llvm-tools"]

compiler/rustc_codegen_cranelift/scripts/test_rustc_tests.sh

+2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ rm tests/ui/proc-macro/quote-debug.rs
4545
rm tests/ui/proc-macro/no-missing-docs.rs
4646
rm tests/ui/rust-2018/proc-macro-crate-in-paths.rs
4747
rm tests/ui/proc-macro/allowed-signatures.rs
48+
rm tests/ui/proc-macro/no-mangle-in-proc-macro-issue-111888.rs
4849

4950
# vendor intrinsics
5051
rm tests/ui/sse2.rs # cpuid not supported, so sse2 not detected
@@ -114,6 +115,7 @@ rm tests/ui/mir/mir_misc_casts.rs # depends on deduplication of constants
114115
rm tests/ui/mir/mir_raw_fat_ptr.rs # same
115116
rm tests/ui/consts/issue-33537.rs # same
116117
rm tests/ui/layout/valid_range_oob.rs # different ICE message
118+
rm tests/ui/const-generics/generic_const_exprs/issue-80742.rs # gives error instead of ICE with cg_clif
117119

118120
rm tests/ui/consts/issue-miri-1910.rs # different error message
119121
rm tests/ui/consts/offset_ub.rs # same

0 commit comments

Comments
 (0)