use std::str;
use std::sync::Arc;
use syntax::symbol::LocalInternedString;
-use syntax::source_map::Span;
+use syntax::source_map::{DUMMY_SP, Span};
use crate::abi::Abi;
/// There is one `CodegenCx` per compilation unit. Each one has its own LLVM
type TyLayout = TyLayout<'tcx>;
fn layout_of(&self, ty: Ty<'tcx>) -> Self::TyLayout {
- self.spanned_layout_of(ty, None)
+ self.spanned_layout_of(ty, DUMMY_SP)
}
- fn spanned_layout_of(&self, ty: Ty<'tcx>, span: Option<Span>) -> Self::TyLayout {
+ fn spanned_layout_of(&self, ty: Ty<'tcx>, span: Span) -> Self::TyLayout {
self.tcx.layout_of(ty::ParamEnv::reveal_all().and(ty))
.unwrap_or_else(|e| if let LayoutError::SizeOverflow(_) = e {
match span {
rvalue: &mir::Rvalue<'tcx>,
location: Location) {
debug!("visit_assign(place={:?}, rvalue={:?})", place, rvalue);
- let mut decl_span = None;
- if let mir::PlaceBase::Local(local) = &place.base {
- if let Some(decl) = self.fx.mir.local_decls.get(*local) {
- decl_span = Some(decl.source_info.span);
- }
- }
if let mir::Place {
base: mir::PlaceBase::Local(index),
projection: None,
} = *place {
self.assign(index, location);
+ let decl_span = self.fx.mir.local_decls[index].source_info.span;
if !self.fx.rvalue_creates_operand(rvalue, decl_span) {
self.not_ssa(index);
}
use rustc_apfloat::{ieee, Float, Status, Round};
use std::{u128, i128};
use syntax::symbol::sym;
-use syntax::source_map::Span;
+use syntax::source_map::{DUMMY_SP, Span};
use crate::base;
use crate::MemFlags;
}
_ => {
- assert!(self.rvalue_creates_operand(rvalue, None));
+ assert!(self.rvalue_creates_operand(rvalue, DUMMY_SP));
let (mut bx, temp) = self.codegen_rvalue_operand(bx, rvalue);
temp.val.store(&mut bx, dest);
bx
rvalue: &mir::Rvalue<'tcx>
) -> (Bx, OperandRef<'tcx, Bx::Value>) {
assert!(
- self.rvalue_creates_operand(rvalue, None),
+ self.rvalue_creates_operand(rvalue, DUMMY_SP),
"cannot codegen {:?} to operand",
rvalue,
);
}
impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
- pub fn rvalue_creates_operand(&self, rvalue: &mir::Rvalue<'tcx>, span: Option<Span>) -> bool {
+ pub fn rvalue_creates_operand(&self, rvalue: &mir::Rvalue<'tcx>, span: Span) -> bool {
match *rvalue {
mir::Rvalue::Ref(..) |
mir::Rvalue::Len(..) |
type TyLayout;
fn layout_of(&self, ty: Self::Ty) -> Self::TyLayout;
- fn spanned_layout_of(&self, ty: Self::Ty, _span: Option<Span>) -> Self::TyLayout {
+ fn spanned_layout_of(&self, ty: Self::Ty, _span: Span) -> Self::TyLayout {
self.layout_of(ty)
}
}