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 9 pull requests #127004

Closed
wants to merge 25 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
99e6a28
Add f16/f128 handling in a couple places
nicholasbishop May 30, 2024
4281c2c
patch `rust-lld` and `ld.lld` on NixOS
DianQK Jun 19, 2024
80e43c1
patch an ELF file using `--add-rpath`
DianQK Jun 19, 2024
aa30dd4
Fix a typo in a comment.
nnethercote May 15, 2024
bca5cd3
Extend `tests/ui/macros/nonterminal-matching.rs`.
nnethercote Jun 25, 2024
2e4d547
Extra panic cases.
nnethercote May 14, 2024
9828e96
Remove `__rust_force_expr`.
nnethercote Jun 23, 2024
379b761
Inline and remove `maybe_whole_expr!`.
nnethercote Jun 17, 2024
d5ff4f4
Simplify `str::clone_into`
DaniPopes Jun 25, 2024
065db0c
Update compiler_builtins to 0.1.113
nicholasbishop May 11, 2024
457fda1
coverage: Detach `#[coverage(..)]` from codegen attribute handling
Zalathar Jun 20, 2024
3262611
coverage: Apply `#[coverage(..)]` recursively to nested functions
Zalathar Jun 22, 2024
7f37f8a
coverage: Allow `#[coverage(..)]` on `impl` and `mod`
Zalathar Jun 21, 2024
e5167fe
set self.is_known_utf8 to false in extend_from_slice
Borgerr Jun 26, 2024
5aac249
std: test a variety of ways to extend a Wtf8Buf
workingjubilee Jun 26, 2024
518b74e
Remove `f16` and `f128` ICE paths from smir
tgross35 Jun 21, 2024
1a7bf99
Rollup merge of #125016 - nicholasbishop:bishop-cb-112, r=amanieu
matthiaskrgr Jun 26, 2024
711b413
Rollup merge of #126571 - nnethercote:less-maybe_whole-expr-2, r=petr…
matthiaskrgr Jun 26, 2024
46ba131
Rollup merge of #126692 - DianQK:nixos-patchelf, r=Nilstrieb
matthiaskrgr Jun 26, 2024
a6f4ed6
Rollup merge of #126721 - Zalathar:nested-cov-attr, r=oli-obk
matthiaskrgr Jun 26, 2024
2751d26
Rollup merge of #126928 - nnethercote:124141-pre, r=oli-obk
matthiaskrgr Jun 26, 2024
edb0168
Rollup merge of #126929 - nnethercote:rm-__rust_force_expr, r=oli-obk
matthiaskrgr Jun 26, 2024
aa47a8e
Rollup merge of #126970 - DaniPopes:simplify-str-clone_into, r=cuviper
matthiaskrgr Jun 26, 2024
63e00dc
Rollup merge of #126980 - Borgerr:fix-extendfromslice-check, r=workin…
matthiaskrgr Jun 26, 2024
30c64d8
Rollup merge of #126983 - tgross35:f16-f128-smir, r=celinval
matthiaskrgr Jun 26, 2024
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
Remove f16 and f128 ICE paths from smir
  • Loading branch information
tgross35 committed Jun 26, 2024
commit 518b74ec5d97317af70d3fdbc41eac903622a6b9
2 changes: 2 additions & 0 deletions compiler/rustc_smir/src/rustc_internal/internal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,10 @@ impl RustcInternal for FloatTy {

fn internal<'tcx>(&self, _tables: &mut Tables<'_>, _tcx: TyCtxt<'tcx>) -> Self::T<'tcx> {
match self {
FloatTy::F16 => rustc_ty::FloatTy::F16,
FloatTy::F32 => rustc_ty::FloatTy::F32,
FloatTy::F64 => rustc_ty::FloatTy::F64,
FloatTy::F128 => rustc_ty::FloatTy::F128,
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions compiler/rustc_smir/src/rustc_smir/convert/ty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -304,10 +304,10 @@ impl<'tcx> Stable<'tcx> for ty::FloatTy {

fn stable(&self, _: &mut Tables<'_>) -> Self::T {
match self {
ty::FloatTy::F16 => unimplemented!("f16_f128"),
ty::FloatTy::F16 => FloatTy::F16,
ty::FloatTy::F32 => FloatTy::F32,
ty::FloatTy::F64 => FloatTy::F64,
ty::FloatTy::F128 => unimplemented!("f16_f128"),
ty::FloatTy::F128 => FloatTy::F128,
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions compiler/stable_mir/src/ty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -608,8 +608,10 @@ impl UintTy {

#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub enum FloatTy {
F16,
F32,
F64,
F128,
}

#[derive(Clone, Copy, Debug, PartialEq, Eq)]
Expand Down
Loading