Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 07c3bd2

Browse files
bjorn3bjorn3
committed
[DO NOT MERGE] Test cranelift patch
1 parent b05bf6f commit 07c3bd2

File tree

3 files changed

+37
-49
lines changed

3 files changed

+37
-49
lines changed

‎compiler/rustc_codegen_cranelift/Cargo.lock

Lines changed: 30 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
2121

2222
[[package]]
2323
name = "arbitrary"
24-
version = "1.3.0"
24+
version = "1.3.1"
2525
source = "registry+https://github.com/rust-lang/crates.io-index"
26-
checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e"
26+
checksum = "a2e1373abdaa212b704512ec2bd8b26bd0b7d5c3f70117411a5d9a451383c859"
2727

2828
[[package]]
2929
name = "bitflags"
@@ -45,18 +45,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
4545

4646
[[package]]
4747
name = "cranelift-bforest"
48-
version = "0.101.1"
49-
source = "registry+https://github.com/rust-lang/crates.io-index"
50-
checksum = "c1512c3bb6b13018e7109fc3ac964bc87b329eaf3a77825d337558d0c7f6f1be"
48+
version = "0.102.0"
49+
source = "git+https://github.com/bjorn3/wasmtime.git?branch=allow_disabling_host_arch#abf01050f66d6e1565cbd2094e805135ecac81e3"
5150
dependencies = [
5251
"cranelift-entity",
5352
]
5453

5554
[[package]]
5655
name = "cranelift-codegen"
57-
version = "0.101.1"
58-
source = "registry+https://github.com/rust-lang/crates.io-index"
59-
checksum = "16cb8fb9220a6ea7a226705a273ab905309ee546267bdf34948d57932d7f0396"
56+
version = "0.102.0"
57+
source = "git+https://github.com/bjorn3/wasmtime.git?branch=allow_disabling_host_arch#abf01050f66d6e1565cbd2094e805135ecac81e3"
6058
dependencies = [
6159
"bumpalo",
6260
"cranelift-bforest",
@@ -75,39 +73,34 @@ dependencies = [
7573

7674
[[package]]
7775
name = "cranelift-codegen-meta"
78-
version = "0.101.1"
79-
source = "registry+https://github.com/rust-lang/crates.io-index"
80-
checksum = "ab3a8d3b0d4745b183da5ea0792b13d79f5c23d6e69ac04761728e2532b56649"
76+
version = "0.102.0"
77+
source = "git+https://github.com/bjorn3/wasmtime.git?branch=allow_disabling_host_arch#abf01050f66d6e1565cbd2094e805135ecac81e3"
8178
dependencies = [
8279
"cranelift-codegen-shared",
8380
]
8481

8582
[[package]]
8683
name = "cranelift-codegen-shared"
87-
version = "0.101.1"
88-
source = "registry+https://github.com/rust-lang/crates.io-index"
89-
checksum = "524141c8e68f2abc2043de4c2b31f6d9dd42432738c246431d0572a1422a4a84"
84+
version = "0.102.0"
85+
source = "git+https://github.com/bjorn3/wasmtime.git?branch=allow_disabling_host_arch#abf01050f66d6e1565cbd2094e805135ecac81e3"
9086

9187
[[package]]
9288
name = "cranelift-control"
93-
version = "0.101.1"
94-
source = "registry+https://github.com/rust-lang/crates.io-index"
95-
checksum = "97513b57c961c713789a03886a57b43e14ebcd204cbaa8ae50ca6c70a8e716b3"
89+
version = "0.102.0"
90+
source = "git+https://github.com/bjorn3/wasmtime.git?branch=allow_disabling_host_arch#abf01050f66d6e1565cbd2094e805135ecac81e3"
9691
dependencies = [
9792
"arbitrary",
9893
]
9994

10095
[[package]]
10196
name = "cranelift-entity"
102-
version = "0.101.1"
103-
source = "registry+https://github.com/rust-lang/crates.io-index"
104-
checksum = "e3f23d3cf3afa7e45f239702612c76d87964f652a55e28d13ed6d7e20f3479dd"
97+
version = "0.102.0"
98+
source = "git+https://github.com/bjorn3/wasmtime.git?branch=allow_disabling_host_arch#abf01050f66d6e1565cbd2094e805135ecac81e3"
10599

106100
[[package]]
107101
name = "cranelift-frontend"
108-
version = "0.101.1"
109-
source = "registry+https://github.com/rust-lang/crates.io-index"
110-
checksum = "554cd4947ec9209b58bf9ae5bf83581b5ddf9128bd967208e334b504a57db54e"
102+
version = "0.102.0"
103+
source = "git+https://github.com/bjorn3/wasmtime.git?branch=allow_disabling_host_arch#abf01050f66d6e1565cbd2094e805135ecac81e3"
111104
dependencies = [
112105
"cranelift-codegen",
113106
"log",
@@ -117,15 +110,13 @@ dependencies = [
117110

118111
[[package]]
119112
name = "cranelift-isle"
120-
version = "0.101.1"
121-
source = "registry+https://github.com/rust-lang/crates.io-index"
122-
checksum = "6c1892a439696b6413cb54083806f5fd9fc431768b8de74864b3d9e8b93b124f"
113+
version = "0.102.0"
114+
source = "git+https://github.com/bjorn3/wasmtime.git?branch=allow_disabling_host_arch#abf01050f66d6e1565cbd2094e805135ecac81e3"
123115

124116
[[package]]
125117
name = "cranelift-jit"
126-
version = "0.101.1"
127-
source = "registry+https://github.com/rust-lang/crates.io-index"
128-
checksum = "32209252fb38acaf1662ccd0397907bbe0e92bdb13b6ddbfd2f74e437f83e685"
118+
version = "0.102.0"
119+
source = "git+https://github.com/bjorn3/wasmtime.git?branch=allow_disabling_host_arch#abf01050f66d6e1565cbd2094e805135ecac81e3"
129120
dependencies = [
130121
"anyhow",
131122
"cranelift-codegen",
@@ -143,9 +134,8 @@ dependencies = [
143134

144135
[[package]]
145136
name = "cranelift-module"
146-
version = "0.101.1"
147-
source = "registry+https://github.com/rust-lang/crates.io-index"
148-
checksum = "bf42656f5f6df7bfafc4dd7b63a1888b0627c07b43b2cb9aa54e13843fed39eb"
137+
version = "0.102.0"
138+
source = "git+https://github.com/bjorn3/wasmtime.git?branch=allow_disabling_host_arch#abf01050f66d6e1565cbd2094e805135ecac81e3"
149139
dependencies = [
150140
"anyhow",
151141
"cranelift-codegen",
@@ -154,9 +144,8 @@ dependencies = [
154144

155145
[[package]]
156146
name = "cranelift-native"
157-
version = "0.101.1"
158-
source = "registry+https://github.com/rust-lang/crates.io-index"
159-
checksum = "e0c2d3badd4b9690865f5bb68a71fa94de592fa2df3f3d11a5a062c60c0a107a"
147+
version = "0.102.0"
148+
source = "git+https://github.com/bjorn3/wasmtime.git?branch=allow_disabling_host_arch#abf01050f66d6e1565cbd2094e805135ecac81e3"
160149
dependencies = [
161150
"cranelift-codegen",
162151
"libc",
@@ -165,9 +154,8 @@ dependencies = [
165154

166155
[[package]]
167156
name = "cranelift-object"
168-
version = "0.101.1"
169-
source = "registry+https://github.com/rust-lang/crates.io-index"
170-
checksum = "88eca54bbecea3170035168357306e9c779d4a63d8bf036c9e16bd21fdaa69b5"
157+
version = "0.102.0"
158+
source = "git+https://github.com/bjorn3/wasmtime.git?branch=allow_disabling_host_arch#abf01050f66d6e1565cbd2094e805135ecac81e3"
171159
dependencies = [
172160
"anyhow",
173161
"cranelift-codegen",
@@ -295,9 +283,9 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
295283

296284
[[package]]
297285
name = "regalloc2"
298-
version = "0.9.2"
286+
version = "0.9.3"
299287
source = "registry+https://github.com/rust-lang/crates.io-index"
300-
checksum = "5b4dcbd3a2ae7fb94b5813fa0e957c6ab51bf5d0a8ee1b69e0c2d0f1e6eb8485"
288+
checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6"
301289
dependencies = [
302290
"hashbrown 0.13.2",
303291
"log",
@@ -374,9 +362,8 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
374362

375363
[[package]]
376364
name = "wasmtime-jit-icache-coherence"
377-
version = "14.0.1"
378-
source = "registry+https://github.com/rust-lang/crates.io-index"
379-
checksum = "9aaf2fa8fd2d6b65abae9b92edfe69254cc5d6b166e342364036c3e347de8da9"
365+
version = "15.0.0"
366+
source = "git+https://github.com/bjorn3/wasmtime.git?branch=allow_disabling_host_arch#abf01050f66d6e1565cbd2094e805135ecac81e3"
380367
dependencies = [
381368
"cfg-if",
382369
"libc",

‎compiler/rustc_codegen_cranelift/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ crate-type = ["dylib"]
88

99
[dependencies]
1010
# These have to be in sync with each other
11-
cranelift-codegen = { version = "0.101.1", default-features = false, features = ["std", "unwind", "all-arch"] }
12-
cranelift-frontend = { version = "0.101.1" }
13-
cranelift-module = { version = "0.101.1" }
14-
cranelift-native = { version = "0.101.1" }
15-
cranelift-jit = { version = "0.101.1", optional = true }
16-
cranelift-object = { version = "0.101.1" }
11+
cranelift-codegen = { git = "https://github.com/bjorn3/wasmtime.git", branch = "allow_disabling_host_arch", version = "0.102", default-features = false, features = ["std", "unwind", "all-arch"] }
12+
cranelift-frontend = { git = "https://github.com/bjorn3/wasmtime.git", branch = "allow_disabling_host_arch", version = "0.102" }
13+
cranelift-module = { git = "https://github.com/bjorn3/wasmtime.git", branch = "allow_disabling_host_arch", version = "0.102" }
14+
cranelift-native = { git = "https://github.com/bjorn3/wasmtime.git", branch = "allow_disabling_host_arch", version = "0.102" }
15+
cranelift-jit = { git = "https://github.com/bjorn3/wasmtime.git", branch = "allow_disabling_host_arch", version = "0.102", optional = true }
16+
cranelift-object = { git = "https://github.com/bjorn3/wasmtime.git", branch = "allow_disabling_host_arch", version = "0.102" }
1717
target-lexicon = "0.12.0"
1818
gimli = { version = "0.28", default-features = false, features = ["write"]}
1919
object = { version = "0.32", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }

‎compiler/rustc_codegen_cranelift/src/pretty_clif.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ impl FuncWriter for &'_ CommentWriter {
155155
_func: &Function,
156156
entity: AnyEntity,
157157
value: &dyn fmt::Display,
158+
_fact: Option<&cranelift_codegen::ir::pcc::Fact>,
158159
) -> fmt::Result {
159160
write!(w, " {} = {}", entity, value)?;
160161

0 commit comments

Comments
 (0)