Skip to content

Commit c2a51c9

Browse files
tgross35tgross35
committed
DROPME patch builtins
1 parent 31e25c3 commit c2a51c9

File tree

8 files changed

+66
-42
lines changed

8 files changed

+66
-42
lines changed

‎compiler/rustc_codegen_cranelift/Cargo.lock‎

Lines changed: 54 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ dependencies = [
1616

1717
[[package]]
1818
name = "anyhow"
19-
version = "1.0.86"
19+
version = "1.0.94"
2020
source = "registry+https://github.com/rust-lang/crates.io-index"
21-
checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
21+
checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
2222

2323
[[package]]
2424
name = "arbitrary"
25-
version = "1.3.2"
25+
version = "1.4.1"
2626
source = "registry+https://github.com/rust-lang/crates.io-index"
27-
checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
27+
checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
2828

2929
[[package]]
3030
name = "bitflags"
@@ -74,7 +74,7 @@ dependencies = [
7474
"cranelift-entity",
7575
"cranelift-isle",
7676
"gimli",
77-
"hashbrown",
77+
"hashbrown 0.14.5",
7878
"log",
7979
"regalloc2",
8080
"rustc-hash",
@@ -212,6 +212,12 @@ version = "0.3.0"
212212
source = "registry+https://github.com/rust-lang/crates.io-index"
213213
checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
214214

215+
[[package]]
216+
name = "foldhash"
217+
version = "0.1.3"
218+
source = "registry+https://github.com/rust-lang/crates.io-index"
219+
checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
220+
215221
[[package]]
216222
name = "gimli"
217223
version = "0.31.1"
@@ -232,27 +238,36 @@ dependencies = [
232238
"ahash",
233239
]
234240

241+
[[package]]
242+
name = "hashbrown"
243+
version = "0.15.2"
244+
source = "registry+https://github.com/rust-lang/crates.io-index"
245+
checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
246+
dependencies = [
247+
"foldhash",
248+
]
249+
235250
[[package]]
236251
name = "indexmap"
237-
version = "2.2.6"
252+
version = "2.7.0"
238253
source = "registry+https://github.com/rust-lang/crates.io-index"
239-
checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
254+
checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
240255
dependencies = [
241256
"equivalent",
242-
"hashbrown",
257+
"hashbrown 0.15.2",
243258
]
244259

245260
[[package]]
246261
name = "libc"
247-
version = "0.2.155"
262+
version = "0.2.168"
248263
source = "registry+https://github.com/rust-lang/crates.io-index"
249-
checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
264+
checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
250265

251266
[[package]]
252267
name = "libloading"
253-
version = "0.8.4"
268+
version = "0.8.6"
254269
source = "registry+https://github.com/rust-lang/crates.io-index"
255-
checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
270+
checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
256271
dependencies = [
257272
"cfg-if",
258273
"windows-targets",
@@ -281,36 +296,36 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
281296

282297
[[package]]
283298
name = "object"
284-
version = "0.36.2"
299+
version = "0.36.5"
285300
source = "registry+https://github.com/rust-lang/crates.io-index"
286-
checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e"
301+
checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
287302
dependencies = [
288303
"crc32fast",
289-
"hashbrown",
304+
"hashbrown 0.15.2",
290305
"indexmap",
291306
"memchr",
292307
]
293308

294309
[[package]]
295310
name = "once_cell"
296-
version = "1.19.0"
311+
version = "1.20.2"
297312
source = "registry+https://github.com/rust-lang/crates.io-index"
298-
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
313+
checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
299314

300315
[[package]]
301316
name = "proc-macro2"
302-
version = "1.0.86"
317+
version = "1.0.92"
303318
source = "registry+https://github.com/rust-lang/crates.io-index"
304-
checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
319+
checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
305320
dependencies = [
306321
"unicode-ident",
307322
]
308323

309324
[[package]]
310325
name = "quote"
311-
version = "1.0.36"
326+
version = "1.0.37"
312327
source = "registry+https://github.com/rust-lang/crates.io-index"
313-
checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
328+
checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
314329
dependencies = [
315330
"proc-macro2",
316331
]
@@ -321,7 +336,7 @@ version = "0.10.2"
321336
source = "registry+https://github.com/rust-lang/crates.io-index"
322337
checksum = "12908dbeb234370af84d0579b9f68258a0f67e201412dd9a2814e6f45b2fc0f0"
323338
dependencies = [
324-
"hashbrown",
339+
"hashbrown 0.14.5",
325340
"log",
326341
"rustc-hash",
327342
"slice-group-by",
@@ -342,9 +357,9 @@ dependencies = [
342357

343358
[[package]]
344359
name = "rustc-hash"
345-
version = "2.0.0"
360+
version = "2.1.0"
346361
source = "registry+https://github.com/rust-lang/crates.io-index"
347-
checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
362+
checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
348363

349364
[[package]]
350365
name = "rustc_codegen_cranelift"
@@ -366,18 +381,18 @@ dependencies = [
366381

367382
[[package]]
368383
name = "serde"
369-
version = "1.0.210"
384+
version = "1.0.216"
370385
source = "registry+https://github.com/rust-lang/crates.io-index"
371-
checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
386+
checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
372387
dependencies = [
373388
"serde_derive",
374389
]
375390

376391
[[package]]
377392
name = "serde_derive"
378-
version = "1.0.210"
393+
version = "1.0.216"
379394
source = "registry+https://github.com/rust-lang/crates.io-index"
380-
checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
395+
checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
381396
dependencies = [
382397
"proc-macro2",
383398
"quote",
@@ -404,9 +419,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
404419

405420
[[package]]
406421
name = "syn"
407-
version = "2.0.70"
422+
version = "2.0.90"
408423
source = "registry+https://github.com/rust-lang/crates.io-index"
409-
checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16"
424+
checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
410425
dependencies = [
411426
"proc-macro2",
412427
"quote",
@@ -421,15 +436,15 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
421436

422437
[[package]]
423438
name = "unicode-ident"
424-
version = "1.0.12"
439+
version = "1.0.14"
425440
source = "registry+https://github.com/rust-lang/crates.io-index"
426-
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
441+
checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
427442

428443
[[package]]
429444
name = "version_check"
430-
version = "0.9.4"
445+
version = "0.9.5"
431446
source = "registry+https://github.com/rust-lang/crates.io-index"
432-
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
447+
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
433448

434449
[[package]]
435450
name = "wasmtime-jit-icache-coherence"
@@ -544,3 +559,8 @@ dependencies = [
544559
"quote",
545560
"syn",
546561
]
562+
563+
[[patch.unused]]
564+
name = "compiler_builtins"
565+
version = "0.1.139"
566+
source = "git+https://github.com/tgross35/compiler-builtins.git?branch=overflowing-c-safe-ret#8cb74d05a80a5782a5377a825d2ddd7b950bf220"

‎compiler/rustc_codegen_cranelift/Cargo.toml‎

Lines changed: 2 additions & 1 deletion
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‎

Lines changed: 2 additions & 2 deletions
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.138", features = ['rustc-dep-of-std'] }
20-
+compiler_builtins = { version = "=0.1.138", features = ['rustc-dep-of-std', 'no-f16-f128'] }
19+
-compiler_builtins = { version = "=0.1.139", features = ['rustc-dep-of-std'] }
20+
+compiler_builtins = { version = "=0.1.139", 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‎

Lines changed: 2 additions & 0 deletions
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‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,8 @@ dependencies = [
6161

6262
[[package]]
6363
name = "compiler_builtins"
64-
version = "0.1.138"
65-
source = "registry+https://github.com/rust-lang/crates.io-index"
66-
checksum = "53f0ea7fff95b51f84371588f06062557e96bbe363d2b36218ddb806f3ca8611"
64+
version = "0.1.139"
65+
source = "git+https://github.com/tgross35/compiler-builtins.git?branch=overflowing-c-safe-ret#8cb74d05a80a5782a5377a825d2ddd7b950bf220"
6766
dependencies = [
6867
"cc",
6968
"rustc-std-workspace-core",

‎library/Cargo.toml‎

Lines changed: 2 additions & 0 deletions
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‎

Lines changed: 1 addition & 1 deletion
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.138", features = ['rustc-dep-of-std'] }
13+
compiler_builtins = { version = "=0.1.139", features = ['rustc-dep-of-std'] }
1414

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

‎library/std/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
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.138" }
20+
compiler_builtins = { version = "=0.1.139" }
2121
unwind = { path = "../unwind" }
2222
hashbrown = { version = "0.15", default-features = false, features = [
2323
'rustc-dep-of-std',

0 commit comments

Comments
 (0)