Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 7 pull requests #117294

Merged
merged 18 commits into from
Oct 27, 2023
Merged
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f4a9d29
Remove `rustc_symbol_mangling/messages.ftl`.
nnethercote Oct 17, 2023
041f031
Properly restore snapshot when failing to recover parsing ternary
clubby789 Oct 26, 2023
3bbc70a
Restrict param constraint suggestion
estebank Oct 26, 2023
84c9c4a
NVPTX: Allow PassMode::Direct for ptx kernels for now
kjetilkjeka Oct 26, 2023
4d33876
Documentation and error message improvements related to PassMode::Dir…
kjetilkjeka Oct 26, 2023
e81a5c6
Recover ternary expression as error
clubby789 Oct 26, 2023
72d5f4b
Hide internal methods from documentation
jhpratt Oct 27, 2023
bb45c81
Link to correct issue in PassMode::Direct ptx-kernel exception
Oct 27, 2023
ccb36a6
std::thread: add SAFETY comment
RalfJung Oct 27, 2023
b915fc8
fix miri target information for Test step
onur-ozkan Oct 27, 2023
7449478
Account for type param from other item in `note_and_explain`
estebank Oct 26, 2023
df8852a
Rollup merge of #116834 - nnethercote:rustc_symbol_mangling, r=davidtwco
matthiaskrgr Oct 27, 2023
b229537
Rollup merge of #117212 - clubby789:fix-ternary-recover, r=compiler-e…
matthiaskrgr Oct 27, 2023
a77f743
Rollup merge of #117246 - estebank:issue-117209, r=petrochenkov
matthiaskrgr Oct 27, 2023
c3d56be
Rollup merge of #117247 - kjetilkjeka:nvptx_direct_passmode_exception…
matthiaskrgr Oct 27, 2023
60b071f
Rollup merge of #117270 - jhpratt:hide-print-internals, r=ChrisDenton
matthiaskrgr Oct 27, 2023
f9d62a8
Rollup merge of #117281 - RalfJung:thread-safety, r=thomcc
matthiaskrgr Oct 27, 2023
b9015da
Rollup merge of #117287 - onur-ozkan:fix-miri-target-info, r=RalfJung
matthiaskrgr Oct 27, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Link to correct issue in PassMode::Direct ptx-kernel exception
Kjetil Kjeka committed Oct 27, 2023
commit bb45c812e0b8e45a704b768a6a2080f6f794667b
2 changes: 1 addition & 1 deletion compiler/rustc_codegen_llvm/src/abi.rs
Original file line number Diff line number Diff line change
@@ -365,7 +365,7 @@ impl<'ll, 'tcx> FnAbiLlvmExt<'ll, 'tcx> for FnAbi<'tcx, Ty<'tcx>> {
//
// The unstable abi `PtxKernel` also uses Direct for now.
// It needs to switch to something else before stabilization can happen.
// (Tracking issue abi_ptx: https://github.com/rust-lang/rust/issues/38788)
// (See issue: https://github.com/rust-lang/rust/issues/117271)
assert!(
matches!(&*cx.tcx.sess.target.arch, "wasm32" | "wasm64")
|| self.conv == Conv::PtxKernel,