[STASH]

Author: bjorn3

Diff for: Cargo.lock

@@ -25,20 +25,20 @@ smallvec = "1.8.1"
 
 [patch.crates-io]
 # Uncomment to use an unreleased version of cranelift
-cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "main", version = "0.120.0" }
-cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "main", version = "0.120.0" }
-cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "main", version = "0.120.0" }
-cranelift-native = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "main", version = "0.120.0" }
-cranelift-jit = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "main", version = "0.120.0" }
-cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "main", version = "0.120.0" }
+#cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "main", version = "0.120.0" }
+#cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "main", version = "0.120.0" }
+#cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "main", version = "0.120.0" }
+#cranelift-native = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "main", version = "0.120.0" }
+#cranelift-jit = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "main", version = "0.120.0" }
+#cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "main", version = "0.120.0" }
 
 # Uncomment to use local checkout of cranelift
-#cranelift-codegen = { path = "../wasmtime/cranelift/codegen" }
-#cranelift-frontend = { path = "../wasmtime/cranelift/frontend" }
-#cranelift-module = { path = "../wasmtime/cranelift/module" }
-#cranelift-native = { path = "../wasmtime/cranelift/native" }
-#cranelift-jit = { path = "../wasmtime/cranelift/jit" }
-#cranelift-object = { path = "../wasmtime/cranelift/object" }
+cranelift-codegen = { path = "../wasmtime/cranelift/codegen" }
+cranelift-frontend = { path = "../wasmtime/cranelift/frontend" }
+cranelift-module = { path = "../wasmtime/cranelift/module" }
+cranelift-native = { path = "../wasmtime/cranelift/native" }
+cranelift-jit = { path = "../wasmtime/cranelift/jit" }
+cranelift-object = { path = "../wasmtime/cranelift/object" }
 
 [features]
 # Enable features not ready to be enabled when compiling as part of rustc

Diff for: Cargo.toml

@@ -13,15 +13,15 @@
 # Comment any of these lines to skip individual tests.
 
 testsuite.no_sysroot
-build.mini_core
-build.example
-jit.mini_core_hello_world
-aot.mini_core_hello_world
+#build.mini_core
+#build.example
+#jit.mini_core_hello_world
+#aot.mini_core_hello_world
 
 testsuite.base_sysroot
 aot.arbitrary_self_types_pointers_and_wrappers
 aot.issue_91827_extern_types
-jit.std_example
+#jit.std_example
 aot.std_example
 aot.dst_field_align
 aot.subslice-patterns-const-eval

Diff for: config.txt

@@ -180,5 +180,5 @@ index 073116933bd..c3e4578204d 100644
 EOF
 
 echo "[TEST] rustc test suite"
-COMPILETEST_FORCE_STAGE0=1 ./x.py test --stage 0 --test-args=--no-capture tests/{codegen-units,run-make,ui,incremental}
+COMPILETEST_FORCE_STAGE0=1 ./x.py test --stage 0 tests/{codegen-units,ui,incremental}
 popd

Diff for: scripts/test_rustc_tests.sh

@@ -290,6 +290,7 @@ pub(crate) struct FunctionCx<'m, 'clif, 'tcx: 'm> {
 
     /// During cleanup the exception pointer will be stored at the location pointed to by this
     /// pointer.
+    // FIXME use SSA variable
     pub(crate) exception_slot: Pointer,
 
     pub(crate) clif_comments: crate::pretty_clif::CommentWriter,