Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Refactor the MirPass for QualifyAndPromoteConstants #63994

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

Merged
merged 8 commits into from
Sep 8, 2019
Merged

Refactor the MirPass for QualifyAndPromoteConstants #63994

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3cc8087
qualify_consts: extractt 'determine_mode'.
Centril Aug 29, 2019
8f184b3
qualify_consts: misc cleanup.
Centril Aug 29, 2019
b6360fb
qualify_consts: extract check_short_circuiting_in_const_local.
Centril Aug 29, 2019
c1d4400
qualify_consts: fuse prompted_temps.
Centril Aug 29, 2019
8af33b3
qualify_consts: extract check_non_thread_local_static_is_sync
Centril Aug 29, 2019
2f733aa
qualify_consts: extract remove_drop_and_storage_dead_on_promoted_locals.
Centril Aug 29, 2019
9196af0
qualify_consts: extract error_min_const_fn_violation.
Centril Aug 29, 2019
0a8a3dd
qualify_consts: move thread_local condition out.
Centril Aug 31, 2019
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
qualify_consts: move thread_local condition out.
  • Loading branch information
@Centril
Centril committed Aug 31, 2019
commit 0a8a3dd88a1216e7487b8e39179fbac16d07bafe
16 changes: 3 additions & 13 deletions src/librustc_mir/transform/qualify_consts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1648,9 +1648,9 @@ impl<'tcx> MirPass<'tcx> for QualifyAndPromoteConstants<'tcx> {
remove_drop_and_storage_dead_on_promoted_locals(body, promoted_temps);
}

if let Mode::Static = mode {
if mode == Mode::Static && !tcx.has_attr(def_id, sym::thread_local) {
// `static`s (not `static mut`s) which are not `#[thread_local]` must be `Sync`.
check_non_thread_local_static_is_sync(tcx, body, def_id, hir_id);
check_static_is_sync(tcx, body, hir_id);
}
}
}
Expand Down Expand Up @@ -1739,17 +1739,7 @@ fn remove_drop_and_storage_dead_on_promoted_locals(
}
}

fn check_non_thread_local_static_is_sync(
tcx: TyCtxt<'tcx>,
body: &mut Body<'tcx>,
def_id: DefId,
hir_id: HirId,
) {
// `#[thread_local]` statics don't have to be `Sync`.
if tcx.has_attr(def_id, sym::thread_local) {
return;
}

fn check_static_is_sync(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>, hir_id: HirId) {
let ty = body.return_ty();
tcx.infer_ctxt().enter(|infcx| {
let cause = traits::ObligationCause::new(body.span, hir_id, traits::SharedStatic);
Expand Down