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.

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

Rollup of 6 pull requests #94453

Merged
merged 14 commits into from
Feb 28, 2022
Merged

Rollup of 6 pull requests #94453

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
249eb1c
fix typo in btree/vec doc: Self -> self
Veeupup Dec 29, 2021
bfa7d44
fix box icing when it has aggregate abi
beepster4096 Feb 27, 2022
025b7c4
fix ICE when passing empty block to while-loop condition
compiler-errors Feb 22, 2022
d316aba
expadn abi check + condese & fix tests
beepster4096 Feb 28, 2022
e3e902b
4 - Make more use of `let_chains`
c410-f3r Feb 28, 2022
911de7b
Add explanation for E0726
GuillaumeGomez Feb 28, 2022
8f36d4a
Update ui test with the add of E0726 explanation
GuillaumeGomez Feb 28, 2022
f42b4f5
Tweak diagnostics
estebank Jan 12, 2022
9d23c32
Rollup merge of #92399 - Veeupup:fix_vec_typo, r=Dylan-DPC
matthiaskrgr Feb 28, 2022
a040e2f
Rollup merge of #92823 - estebank:tweak-diag, r=jackh726
matthiaskrgr Feb 28, 2022
9340791
Rollup merge of #94248 - compiler-errors:fix-while-loop-bad-delay, r=…
matthiaskrgr Feb 28, 2022
975a0e0
Rollup merge of #94414 - DrMeepster:box_alloc_ice2, r=tmiasko
matthiaskrgr Feb 28, 2022
5be38d2
Rollup merge of #94445 - c410-f3r:more-let-chains, r=cjgillot
matthiaskrgr Feb 28, 2022
34657cc
Rollup merge of #94449 - GuillaumeGomez:explanation-e0726, r=Urgau
matthiaskrgr Feb 28, 2022
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
expadn abi check + condese & fix tests
  • Loading branch information
@beepster4096
beepster4096 committed Feb 28, 2022
commit d316aba04c4644093ba07d1ec8d334b599b8eb01
2 changes: 1 addition & 1 deletion compiler/rustc_codegen_ssa/src/mir/place.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
mir::ProjectionElem::Deref => {
// custom allocators can change box's abi, making it unable to be derefed directly
if cg_base.layout.ty.is_box()
&& matches!(cg_base.layout.abi, Abi::Aggregate { .. })
&& matches!(cg_base.layout.abi, Abi::Aggregate { .. } | Abi::Uninhabited)
{
let ptr = cg_base.project_field(bx, 0).project_field(bx, 0);

Expand Down
6 changes: 0 additions & 6 deletions src/test/ui/box/issue-78459-ice.rs
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion src/test/ui/box/issue-81270-ice.rs → src/test/ui/box/large-allocator-ice.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// check-pass
// build-pass
#![feature(allocator_api)]

use std::alloc::Allocator;
Expand All @@ -18,5 +18,6 @@ unsafe impl Allocator for BigAllocator {
}

fn main() {
Box::new_in((), &std::alloc::Global);
Box::new_in((), BigAllocator([0; 2]));
}