Temp: Cleanup 2 (SourceInfo)

Author: matthewjasper

src/librustc_mir/build/scope.rs

@@ -132,7 +132,7 @@ struct Scope {
 struct DropData {
     /// The `Span` where drop obligation was incurred (typically where place was
     /// declared)
-    span: Span,
+    source_info: SourceInfo,
 
     /// local to drop
     local: Local,
@@ -177,8 +177,7 @@ const CONTINUE_NODE: DropIdx = DropIdx::from_u32_const(1);
 // TODO say some more.
 #[derive(Debug)]
 struct DropTree {
-    /// The next item to drop, if there is one.
-    // TODO actual comment
+    /// Drops in the tree.
     drops: IndexVec<DropIdx, (DropData, DropIdx)>,
     /// Map for finding the inverse of the `next_drop` relation:
     ///
@@ -191,14 +190,6 @@ struct DropTree {
 }
 
 impl Scope {
-    /// Given a span and this scope's source scope, make a SourceInfo.
-    fn source_info(&self, span: Span) -> SourceInfo {
-        SourceInfo {
-            span,
-            scope: self.source_scope
-        }
-    }
-
     /// Whether there's anything to do for the cleanup path, that is,
     /// when unwinding through this scope. This includes destructors,
     /// but not StorageDead statements, which don't get emitted at all
@@ -220,7 +211,12 @@ impl Scope {
 
 impl DropTree {
     fn new(num_roots: usize) -> Self {
-        let fake_data = DropData { span: DUMMY_SP, local: Local::MAX, kind: DropKind::Storage };
+        let fake_source_info = SourceInfo { span: DUMMY_SP, scope: OUTERMOST_SOURCE_SCOPE };
+        let fake_data = DropData {
+            source_info: fake_source_info,
+            local: Local::MAX,
+            kind: DropKind::Storage,
+        };
         let drop_idx = DropIdx::MAX;
         let drops = IndexVec::from_elem_n((fake_data, drop_idx), num_roots);
         Self {
@@ -290,10 +286,6 @@ impl<'tcx> Scopes<'tcx> {
     fn topmost(&self) -> region::Scope {
         self.scopes.last().expect("topmost_scope: no scopes present").region_scope
     }
-
-//    fn source_info(&self, index: usize, span: Span) -> SourceInfo {
-//        self.scopes[self.len() - index].source_info(span)
-//    }
 }
 
 impl<'a, 'tcx> Builder<'a, 'tcx> {
@@ -495,7 +487,6 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         self.cfg.start_new_block().unit()
     }
 
-    // TODO: use in pop_top_scope.
     crate fn exit_top_scope(
         &mut self,
         mut block: BasicBlock,
@@ -678,7 +669,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         let scope_end = self.hir.tcx().sess.source_map().end_point(region_scope_span);
 
         scope.drops.push(DropData {
-            span: scope_end,
+            source_info: SourceInfo { span: scope_end, scope: scope.source_scope },
             local,
             kind: drop_kind,
         });
@@ -791,7 +782,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                             bug!("Drop scheduled on top of condition variable")
                         }
                         DropKind::Storage => {
-                            let source_info = top_scope.source_info(top_drop_data.span);
+                            let source_info = top_drop_data.source_info;
                             let local = top_drop_data.local;
                             assert_eq!(local, cond_temp, "Drop scheduled on top of condition");
                             self.cfg.push(
@@ -933,7 +924,7 @@ fn build_scope_drops<'tcx>(
     // `diverge_cleanup_gen`.
 
     for drop_data in scope.drops.iter().rev() {
-        let source_info = scope.source_info(drop_data.span);
+        let source_info = drop_data.source_info;
         let local = drop_data.local;
 
         match drop_data.kind {
@@ -1127,13 +1118,6 @@ impl<'a, 'tcx: 'a> Builder<'a, 'tcx> {
     }
 }
 
-fn source_info(span: Span) -> SourceInfo {
-    SourceInfo {
-        span,
-        scope: OUTERMOST_SOURCE_SCOPE,
-    }
-}
-
 fn build_drop_tree<'tcx, T: DropTreeBuilder<'tcx>>(
     cfg: &mut CFG<'tcx>,
     drops: &mut DropTree,
@@ -1207,7 +1191,7 @@ fn build_drop_tree<'tcx, T: DropTreeBuilder<'tcx>>(
                 };
                 cfg.terminate(
                     blocks[drop_idx].unwrap(),
-                    source_info(drop_data.0.span),
+                    drop_data.0.source_info,
                     terminator,
                 );
             }
@@ -1216,14 +1200,14 @@ fn build_drop_tree<'tcx, T: DropTreeBuilder<'tcx>>(
             DropKind::Storage => {
                 let block = blocks[drop_idx].unwrap();
                 let stmt = Statement {
-                    source_info: source_info(drop_data.0.span),
+                    source_info: drop_data.0.source_info,
                     kind: StatementKind::StorageDead(drop_data.0.local),
                 };
                 cfg.push(block, stmt);
                 let target = blocks[drop_data.1].unwrap();
                 if target != block {
                     let terminator = TerminatorKind::Goto { target };
-                    cfg.terminate(block, source_info(drop_data.0.span), terminator);
+                    cfg.terminate(block, drop_data.0.source_info, terminator);
                 }
             }
         }