From c5a7fca527961f1992afed245f02dc9c27e5049d Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Sat, 4 Jan 2020 17:49:00 +0100
Subject: [PATCH] Use DUMMY_SP in less places

Fixes #845
---
 src/base.rs     | 2 +-
 src/constant.rs | 2 ++
 src/lib.rs      | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/base.rs b/src/base.rs
index ac18ff6228a..b0b92a72cf8 100644
--- a/src/base.rs
+++ b/src/base.rs
@@ -501,7 +501,7 @@ fn trans_stmt<'tcx>(
                     assert!(lval
                         .layout()
                         .ty
-                        .is_sized(fx.tcx.at(DUMMY_SP), ParamEnv::reveal_all()));
+                        .is_sized(fx.tcx.at(stmt.source_info.span), ParamEnv::reveal_all()));
                     let ty_size = fx.layout_of(fx.monomorphize(ty)).size.bytes();
                     let val = CValue::const_val(fx, fx.tcx.types.usize, ty_size.into());
                     lval.write_cvalue(fx, val);
diff --git a/src/constant.rs b/src/constant.rs
index d53a5dcad35..1dfe4122a36 100644
--- a/src/constant.rs
+++ b/src/constant.rs
@@ -1,5 +1,7 @@
 use std::borrow::Cow;
 
+use syntax::source_map::DUMMY_SP;
+
 use rustc::mir::interpret::{
     read_target_uint, AllocId, Allocation, ConstValue, GlobalAlloc, InterpResult, Scalar,
 };
diff --git a/src/lib.rs b/src/lib.rs
index cbe07643a40..c0a2433ceeb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -64,7 +64,7 @@ mod prelude {
     pub use std::convert::{TryFrom, TryInto};
 
     pub use syntax::ast::{FloatTy, IntTy, UintTy};
-    pub use syntax::source_map::{Pos, Span, DUMMY_SP};
+    pub use syntax::source_map::{Pos, Span};
 
     pub use rustc::bug;
     pub use rustc::hir::def_id::{CrateNum, DefId, LOCAL_CRATE};