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

Jump to bottom

Rollup of 4 pull requests #91555

Merged
merged 10 commits into from
Dec 5, 2021
Merged

Rollup of 4 pull requests #91555

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift click to select a range
b516a8c
Pretty print empty blocks as {}
dtolnay Dec 1, 2021
9b77a1e
Don't suggest types whose inner type is erroneous
hkmatsumoto Dec 2, 2021
63523e4
Stabilize `-Z emit-future-incompat` as `--json future-incompat`
Aaron1011 Dec 4, 2021
9520925
add test
b-naber Nov 3, 2021
8ff50fe
skip reborrows during AbstractConst building
b-naber Dec 2, 2021
1777f43
bless tests
b-naber Dec 5, 2021
214b2a1
Rollup merge of #90529 - b-naber:reborrows-consts, r=lcnr
matthiaskrgr Dec 5, 2021
a8f8f74
Rollup merge of #91437 - dtolnay:emptybrace, r=nagisa
matthiaskrgr Dec 5, 2021
609d9a0
Rollup merge of #91450 - hkmatsumoto:hide-type-error, r=estebank
matthiaskrgr Dec 5, 2021
068b304
Rollup merge of #91535 - Aaron1011:stabilize-future-incompat, r=nagisa
matthiaskrgr Dec 5, 2021
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
skip reborrows during AbstractConst building
  • Loading branch information
@b-naber
b-naber committed Dec 5, 2021
commit 8ff50fe2736d8d33e2c51105cbabf023eff93218
22 changes: 17 additions & 5 deletions compiler/rustc_trait_selection/src/traits/const_evaluatable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,13 399,25 @@ impl<'a, 'tcx> AbstractConstBuilder<'a, 'tcx> {
let arg = self.recurse_build(source)?;
self.nodes.push(Node::Cast(abstract_const::CastKind::As, arg, node.ty))
}

ExprKind::Borrow{ arg, ..} => {
let arg_node = &self.body.exprs[*arg];

// Skip reborrows for now until we allow Deref/Borrow/AddressOf
// expressions.
// FIXME(generic_const_exprs): Verify/explain why this is sound
if let ExprKind::Deref {arg} = arg_node.kind {
self.recurse_build(arg)?
} else {
self.maybe_supported_error(
node.span,
"borrowing is not supported in generic constants",
)?
}
}
// FIXME(generic_const_exprs): We may want to support these.
ExprKind::AddressOf { .. }
| ExprKind::Borrow { .. }
| ExprKind::Deref { .. } => self.maybe_supported_error(
ExprKind::AddressOf { .. } | ExprKind::Deref {..}=> self.maybe_supported_error(
node.span,
"dereferencing is not supported in generic constants",
"dereferencing or taking the address is not supported in generic constants",
)?,
ExprKind::Repeat { .. } | ExprKind::Array { .. } => self.maybe_supported_error(
node.span,
Expand Down