Skip to content

Commit 816c340

Browse files
oisyneddyb
authored andcommitted
Updated to nightly-2022-11-14
1 parent 4a217f2 commit 816c340

File tree

6 files changed

+16
-7
lines changed

6 files changed

+16
-7
lines changed

crates/rustc_codegen_spirv/build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ use std::process::{Command, ExitCode};
1010
/// `cargo publish`. We need to figure out a way to do this properly, but let's hardcode it for now :/
1111
//const REQUIRED_RUST_TOOLCHAIN: &str = include_str!("../../rust-toolchain");
1212
const REQUIRED_RUST_TOOLCHAIN: &str = r#"[toolchain]
13-
channel = "nightly-2022-10-29"
13+
channel = "nightly-2022-11-14"
1414
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
15-
# commit_hash = 9565dfeb4e6225177bbe78f18cd48a7982f34401"#;
15+
# commit_hash = e631891f7ad40eac3ef58ec3c2b57ecd81e40615"#;
1616

1717
fn get_rustc_commit_hash() -> Result<String, Box<dyn Error>> {
1818
let rustc = std::env::var("RUSTC").unwrap_or_else(|_| String::from("rustc"));

crates/rustc_codegen_spirv/src/codegen_cx/type_.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,14 @@ impl<'tcx> BaseTypeMethods<'tcx> for CodegenCx<'tcx> {
177177
SpirvType::Float(64).def(DUMMY_SP, self)
178178
}
179179

180+
fn type_array(&self, ty: Self::Type, len: u64) -> Self::Type {
181+
SpirvType::Array {
182+
element: ty,
183+
count: self.constant_u64(DUMMY_SP, len),
184+
}
185+
.def(DUMMY_SP, self)
186+
}
187+
180188
fn type_func(&self, args: &[Self::Type], ret: Self::Type) -> Self::Type {
181189
SpirvType::Function {
182190
return_type: ret,

crates/rustc_codegen_spirv/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ impl ExtraBackendMethods for SpirvCodegenBackend {
389389
_: TyCtxt<'tcx>,
390390
_: &str,
391391
_: AllocatorKind,
392-
_: bool,
392+
_: AllocatorKind,
393393
) -> Self::Module {
394394
todo!()
395395
}

crates/rustc_codegen_spirv/src/linker/test.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ fn link_with_linker_opts(
158158
false,
159159
None,
160160
false,
161+
false,
161162
);
162163

163164
rustc_errors::Handler::with_emitter_and_flags(

rust-toolchain

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# to the user in the error, instead of "error: invalid channel name '[toolchain]'".
66

77
[toolchain]
8-
channel = "nightly-2022-10-29"
8+
channel = "nightly-2022-11-14"
99
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
10-
# commit_hash = 9565dfeb4e6225177bbe78f18cd48a7982f34401
10+
# commit_hash = e631891f7ad40eac3ef58ec3c2b57ecd81e40615
1111

1212
# Whenever changing the nightly channel, update the commit hash above, and make
1313
# sure to change REQUIRED_TOOLCHAIN in crates/rustc_codegen_spirv/src/build.rs also.

tests/ui/dis/ptr_copy.normal.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error: Cannot memcpy dynamically sized data
2-
--> $CORE_SRC/intrinsics.rs:2449:9
2+
--> $CORE_SRC/intrinsics.rs:2518:9
33
|
4-
2449 | copy(src, dst, count)
4+
2518 | copy(src, dst, count)
55
| ^^^^^^^^^^^^^^^^^^^^^
66
|
77
= note: Stack:

0 commit comments

Comments
 (0)