diff options
| author | bors <bors@rust-lang.org> | 2019-05-30 16:54:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-30 16:54:13 +0000 |
| commit | 0bfbaa6e8dfb509b453020740fd37c7a22882c87 (patch) | |
| tree | 1ebe6b4f2e4fbb80aa87763f833c674bfd704d27 /src/librustc_codegen_ssa | |
| parent | aee7012fab26d5e307a2fe767e4e7c847c5a45ee (diff) | |
| parent | 95ea7fd735619089ea9a0e95e2f41170127df567 (diff) | |
| download | rust-0bfbaa6e8dfb509b453020740fd37c7a22882c87.tar.gz rust-0bfbaa6e8dfb509b453020740fd37c7a22882c87.zip | |
Auto merge of #61253 - nnethercote:avoid-hygiene_data-lookups, r=petrochenkov
Avoid `hygiene_data` lookups These commits mostly introduce compound operations that allow two close adjacent `hygiene_data` lookups to be combined. r? @petrochenkov
Diffstat (limited to 'src/librustc_codegen_ssa')
| -rw-r--r-- | src/librustc_codegen_ssa/mir/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_codegen_ssa/mir/mod.rs b/src/librustc_codegen_ssa/mir/mod.rs index 4a43201dedf..5d6f7036c3e 100644 --- a/src/librustc_codegen_ssa/mir/mod.rs +++ b/src/librustc_codegen_ssa/mir/mod.rs @@ -131,7 +131,7 @@ impl<'a, 'tcx: 'a, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { // at the level above that. let mut span = source_info.span; while span.ctxt() != NO_EXPANSION && span.ctxt() != self.mir.span.ctxt() { - if let Some(info) = span.ctxt().outer().expn_info() { + if let Some(info) = span.ctxt().outer_expn_info() { span = info.call_site; } else { break; |