rustc_mir: promote references of statics from other statics. #46524
Conversation
|
(rust_highfive has picked a reviewer for you, use r? to override) |
| @@ -633,7 +633,14 @@ impl<'a, 'tcx> Visitor<'tcx> for Qualifier<'a, 'tcx, 'tcx> { | |||
|
|
|||
| // We might have a candidate for promotion. | |||
| let candidate = Candidate::Ref(location); | |||
| if !self.qualif.intersects(Qualif::NEVER_PROMOTE) { | |||
| let mut unpromotable = self.qualif & Qualif::NEVER_PROMOTE; | |||
There was a problem hiding this comment.
nit: I would prefer that this codepath be shared with the shuffle index code into a fn can_promote
|
r=me with nit fixed |
| if !self.qualif.intersects(Qualif::NEVER_PROMOTE) { | ||
| let mut unpromotable = self.qualif & Qualif::NEVER_PROMOTE; | ||
|
|
||
| // References to statics are allowed, but only in other statics. |
There was a problem hiding this comment.
Why only in other statics? Couldn't references to statics always be promoted
There was a problem hiding this comment.
It's just what we already allow. Must avoid letting in more until miri is in use.
|
@arielb1 The Travis failure suggests MIR borrowck doesn't handle this yet. Does it need your PR? |
kennytm
added
the
S-waiting-on-review
|
Maybe. I don't remember the state of MIR borrowck before this PR. I suppose we can wait - this doesn't block me. |
kennytm
added
S-blocked
|
Marking as blocked by #46268. |
eddyb
removed
the
S-blocked
|
@bors r=arielb1 |
|
📌 Commit 292c6ac has been approved by |
rustc_mir: promote references of statics from other statics. Fixes #46522 by also allowing `STATIC_REF` in MIR const-qualification, not just AST rvalue promotion.
|
☀️ Test successful - status-appveyor, status-travis |
Fixes #46522 by also allowing
STATIC_REFin MIR const-qualification, not just AST rvalue promotion.