Skip to content

Commit c13cf2c

Browse files
committed
[libSyntax] Remove ParsedRawSyntaxNode::copyDeferred
This is no longer needed.
1 parent e8f9272 commit c13cf2c

File tree

4 files changed

+3
-18
lines changed

4 files changed

+3
-18
lines changed

include/swift/Parse/ParsedRawSyntaxNode.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -187,17 +187,6 @@ class ParsedRawSyntaxNode {
187187
return copy;
188188
}
189189

190-
ParsedRawSyntaxNode copyDeferred() const {
191-
assert(isDeferredLayout() || isDeferredToken() && "node not deferred");
192-
ParsedRawSyntaxNode copy;
193-
copy.Data = Data;
194-
copy.Range = Range;
195-
copy.SynKind = SynKind;
196-
copy.TokKind = TokKind;
197-
copy.IsMissing = IsMissing;
198-
return copy;
199-
}
200-
201190
#ifndef NDEBUG
202191
bool ensureDataIsNotRecorded() {
203192
if (getDataKind() != DataKind::Recorded)

include/swift/Parse/ParsedSyntax.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ class ParsedSyntax {
4343
return T(std::move(RawNode));
4444
}
4545

46-
ParsedSyntax copyDeferred() const {
47-
return ParsedSyntax { RawNode.copyDeferred() };
48-
}
49-
5046
static bool kindof(syntax::SyntaxKind Kind) {
5147
return true;
5248
}

lib/Parse/ParsedRawSyntaxRecorder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ size_t ParsedRawSyntaxRecorder::getDeferredNumChildren(
231231
void ParsedRawSyntaxRecorder::verifyElementRanges(ArrayRef<ParsedRawSyntaxNode> elements) {
232232
SourceLoc prevEndLoc;
233233
for (const auto &elem: elements) {
234-
if (elem.isMissing() || elem.isNull())
234+
if (elem.isNull() || elem.isMissing())
235235
continue;
236236
CharSourceRange range = elem.getRange();
237237
if (range.isValid()) {

lib/Parse/ParsedSyntaxNodes.cpp.gyb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ Parsed${node.name}::getDeferred${child.name}(const SyntaxParsingContext *SyntaxC
3131
auto RawChild = getRaw().getDeferredChild(${node.name}::Cursor::${child.name}, SyntaxContext);
3232
if (RawChild.isNull())
3333
return None;
34-
return Parsed${child.type_name} {RawChild.copyDeferred()};
34+
return Parsed${child.type_name}(std::move(RawChild));
3535
}
3636
% else:
3737
Parsed${child.type_name} Parsed${node.name}::getDeferred${child.name}(const SyntaxParsingContext *SyntaxContext) {
38-
return Parsed${child.type_name} {getRaw().getDeferredChild(${node.name}::Cursor::${child.name}, SyntaxContext).copyDeferred()};
38+
return Parsed${child.type_name} {getRaw().getDeferredChild(${node.name}::Cursor::${child.name}, SyntaxContext)};
3939
}
4040
% end
4141

0 commit comments

Comments
 (0)