8000 Rollup of 6 pull requests by matthiaskrgr · Pull Request #114751 · rust-lang/rust · GitHub
[go: up one dir, main page]
Skip to content

Rollup of 6 pull requests #114751

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.

Sign up for GitHub

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

Closed
wants to merge 14 commits into from
Closed

Rollup of 6 pull requests #114751

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
35c0c03
Better Debug for Vars and VarsOs
tamird Jul 27, 2023
6e8acbd
Refactoring: Deduplicate handling of externally injected weak symbols.
anforowicz Aug 8, 2023
73b5842
Mark `___asan_globals_registered` as an exported symbol for LTO
anforowicz Aug 8, 2023
c80281a
cover ParamConst
ouz-a Aug 10, 2023
bbe7a96
Record binder for bare trait object in LifetimeCollectVisitor
compiler-errors Aug 11, 2023
2801ae8
Mark oli as "on vacation"
oli-obk Aug 11, 2023
7f08376
Partially stabilize #![feature(int_roundings)]
jhpratt Aug 12, 2023
62ca5aa
Remove unnecessary feature gates
jhpratt Aug 12, 2023
3dfd53f
Rollup merge of #94455 - jhpratt:stabilize-int_roundings, r=joshtriplett
matthiaskrgr Aug 12, 2023
7879823
Rollup merge of #114132 - tamird:better-env-debug-impls, r=Amanieu
matthiaskrgr Aug 12, 2023
6cdb399
Rollup merge of #114642 - anforowicz:fix-asan-lto, r=tmiasko
matthiaskrgr Aug 12, 2023
f93b6dc
Rollup merge of #114667 - compiler-errors:issue-114664, r=davidtwco
matthiaskrgr Aug 12, 2023
68efef3
Rollup merge of #114703 - ouz-a:smir_allocation, r=oli-obk
matthiaskrgr Aug 12, 2023
1c289fe
Rollup merge of #114734 - oli-obk:vacation_time, r=oli-obk
matthiaskrgr Aug 12, 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
4 changes: 3 additions & 1 deletion compiler/rustc_smir/src/rustc_smir/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1165,7 +1165,9 @@ impl<'tcx> Stable<'tcx> for rustc_middle::mir::ConstantKind<'tcx> {
let const_val = tables.tcx.valtree_to_const_val((c.ty(), val));
stable_mir::ty::ConstantKind::Allocated(new_allocation(self, const_val, tables))
}
_ => todo!(),
ty::ParamCt(param) => stable_mir::ty::ConstantKind::ParamCt(opaque(&param)),
ty::ErrorCt(_) => unreachable!(),
_ => unimplemented!(),
},
ConstantKind::Unevaluated(unev_const, ty) => {
stable_mir::ty::ConstantKind::Unevaluated(stable_mir::ty::UnevaluatedConst {
Expand Down
1 change: 1 addition & 0 deletions compiler/rustc_smir/src/stable_mir/ty.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,7 @@ pub fn allocation_filter<'tcx>(
pub enum ConstantKind {
Allocated(Allocation),
Unevaluated(UnevaluatedConst),
ParamCt(Opaque),
}

#[derive(Clone, Debug)]
Expand Down
0