diff options
| author | bors <bors@rust-lang.org> | 2025-09-15 23:12:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-09-15 23:12:06 +0000 |
| commit | 9d82de19dfae60e55c291f5f28e28cfc2c1b9630 (patch) | |
| tree | 344a13e2d701b81b570acabfb01274794c340cbd /compiler | |
| parent | a454fccb02df9d361f1201b747c01257f58a8b37 (diff) | |
| parent | 8f2b6029f5eacfc2158877bf021ebb738fa7453f (diff) | |
Auto merge of #146610 - matthiaskrgr:rollup-xkt5kjz, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - rust-lang/rust#146344 (tests/codegen-llvm: Make rust-abi-arch-specific-adjustment portable) - rust-lang/rust#146530 (rustc_codegen_llvm: Adjust RISC-V inline assembly's clobber list) - rust-lang/rust#146533 (Note some previous attempts to change the Default impl for `[T; 0]`) - rust-lang/rust#146539 (fix 404 MCP link) - rust-lang/rust#146546 (Switch `std::vec::PeekMut::pop` from self to this parameter.) - rust-lang/rust#146549 (On FreeBSD, use readdir instead of readdir_r) - rust-lang/rust#146559 (Fix typo in error message) - rust-lang/rust#146563 (bootstrap.py: disable incremental build for bootstrap in CI) - rust-lang/rust#146576 (opt-dist: don't set `RUST_LOG=collector=debug`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/asm.rs | 1 | ||||
| -rw-r--r-- | compiler/rustc_middle/messages.ftl | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/asm.rs b/compiler/rustc_codegen_llvm/src/asm.rs index 38c1d3b53e8..b79176e9098 100644 --- a/compiler/rustc_codegen_llvm/src/asm.rs +++ b/compiler/rustc_codegen_llvm/src/asm.rs @@ -240,6 +240,7 @@ impl<'ll, 'tcx> AsmBuilderMethods<'tcx> for Builder<'_, 'll, 'tcx> { } InlineAsmArch::RiscV32 | InlineAsmArch::RiscV64 => { constraints.extend_from_slice(&[ + "~{fflags}".to_string(), "~{vtype}".to_string(), "~{vl}".to_string(), "~{vxsat}".to_string(), diff --git a/compiler/rustc_middle/messages.ftl b/compiler/rustc_middle/messages.ftl index 69adb2fe391..279ab9a9d8f 100644 --- a/compiler/rustc_middle/messages.ftl +++ b/compiler/rustc_middle/messages.ftl @@ -84,7 +84,7 @@ middle_failed_writing_file = # Note: We only mention patterns here since the error can only occur with references, and those # are forbidden in const generics. middle_invalid_const_in_valtree = constant {$global_const_id} cannot be used as pattern - .note = constants that reference mutable or external memory cannot be used as pattern + .note = constants that reference mutable or external memory cannot be used as patterns middle_layout_cycle = a cycle occurred during layout computation |