X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/217a6308cd6a1dc049a0bb69263bd4c91f91c4d0..2656c66b5b30d5597e842a751c7f19ad6c2fe31a:/runtime/JSStringJoiner.cpp?ds=sidebyside

diff --git a/runtime/JSStringJoiner.cpp b/runtime/JSStringJoiner.cpp
index b6461c7..f9870c3 100644
--- a/runtime/JSStringJoiner.cpp
+++ b/runtime/JSStringJoiner.cpp
@@ -29,7 +29,7 @@
 #include "ExceptionHelpers.h"
 #include "JSScope.h"
 #include "JSString.h"
-#include "Operations.h"
+#include "JSCInlines.h"
 #include <wtf/text/StringImpl.h>
 
 namespace JSC {
@@ -80,7 +80,7 @@ static inline PassRefPtr<StringImpl> joinStrings(const Vector<String>& strings,
     CharacterType* data;
     RefPtr<StringImpl> outputStringImpl = StringImpl::tryCreateUninitialized(outputLength, data);
     if (!outputStringImpl)
-        return PassRefPtr<StringImpl>();
+        return nullptr;
 
     const String firstString = strings.first();
     appendStringToData(data, firstString);
@@ -90,7 +90,7 @@ static inline PassRefPtr<StringImpl> joinStrings(const Vector<String>& strings,
         appendStringToData(data, strings[i]);
     }
 
-    ASSERT(data == (outputStringImpl->getCharacters<CharacterType>() + outputStringImpl->length()));
+    ASSERT(data == (outputStringImpl->characters<CharacterType>() + outputStringImpl->length()));
     return outputStringImpl.release();
 }