bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix issues caused during rebasing

Browse source
This commit is contained in:
Paul Daniel Faria 2019-11-29 18:36:16 -05:00
parent 38bd3a2342
commit 6123478f2a
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc_codegen_ssa/mir/mod.rs
View file

@ -156,7 +156,7 @@ pub fn codegen_mir<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
}).collect(); }).collect();
let (landing_pads, funclets) = create_funclets(&mir, &mut bx, &cleanup_kinds, &block_bxs); let (landing_pads, funclets) = create_funclets(&mir, &mut bx, &cleanup_kinds, &block_bxs);
let mir_body: &Body<'_> = &mir; let mir_body: &Body<'_> = mir.body();
let mut fx = FunctionCx { let mut fx = FunctionCx {
instance, instance,
mir, mir,

4
src/librustc_mir/shim.rs
View file

@ -199,7 +199,7 @@ fn build_drop_shim<'tcx>(
block(&mut blocks, TerminatorKind::Goto { target: return_block }); block(&mut blocks, TerminatorKind::Goto { target: return_block });
block(&mut blocks, TerminatorKind::Return); block(&mut blocks, TerminatorKind::Return);
let mut body = new_body( let body = new_body(
blocks, blocks,
local_decls_for_sig(&sig, span), local_decls_for_sig(&sig, span),
sig.inputs().len(), sig.inputs().len(),
@ -914,7 +914,7 @@ pub fn build_adt_ctor(tcx: TyCtxt<'_>, ctor_id: DefId) -> &BodyCache<'_> {
is_cleanup: false is_cleanup: false
}; };
let mut body = new_body( let body = new_body(
IndexVec::from_elem_n(start_block, 1), IndexVec::from_elem_n(start_block, 1),
local_decls, local_decls,
sig.inputs().len(), sig.inputs().len(),

2
src/librustc_mir/transform/promote_consts.rs
View file

@ -64,7 +64,7 @@ impl<'tcx> MirPass<'tcx> for PromoteTemps<'tcx> {
let (temps, all_candidates) = collect_temps_and_candidates(tcx, body, &mut rpo); let (temps, all_candidates) = collect_temps_and_candidates(tcx, body, &mut rpo);
let promotable_candidates let promotable_candidates
= validate_candidates(tcx, read_only, def_id, &temps, &all_candidates); = validate_candidates(tcx, read_only!(body), def_id, &temps, &all_candidates);
let promoted = promote_candidates(def_id, body, tcx, temps, promotable_candidates); let promoted = promote_candidates(def_id, body, tcx, temps, promotable_candidates);
self.promoted_fragments.set(promoted); self.promoted_fragments.set(promoted);

2
src/librustc_mir/util/def_use.rs
View file

@ -62,7 +62,7 @@ impl DefUseAnalysis {
let mut visitor = MutateUseVisitor::new(local, new_local, tcx); let mut visitor = MutateUseVisitor::new(local, new_local, tcx);
let info = &self.info[local]; let info = &self.info[local];
for place_use in &info.defs_and_uses { for place_use in &info.defs_and_uses {
visitor.visit_location(body_cache, place_use.location) visitor.visit_location(body, place_use.location)
} }
// Update debuginfo as well, alongside defs/uses. // Update debuginfo as well, alongside defs/uses.
for &i in &info.var_debug_info_indices { for &i in &info.var_debug_info_indices {