[libSyntax] Fix test failures in SwiftSyntaxTests

Author: ahoppen

include/swift/Syntax/SyntaxCollection.h

@@ -115,7 +115,7 @@ class SyntaxCollection : public Syntax {
     NewLayout.reserve(OldLayout.size() + 1);
     std::copy(OldLayout.begin(), OldLayout.end(), back_inserter(NewLayout));
     NewLayout.push_back(E.getRaw());
-    auto Raw = RawSyntax::make(CollectionKind, NewLayout, getRaw()->getPresence());
+    auto Raw = RawSyntax::makeAndCalcLength(CollectionKind, NewLayout, getRaw()->getPresence());
     return SyntaxCollection<CollectionKind, Element>(Data.replacingSelf(Raw));
   }
 
@@ -125,7 +125,7 @@ class SyntaxCollection : public Syntax {
   SyntaxCollection<CollectionKind, Element> removingLast() const {
     assert(!empty());
     auto NewLayout = getRaw()->getLayout().drop_back();
-    auto Raw = RawSyntax::make(CollectionKind, NewLayout, getRaw()->getPresence());
+    auto Raw = RawSyntax::makeAndCalcLength(CollectionKind, NewLayout, getRaw()->getPresence());
     return SyntaxCollection<CollectionKind, Element>(Data.replacingSelf(Raw));
   }
 
@@ -136,7 +136,7 @@ class SyntaxCollection : public Syntax {
     std::vector<RC<RawSyntax>> NewLayout = { E.getRaw() };
     std::copy(OldLayout.begin(), OldLayout.end(),
               std::back_inserter(NewLayout));
-    auto Raw = RawSyntax::make(CollectionKind, NewLayout, getRaw()->getPresence());
+    auto Raw = RawSyntax::makeAndCalcLength(CollectionKind, NewLayout, getRaw()->getPresence());
     return SyntaxCollection<CollectionKind, Element>(Data.replacingSelf(Raw));
   }
 
@@ -146,7 +146,7 @@ class SyntaxCollection : public Syntax {
   SyntaxCollection<CollectionKind, Element> removingFirst() const {
     assert(!empty());
     auto NewLayout = getRaw()->getLayout().drop_front();
-    auto Raw = RawSyntax::make(CollectionKind, NewLayout, getRaw()->getPresence());
+    auto Raw = RawSyntax::makeAndCalcLength(CollectionKind, NewLayout, getRaw()->getPresence());
     return SyntaxCollection<CollectionKind, Element>(Data.replacingSelf(Raw));
   }
 
@@ -165,7 +165,7 @@ class SyntaxCollection : public Syntax {
     NewLayout.push_back(E.getRaw());
     std::copy(OldLayout.begin() + i, OldLayout.end(),
               std::back_inserter(NewLayout));
-    auto Raw = RawSyntax::make(CollectionKind, NewLayout, getRaw()->getPresence());
+    auto Raw = RawSyntax::makeAndCalcLength(CollectionKind, NewLayout, getRaw()->getPresence());
     return SyntaxCollection<CollectionKind, Element>(Data.replacingSelf(Raw));
   }
 
@@ -176,13 +176,13 @@ class SyntaxCollection : public Syntax {
     auto iterator = NewLayout.begin();
     std::advance(iterator, i);
     NewLayout.erase(iterator);
-    auto Raw = RawSyntax::make(CollectionKind, NewLayout, getRaw()->getPresence());
+    auto Raw = RawSyntax::makeAndCalcLength(CollectionKind, NewLayout, getRaw()->getPresence());
     return SyntaxCollection<CollectionKind, Element>(Data.replacingSelf(Raw));
   }
 
   /// Return an empty syntax collection of this type.
   SyntaxCollection<CollectionKind, Element> cleared() const {
-    auto Raw = RawSyntax::make(CollectionKind, {}, getRaw()->getPresence());
+    auto Raw = RawSyntax::makeAndCalcLength(CollectionKind, {}, getRaw()->getPresence());
     return SyntaxCollection<CollectionKind, Element>(Data.replacingSelf(Raw));
   }
 

unittests/Syntax/CMakeLists.txt

@@ -4,7 +4,6 @@ add_swift_unittest(SwiftSyntaxTests
   GenericSyntaxTests.cpp
   StmtSyntaxTests.cpp
   SyntaxCollectionTests.cpp
-  ThreadSafeCachingTests.cpp
   TriviaTests.cpp
   TypeSyntaxTests.cpp
   UnknownSyntaxTests.cpp