about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>2019-08-13 23:39:48 +0300
committerVadim Petrochenkov <vadim.petrochenkov@gmail.com>2019-08-15 20:41:45 +0300
commit650f19aeae94eff687382859603929cd2dd463bc (patch)
tree809b1264dad1af8316db55625dbafecf96fcbd8d /src
parent74190a5e1c7439b001296fbc41da67682fd1d9bf (diff)
downloadrust-650f19aeae94eff687382859603929cd2dd463bc.tar.gz
rust-650f19aeae94eff687382859603929cd2dd463bc.zip
hygiene: Merge a tiny bit of the "share expansion definition data" PR
Diffstat (limited to 'src')
-rw-r--r--src/librustc/hir/lowering.rs1
-rw-r--r--src/libsyntax_pos/hygiene.rs4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs
index 0b7dacf8383..8c1ce5983b8 100644
--- a/src/librustc/hir/lowering.rs
+++ b/src/librustc/hir/lowering.rs
@@ -705,7 +705,6 @@ impl<'a> LoweringContext<'a> {
         allow_internal_unstable: Option<Lrc<[Symbol]>>,
     ) -> Span {
         span.fresh_expansion(ExpnInfo {
-            def_site: span,
             allow_internal_unstable,
             ..ExpnInfo::default(ExpnKind::Desugaring(reason), span, self.sess.edition())
         })
diff --git a/src/libsyntax_pos/hygiene.rs b/src/libsyntax_pos/hygiene.rs
index 1dba466625a..4d9496f94fb 100644
--- a/src/libsyntax_pos/hygiene.rs
+++ b/src/libsyntax_pos/hygiene.rs
@@ -603,7 +603,9 @@ pub struct ExpnInfo {
     pub call_site: Span,
 
     // --- The part specific to the macro/desugaring definition.
-    // --- FIXME: Share it between expansions with the same definition.
+    // --- It may be reasonable to share this part between expansions with the same definition,
+    // --- but such sharing is known to bring some minor inconveniences without also bringing
+    // --- noticeable perf improvements (PR #62898).
     /// The span of the macro definition (possibly dummy).
     /// This span serves only informational purpose and is not used for resolution.
     pub def_site: Span,