ty,
name,
syntactic_source_info,
- visibility_source_info,
+ visibility_scope,
internal,
is_user_variable
});
/// To allow both uses to work, we need to have more than a single scope
/// for a local. We have the `syntactic_source_info.scope` represent the
/// "syntactic" lint scope (with a variable being under its let
- /// block) while the `visibility_source_info.scope` represents the "local variable"
+ /// block) while the `visibility_scope` represents the "local variable"
/// scope (where the "rest" of a block is under all prior let-statements).
///
/// The end result looks like this:
/// │ │
/// │ │ │{ let y: u32 }
/// │ │ │
- /// │ │ │← y.visibility_source_info.scope
+ /// │ │ │← y.visibility_scope
/// │ │ │← `y + 2`
/// │
/// │ │{ let x: u32 }
- /// │ │← x.visibility_source_info.scope
+ /// │ │← x.visibility_scope
/// │ │← `drop(x)` // this accesses `x: u32`
/// ```
pub syntactic_source_info: SourceInfo,
- /// Source info of the local. The `SourceScope` is the *visibility* one,
- /// not the the *syntactic* one (see `syntactic_source_info` for more details).
- pub visibility_source_info: SourceInfo,
+ /// Source scope within which the local is visible (for debuginfo)
+ /// (see `syntactic_source_info` for more details).
+ pub visibility_scope: SourceScope,
}
impl<'tcx> LocalDecl<'tcx> {
span,
scope: OUTERMOST_SOURCE_SCOPE
},
- visibility_source_info: SourceInfo {
- span,
- scope: OUTERMOST_SOURCE_SCOPE
- },
+ visibility_scope: OUTERMOST_SOURCE_SCOPE,
internal: false,
is_user_variable: false
}
span,
scope: OUTERMOST_SOURCE_SCOPE
},
- visibility_source_info: SourceInfo {
- span,
- scope: OUTERMOST_SOURCE_SCOPE
- },
+ visibility_scope: OUTERMOST_SOURCE_SCOPE,
internal: true,
is_user_variable: false
}
span,
scope: OUTERMOST_SOURCE_SCOPE
},
- visibility_source_info: SourceInfo {
- span,
- scope: OUTERMOST_SOURCE_SCOPE
- },
+ visibility_scope: OUTERMOST_SOURCE_SCOPE,
internal: false,
name: None, // FIXME maybe we do want some name here?
is_user_variable: false
ty,
name,
syntactic_source_info,
- visibility_source_info,
+ visibility_scope,
}
}
ref $($mutability)* ty,
name: _,
ref $($mutability)* syntactic_source_info,
- ref $($mutability)* visibility_source_info,
+ ref $($mutability)* visibility_scope,
internal: _,
is_user_variable: _,
} = *local_decl;
source_info: *syntactic_source_info,
});
self.visit_source_info(syntactic_source_info);
- self.visit_source_info(visibility_source_info);
+ self.visit_source_scope(visibility_scope);
}
fn super_source_scope(&mut self,
let mut has_variables = BitVector::new(mir.source_scopes.len());
for var in mir.vars_iter() {
let decl = &mir.local_decls[var];
- has_variables.insert(decl.visibility_source_info.scope.index());
+ has_variables.insert(decl.visibility_scope.index());
}
// Instantiate all scopes.
if let Some(name) = decl.name {
// User variable
- let debug_scope = fx.scopes[decl.visibility_source_info.scope];
+ let debug_scope = fx.scopes[decl.visibility_scope];
let dbg = debug_scope.is_valid() && bx.sess().opts.debuginfo == FullDebugInfo;
if !memory_locals.contains(local.index()) && !dbg {
debug!("alloc: {:?} ({}) -> place", local, name);
let place = PlaceRef::alloca(&bx, layout, &name.as_str());
if dbg {
- let (scope, span) = fx.debug_loc(decl.visibility_source_info);
+ let (scope, span) = fx.debug_loc(mir::SourceInfo {
+ span: decl.syntactic_source_info.span,
+ scope: decl.visibility_scope,
+ });
declare_local(&bx, &fx.debug_context, name, layout.ty, scope,
VariableAccess::DirectVariable { alloca: place.llval },
VariableKind::LocalVariable, span);
let borrow_span = self.mir.source_info(borrow.reserve_location).span;
let proper_span = match *root_place {
- Place::Local(local) => self.mir.local_decls[local].visibility_source_info.span,
+ Place::Local(local) => self.mir.local_decls[local].syntactic_source_info.span,
_ => drop_span,
};
None => continue,
}
- let source_info = local_decl.visibility_source_info;
- let mut_span = tcx.sess.codemap().span_until_non_whitespace(source_info.span);
+ let span = local_decl.syntactic_source_info.span;
+ let mut_span = tcx.sess.codemap().span_until_non_whitespace(span);
tcx.struct_span_lint_node(
UNUSED_MUT,
vsi[local_decl.syntactic_source_info.scope].lint_root,
- source_info.span,
+ span,
"variable does not need to be mutable"
)
.span_suggestion_short(mut_span, "remove this `mut`", "".to_owned())
}
None => {
err.span_label(
- mir.local_decls[local].visibility_source_info.span,
+ mir.local_decls[local].syntactic_source_info.span,
"borrow may end up in a temporary, created here",
);
LocalKind::Var | LocalKind::Temp => {}
}
- let span = local_decl.visibility_source_info.span;
+ let span = local_decl.syntactic_source_info.span;
let ty = local_decl.ty;
// Erase the regions from `ty` to get a global type. The
ty: ptr_ty,
name: None,
syntactic_source_info: source_info,
- visibility_source_info: source_info,
+ visibility_scope: source_info.scope,
internal: true,
is_user_variable: false
});
span,
scope: syntactic_scope,
};
- let visibility_source_info = SourceInfo {
- span,
- scope: visibility_scope.unwrap()
- };
- this.declare_binding(syntactic_source_info, visibility_source_info, mutability, name, var,
+ let visibility_scope = visibility_scope.unwrap();
+ this.declare_binding(syntactic_source_info, visibility_scope, mutability, name, var,
ty, has_guard);
});
visibility_scope
/// in the arm body, which will have type `T`.
fn declare_binding(&mut self,
syntactic_source_info: SourceInfo,
- visibility_source_info: SourceInfo,
+ visibility_scope: SourceScope,
mutability: Mutability,
name: Name,
var_id: NodeId,
var_ty: Ty<'tcx>,
has_guard: ArmHasGuard)
{
- debug!("declare_binding(var_id={:?}, name={:?}, var_ty={:?}, visibility_source_info={:?}, \
+ debug!("declare_binding(var_id={:?}, name={:?}, var_ty={:?}, visibility_scope={:?}, \
syntactic_source_info={:?})",
- var_id, name, var_ty, visibility_source_info, syntactic_source_info);
+ var_id, name, var_ty, visibility_scope, syntactic_source_info);
let tcx = self.hir.tcx();
let local = LocalDecl::<'tcx> {
ty: var_ty.clone(),
name: Some(name),
syntactic_source_info,
- visibility_source_info,
+ visibility_scope,
internal: false,
is_user_variable: true,
};
ty: tcx.mk_imm_ref(tcx.types.re_empty, var_ty),
name: Some(name),
syntactic_source_info,
- visibility_source_info,
+ visibility_scope,
internal: false,
is_user_variable: true,
});
mutability: Mutability::Mut,
ty,
syntactic_source_info: source_info,
- visibility_source_info: source_info,
+ visibility_scope: source_info.scope,
name,
internal: false,
is_user_variable: false,
fn gather_args(&mut self) {
for arg in self.mir.args_iter() {
let path = self.data.rev_lookup.locals[arg];
- let span = self.mir.local_decls[arg].visibility_source_info.span;
+ let span = self.mir.local_decls[arg].syntactic_source_info.span;
let init = self.data.inits.push(Init {
path, span, kind: InitKind::Deep
LocalDecl {
mutability, ty, name: None,
syntactic_source_info: source_info,
- visibility_source_info: source_info,
+ visibility_scope: source_info.scope,
internal: false,
is_user_variable: false
}
ty: ret_ty,
name: None,
syntactic_source_info: source_info,
- visibility_source_info: source_info,
+ visibility_scope: source_info.scope,
internal: false,
is_user_variable: false,
};
ty: tcx.mk_nil(),
name: None,
syntactic_source_info: source_info,
- visibility_source_info: source_info,
+ visibility_scope: source_info.scope,
internal: false,
is_user_variable: false,
};
}),
name: None,
syntactic_source_info: source_info,
- visibility_source_info: source_info,
+ visibility_scope: source_info.scope,
internal: false,
is_user_variable: false,
};
local.syntactic_source_info.scope =
scope_map[local.syntactic_source_info.scope];
local.syntactic_source_info.span = callsite.location.span;
- local.visibility_source_info.scope =
- scope_map[local.visibility_source_info.scope];
- local.visibility_source_info.span = callsite.location.span;
+ local.visibility_scope = scope_map[local.visibility_scope];
let idx = caller_mir.local_decls.push(local);
local_map.push(idx);
let no_stmts = self.source[loc.block].statements.len();
let new_temp = self.promoted.local_decls.push(
LocalDecl::new_temp(self.source.local_decls[temp].ty,
- self.source.local_decls[temp].visibility_source_info.span));
+ self.source.local_decls[temp].syntactic_source_info.span));
debug!("promote({:?} @ {:?}/{:?}, {:?})",
temp, loc, no_stmts, self.keep_original);
// otherwise we would use the `promoted` directly.
let mut promoted_ref = LocalDecl::new_temp(ref_ty, span);
promoted_ref.syntactic_source_info = statement.source_info;
- promoted_ref.visibility_source_info = statement.source_info;
+ promoted_ref.visibility_scope = statement.source_info.scope;
let promoted_ref = local_decls.push(promoted_ref);
assert_eq!(self.temps.push(TempState::Unpromotable), promoted_ref);
self.extra_statements.push((loc, Statement {
// conservatively, that drop elaboration will do.
let needs_drop = if let Place::Local(local) = *place {
if self.local_qualif[local].map_or(true, |q| q.intersects(Qualif::NEEDS_DROP)) {
- Some(self.mir.local_decls[local].visibility_source_info.span)
+ Some(self.mir.local_decls[local].syntactic_source_info.span)
} else {
None
}
let mut err = feature_err(
&self.tcx.sess.parse_sess,
"const_let",
- decl.visibility_source_info.span,
+ decl.syntactic_source_info.span,
GateIssue::Language,
"arguments of constant functions can only be immutable by-value bindings"
);