bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

convert Rvalue::threadlocalref assertion to delay bug

Browse source
This commit is contained in:
csmoe 2021-06-01 22:05:04 +08:00
parent 9283956350
commit 521d9ab59a
3 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/rustc_mir/src/transform/check_consts/validation.rs
View file

@ -356,10 +356,9 @@ impl Validator<'mir, 'tcx> {
}
fn check_static(&mut self, def_id: DefId, span: Span) {
assert!(
!self.tcx.is_thread_local_static(def_id),
"tls access is checked in `Rvalue::ThreadLocalRef"
);
if self.tcx.is_thread_local_static(def_id) {
self.tcx.sess.delay_span_bug(span, "tls access is checked in `Rvalue::ThreadLocalRef");
}
self.check_op_spanned(ops::StaticAccess, span)
}
@ -732,11 +731,7 @@ impl Visitor<'tcx> for Validator<'mir, 'tcx> {
if proj_base.is_empty() {
if let (local, []) = (place_local, proj_base) {
let decl = &self.body.local_decls[local];
if let Some(box LocalInfo::StaticRef {
def_id,
is_thread_local: false,
}) = decl.local_info
{
if let Some(box LocalInfo::StaticRef { def_id, .. }) = decl.local_info {
let span = decl.source_info.span;
self.check_static(def_id, span);
return;