diff options
| author | bors <bors@rust-lang.org> | 2016-07-06 20:04:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-06 20:04:11 -0700 |
| commit | de78655bca47cac8e783dbb563e7e5c25c1fae40 (patch) | |
| tree | 1e74a08a79b8d12f5166600f3ca19c449d7732ad /src/libsyntax/parse/parser.rs | |
| parent | 5c674a11471ec0569f616854d715941757a48a0a (diff) | |
| parent | 547a930835be262ebea5e499dba7555a8a47b992 (diff) | |
| download | rust-de78655bca47cac8e783dbb563e7e5c25c1fae40.tar.gz rust-de78655bca47cac8e783dbb563e7e5c25c1fae40.zip | |
Auto merge of #34652 - jseyfried:fix_expansion_perf, r=nrc
Fix expansion performance regression **syntax-[breaking-change] cc #31645** This fixes #34630 by reverting commit 5bf7970 of PR #33943, which landed in #34424. By removing the `Rc<_>` wrapping around `Delimited` and `SequenceRepetition` in `TokenTree`, 5bf7970 made cloning `TokenTree`s more expensive. While this had no measurable performance impact on the compiler's crates, it caused an order of magnitude performance regression on some macro-heavy code in the wild. I believe this is due to clones of `TokenTree`s in `macro_parser.rs` and/or `macro_rules.rs`. r? @nrc
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index a06270bb772..4cf14e62299 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2688,12 +2688,13 @@ impl<'a> Parser<'a> { )?; let (sep, repeat) = self.parse_sep_and_kleene_op()?; let name_num = macro_parser::count_names(&seq); - return Ok(TokenTree::Sequence(mk_sp(sp.lo, seq_span.hi), SequenceRepetition { - tts: seq, - separator: sep, - op: repeat, - num_captures: name_num - })); + return Ok(TokenTree::Sequence(mk_sp(sp.lo, seq_span.hi), + Rc::new(SequenceRepetition { + tts: seq, + separator: sep, + op: repeat, + num_captures: name_num + }))); } else if self.token.is_keyword(keywords::Crate) { self.bump(); return Ok(TokenTree::Token(sp, SpecialVarNt(SpecialMacroVar::CrateMacroVar))); @@ -2848,12 +2849,12 @@ impl<'a> Parser<'a> { _ => {} } - Ok(TokenTree::Delimited(span, Delimited { + Ok(TokenTree::Delimited(span, Rc::new(Delimited { delim: delim, open_span: open_span, tts: tts, close_span: close_span, - })) + }))) }, _ => { // invariants: the current token is not a left-delimiter, |
