mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
Vadim Chugunov 2017-02-09 18:35:19 -08:00
parent 24a70eb598
commit 28896758eb
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/librustc_trans/mir/mod.rs
View File

@ -134,17 +134,14 @@ impl<'a, 'tcx> MirContext<'a, 'tcx> {
} else {
let cm = self.ccx.sess().codemap();
// Walk up the macro expansion chain until we reach a non-expanded span.
// We also stop at the function body level because no line stepping can occurr
// at the level above that.
let mut span = source_info.span;
while span.expn_id != NO_EXPANSION && span.expn_id != COMMAND_LINE_EXPN {
while span.expn_id != NO_EXPANSION &&
span.expn_id != COMMAND_LINE_EXPN &&
span.expn_id != self.mir.span.expn_id {
if let Some(callsite_span) = cm.with_expn_info(span.expn_id,
|ei| ei.map(|ei| ei.call_site.clone())) {
// When the current function itself is a result of macro expansion,
// we stop at the function body level because no line stepping can occurr
// at the level above that.
if self.mir.span.expn_id != NO_EXPANSION &&
span.expn_id == self.mir.span.expn_id {
break;
}
span = callsite_span;
} else {
break;