Merge remote-tracking branch 'origin/master' into master-next

This commit is contained in:
swift-ci
2018-07-25 17:49:26 -07:00

View File

@@ -2415,7 +2415,7 @@ void SwiftLangSupport::editorReplaceText(StringRef Name,
}
if (Consumer.syntaxTreeEnabled()) {
std::unordered_set<unsigned> ReusedNodeIds = {};
std::unordered_set<unsigned> ReusedNodeIds;
if (SyntaxCache.hasValue()) {
auto &ReusedVector = SyntaxCache->getReusedNodeIds();
ReusedNodeIds = std::unordered_set<unsigned>(ReusedVector.begin(),