---

yaml
---
r: 271487
b: refs/heads/auto
c: f66fd89
h: refs/heads/master
i:
  271485: da99ef3
  271483: a59a62a
  271479: fec24e3
  271471: 4910c7d
  271455: 24c053b
  271423: c98bd7f
  271359: b48de84

Author: nikomatsakis

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: cb04e495dc7a34cc708246dad7bb8b844216fd3e
+refs/heads/auto: f66fd8972f16f7a38f57c9953f1f6972a917c905
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/librustc_mir/build/mod.rs

@@ -22,6 +22,8 @@ pub struct Builder<'a, 'tcx: 'a> {
     hir: Cx<'a, 'tcx>,
     cfg: CFG<'tcx>,
 
+    fn_span: Span,
+
     // the current set of scopes, updated as we traverse;
     // see the `scope` module for more details
     scopes: Vec<scope::Scope<'tcx>>,
@@ -147,6 +149,7 @@ pub fn construct<'a,'tcx>(hir: Cx<'a,'tcx>,
     let mut builder = Builder {
         hir: hir,
         cfg: cfg,
+        fn_span: span,
         scopes: vec![],
         scope_data_vec: ScopeDataVec::new(),
         scope_auxiliary: vec![],

branches/auto/src/librustc_mir/build/scope.rs

@@ -438,7 +438,7 @@ impl<'a,'tcx> Builder<'a,'tcx> {
         // generate B0 <- B1 <- B2 in left-to-right order. Control flow of the generated blocks
         // always ends up at a block with the Resume terminator.
         if scopes.iter().any(|scope| !scope.drops.is_empty() || scope.free.is_some()) {
-            Some(build_diverge_scope(hir.tcx(), cfg, &unit_temp, scopes))
+            Some(build_diverge_scope(hir.tcx(), self.fn_span, cfg, &unit_temp, scopes))
         } else {
             None
         }
@@ -611,6 +611,7 @@ fn build_scope_drops<'tcx>(cfg: &mut CFG<'tcx>,
 }
 
 fn build_diverge_scope<'tcx>(tcx: &TyCtxt<'tcx>,
+                             fn_span: Span,
                              cfg: &mut CFG<'tcx>,
                              unit_temp: &Lvalue<'tcx>,
                              scopes: &mut [Scope<'tcx>])
@@ -639,11 +640,11 @@ fn build_diverge_scope<'tcx>(tcx: &TyCtxt<'tcx>,
         // Diverging from the root scope creates a RESUME terminator.
         // FIXME what span to use here?
         let resumeblk = cfg.start_new_cleanup_block();
-        cfg.terminate(resumeblk, scope.id, DUMMY_SP, TerminatorKind::Resume);
+        cfg.terminate(resumeblk, scope.id, fn_span, TerminatorKind::Resume);
         resumeblk
     } else {
         // Diverging from any other scope chains up to the previous scope.
-        build_diverge_scope(tcx, cfg, unit_temp, earlier_scopes)
+        build_diverge_scope(tcx, fn_span, cfg, unit_temp, earlier_scopes)
     };
     scope.cached_block = Some(target);