Skip to content

Commit 3c4707e

Browse files
tgross35tgross35
committedJan 10, 2025
DROPME patch builtins
1 parent 5f00d80 commit 3c4707e

File tree

8 files changed

+44
-29
lines changed

8 files changed

+44
-29
lines changed
 

‎compiler/rustc_codegen_cranelift/Cargo.lock

+29-24
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
1010

1111
[[package]]
1212
name = "anyhow"
13-
version = "1.0.94"
13+
version = "1.0.95"
1414
source = "registry+https://github.com/rust-lang/crates.io-index"
15-
checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
15+
checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
1616

1717
[[package]]
1818
name = "arbitrary"
19-
version = "1.3.2"
19+
version = "1.4.1"
2020
source = "registry+https://github.com/rust-lang/crates.io-index"
21-
checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
21+
checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
2222

2323
[[package]]
2424
name = "bitflags"
@@ -211,9 +211,9 @@ checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
211211

212212
[[package]]
213213
name = "foldhash"
214-
version = "0.1.3"
214+
version = "0.1.4"
215215
source = "registry+https://github.com/rust-lang/crates.io-index"
216-
checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
216+
checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
217217

218218
[[package]]
219219
name = "gimli"
@@ -253,15 +253,15 @@ dependencies = [
253253

254254
[[package]]
255255
name = "libc"
256-
version = "0.2.155"
256+
version = "0.2.169"
257257
source = "registry+https://github.com/rust-lang/crates.io-index"
258-
checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
258+
checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
259259

260260
[[package]]
261261
name = "libloading"
262-
version = "0.8.4"
262+
version = "0.8.6"
263263
source = "registry+https://github.com/rust-lang/crates.io-index"
264-
checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
264+
checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
265265
dependencies = [
266266
"cfg-if",
267267
"windows-targets",
@@ -290,9 +290,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
290290

291291
[[package]]
292292
name = "object"
293-
version = "0.36.5"
293+
version = "0.36.7"
294294
source = "registry+https://github.com/rust-lang/crates.io-index"
295-
checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
295+
checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
296296
dependencies = [
297297
"crc32fast",
298298
"hashbrown 0.15.2",
@@ -311,9 +311,9 @@ dependencies = [
311311

312312
[[package]]
313313
name = "quote"
314-
version = "1.0.36"
314+
version = "1.0.38"
315315
source = "registry+https://github.com/rust-lang/crates.io-index"
316-
checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
316+
checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
317317
dependencies = [
318318
"proc-macro2",
319319
]
@@ -346,9 +346,9 @@ dependencies = [
346346

347347
[[package]]
348348
name = "rustc-hash"
349-
version = "2.0.0"
349+
version = "2.1.0"
350350
source = "registry+https://github.com/rust-lang/crates.io-index"
351-
checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
351+
checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
352352

353353
[[package]]
354354
name = "rustc_codegen_cranelift"
@@ -370,18 +370,18 @@ dependencies = [
370370

371371
[[package]]
372372
name = "serde"
373-
version = "1.0.215"
373+
version = "1.0.217"
374374
source = "registry+https://github.com/rust-lang/crates.io-index"
375-
checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
375+
checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
376376
dependencies = [
377377
"serde_derive",
378378
]
379379

380380
[[package]]
381381
name = "serde_derive"
382-
version = "1.0.215"
382+
version = "1.0.217"
383383
source = "registry+https://github.com/rust-lang/crates.io-index"
384-
checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
384+
checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
385385
dependencies = [
386386
"proc-macro2",
387387
"quote",
@@ -402,9 +402,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
402402

403403
[[package]]
404404
name = "syn"
405-
version = "2.0.90"
405+
version = "2.0.95"
406406
source = "registry+https://github.com/rust-lang/crates.io-index"
407-
checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
407+
checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a"
408408
dependencies = [
409409
"proc-macro2",
410410
"quote",
@@ -419,9 +419,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
419419

420420
[[package]]
421421
name = "unicode-ident"
422-
version = "1.0.12"
422+
version = "1.0.14"
423423
source = "registry+https://github.com/rust-lang/crates.io-index"
424-
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
424+
checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
425425

426426
[[package]]
427427
name = "wasmtime-jit-icache-coherence"
@@ -516,3 +516,8 @@ name = "windows_x86_64_msvc"
516516
version = "0.52.6"
517517
source = "registry+https://github.com/rust-lang/crates.io-index"
518518
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
519+
520+
[[patch.unused]]
521+
name = "compiler_builtins"
522+
version = "0.1.139"
523+
source = "git+https://github.com/tgross35/compiler-builtins.git?branch=overflowing-c-safe-ret#8cb74d05a80a5782a5377a825d2ddd7b950bf220"

‎compiler/rustc_codegen_cranelift/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ libloading = { version = "0.8.0", optional = true }
2323
smallvec = "1.8.1"
2424

2525
[patch.crates-io]
26-
# Uncomment to use local checkout of cranelift
26+
# todo: remove patch
27+
compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", package = "compiler_builtins", branch = "overflowing-c-safe-ret" }
2728
#cranelift-codegen = { path = "../wasmtime/cranelift/codegen" }
2829
#cranelift-frontend = { path = "../wasmtime/cranelift/frontend" }
2930
#cranelift-module = { path = "../wasmtime/cranelift/module" }

‎compiler/rustc_codegen_cranelift/patches/0029-stdlib-Disable-f16-and-f128-in-compiler-builtins.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ index 7165c3e48af..968552ad435 100644
1616

1717
[dependencies]
1818
core = { path = "../core" }
19-
-compiler_builtins = { version = "=0.1.140", features = ['rustc-dep-of-std'] }
20-
+compiler_builtins = { version = "=0.1.140", features = ['rustc-dep-of-std', 'no-f16-f128'] }
19+
-compiler_builtins = { version = "0.1.140", features = ['rustc-dep-of-std'] }
20+
+compiler_builtins = { version = "0.1.140", features = ['rustc-dep-of-std', 'no-f16-f128'] }
2121

2222
[dev-dependencies]
2323
rand = { version = "0.8.5", default-features = false, features = ["alloc"] }

‎compiler/rustc_codegen_gcc/build_system/build_sysroot/Cargo.toml

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ test = { path = "./sysroot_src/library/test" }
1313
proc_macro = { path = "./sysroot_src/library/proc_macro" }
1414

1515
[patch.crates-io]
16+
# todo: remove patch
17+
compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", package = "compiler_builtins", branch = "overflowing-c-safe-ret" }
1618
rustc-std-workspace-core = { path = "./sysroot_src/library/rustc-std-workspace-core" }
1719
rustc-std-workspace-alloc = { path = "./sysroot_src/library/rustc-std-workspace-alloc" }
1820
rustc-std-workspace-std = { path = "./sysroot_src/library/rustc-std-workspace-std" }

‎library/Cargo.lock

+5
Original file line numberDiff line numberDiff line change
@@ -488,3 +488,8 @@ name = "windows_x86_64_msvc"
488488
version = "0.52.6"
489489
source = "registry+https://github.com/rust-lang/crates.io-index"
490490
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
491+
492+
[[patch.unused]]
493+
name = "compiler_builtins"
494+
version = "0.1.139"
495+
source = "git+https://github.com/tgross35/compiler-builtins.git?branch=overflowing-c-safe-ret#8cb74d05a80a5782a5377a825d2ddd7b950bf220"

‎library/Cargo.toml

+2
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,5 @@ rustc-demangle.debug = 0
4545
rustc-std-workspace-core = { path = 'rustc-std-workspace-core' }
4646
rustc-std-workspace-alloc = { path = 'rustc-std-workspace-alloc' }
4747
rustc-std-workspace-std = { path = 'rustc-std-workspace-std' }
48+
# todo: remove patch
49+
compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", package = "compiler_builtins", branch = "overflowing-c-safe-ret" }

‎library/alloc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ edition = "2021"
1010

1111
[dependencies]
1212
core = { path = "../core" }
13-
compiler_builtins = { version = "=0.1.140", features = ['rustc-dep-of-std'] }
13+
compiler_builtins = { version = "0.1.140", features = ['rustc-dep-of-std'] }
1414

1515
[dev-dependencies]
1616
rand = { version = "0.8.5", default-features = false, features = ["alloc"] }

‎library/std/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ cfg-if = { version = "1.0", features = ['rustc-dep-of-std'] }
1717
panic_unwind = { path = "../panic_unwind", optional = true }
1818
panic_abort = { path = "../panic_abort" }
1919
core = { path = "../core", public = true }
20-
compiler_builtins = { version = "=0.1.140" }
20+
compiler_builtins = { version = "0.1.140" }
2121
unwind = { path = "../unwind" }
2222
hashbrown = { version = "0.15", default-features = false, features = [
2323
'rustc-dep-of-std',

0 commit comments

Comments
 (0)