Merge pull request #18446 from ahoppen/fix-compile-error

swift-ci · web-flow · commit 0d837c3a482c · 2018-08-01T12:19:26.000-07:00
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp b/tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp
@@ -1791,8 +1791,9 @@ void SwiftEditorDocument::readSyntaxInfo(EditorConsumer &Consumer) {
   Impl.ParserDiagnostics = Impl.SyntaxInfo->getDiagnostics();
 
   if (Consumer.syntaxTreeEnabled()) {
+    std::unordered_set<unsigned> ReusedNodeIds;
     Consumer.handleSyntaxTree(Impl.SyntaxInfo->getSourceFile().getSyntaxRoot(),
-                              /*ReusedNodeIds=*/{});
+                              ReusedNodeIds);
   }
 
   SwiftSyntaxMap NewMap = SwiftSyntaxMap(Impl.SyntaxMap.Tokens.size() + 16);

Original file line number	Diff line number	Diff line change
`@@ -1791,8 +1791,9 @@ void SwiftEditorDocument::readSyntaxInfo(EditorConsumer &Consumer) {`
`1791`	`1791`	`Impl.ParserDiagnostics = Impl.SyntaxInfo->getDiagnostics();`
`1792`	`1792`
`1793`	`1793`	`if (Consumer.syntaxTreeEnabled()) {`
	`1794`	`+ std::unordered_set<unsigned> ReusedNodeIds;`
`1794`	`1795`	`Consumer.handleSyntaxTree(Impl.SyntaxInfo->getSourceFile().getSyntaxRoot(),`
`1795`		`- /ReusedNodeIds=/{});`
	`1796`	`+ ReusedNodeIds);`
`1796`	`1797`	`}`
`1797`	`1798`
`1798`	`1799`	`SwiftSyntaxMap NewMap = SwiftSyntaxMap(Impl.SyntaxMap.Tokens.size() + 16);`