averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[libSyntax] Add a reference counted version of OwnedString

Browse Source 
We cannot use unowned strings for token texts of incrementally parsed
syntax trees since the source buffer to which reused nodes refer will
have been freed for reused nodes. Always copying the token text whenever
OwnedString is passed is too expensive. A reference counted copy of the
string allows us to keep the token's string alive across incremental
parses while eliminating unnecessary copies.
This commit is contained in:
Alex Hoppen
2018-08-13 11:52:16 -07:00
parent a03749a743
commit ac512d4341
10 changed files with 132 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/Syntax/SyntaxFactory.cpp.gyb
View File

@@ -233,7 +233,8 @@ SyntaxFactory::makeBlank${node.syntax_kind}(SyntaxArena *Arena) {
SyntaxFactory::make${token.name}Keyword(const Trivia &LeadingTrivia,
const Trivia &TrailingTrivia,
SyntaxArena *Arena) {
return makeToken(tok::${token.kind}, "${token.text}",
return makeToken(tok::${token.kind},
OwnedString::makeUnowned("${token.text}"),
LeadingTrivia, TrailingTrivia,
SourcePresence::Present, Arena);
}
@@ -242,7 +243,8 @@ SyntaxFactory::makeBlank${node.syntax_kind}(SyntaxArena *Arena) {
SyntaxFactory::make${token.name}Token(const Trivia &LeadingTrivia,
const Trivia &TrailingTrivia,
SyntaxArena *Arena) {
return makeToken(tok::${token.kind}, "${token.text}",
return makeToken(tok::${token.kind},
OwnedString::makeUnowned("${token.text}"),
LeadingTrivia, TrailingTrivia,
SourcePresence::Present, Arena);
}
@@ -303,30 +305,35 @@ TypeSyntax SyntaxFactory::makeTypeIdentifier(OwnedString TypeName,
TypeSyntax SyntaxFactory::makeAnyTypeIdentifier(const Trivia &LeadingTrivia,
const Trivia &TrailingTrivia,
SyntaxArena *Arena) {
return makeTypeIdentifier("Any", LeadingTrivia, TrailingTrivia, Arena);
return makeTypeIdentifier(OwnedString::makeUnowned("Any"), LeadingTrivia,
TrailingTrivia, Arena);
}
TypeSyntax SyntaxFactory::makeSelfTypeIdentifier(const Trivia &LeadingTrivia,
const Trivia &TrailingTrivia,
SyntaxArena *Arena) {
return makeTypeIdentifier("Self", LeadingTrivia, TrailingTrivia, Arena);
return makeTypeIdentifier(OwnedString::makeUnowned("Self"),
LeadingTrivia, TrailingTrivia, Arena);
}
TokenSyntax SyntaxFactory::makeTypeToken(const Trivia &LeadingTrivia,
const Trivia &TrailingTrivia,
SyntaxArena *Arena) {
return makeIdentifier("Type", LeadingTrivia, TrailingTrivia, Arena);
return makeIdentifier(OwnedString::makeUnowned("Type"),
LeadingTrivia, TrailingTrivia, Arena);
}
TokenSyntax SyntaxFactory::makeProtocolToken(const Trivia &LeadingTrivia,
const Trivia &TrailingTrivia,
SyntaxArena *Arena) {
return makeIdentifier("Protocol", LeadingTrivia, TrailingTrivia, Arena);
return makeIdentifier(OwnedString::makeUnowned("Protocol"),
LeadingTrivia, TrailingTrivia, Arena);
}
TokenSyntax SyntaxFactory::makeEqualityOperator(const Trivia &LeadingTrivia,
const Trivia &TrailingTrivia,
SyntaxArena *Arena) {
return makeToken(tok::oper_binary_spaced, "==", LeadingTrivia, TrailingTrivia,
SourcePresence::Present, Arena);
return makeToken(tok::oper_binary_spaced, OwnedString::makeUnowned("=="),
LeadingTrivia, TrailingTrivia, SourcePresence::Present,
Arena);
}