<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[247351] tags/Safari-608.1.35</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/247351">247351</a></dd>
<dt>Author</dt> <dd>kocsen_chung@apple.com</dd>
<dt>Date</dt> <dd>2019-07-11 08:33:17 -0700 (Thu, 11 Jul 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/247307">r247307</a>. rdar://problem/52859522

    Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/247286">r247286</a>.

    Caused TestWTF.WTF.StringOperators to fail on debug bots

    Reverted changeset:

    "Add StringBuilder member function which allows makeString()
    style variadic argument construction"
    https://bugs.webkit.org/show_bug.cgi?id=198997
    https://trac.webkit.org/changeset/247286

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247307 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari608135SourceWTFChangeLog">tags/Safari-608.1.35/Source/WTF/ChangeLog</a></li>
<li><a href="#tagsSafari608135SourceWTFwtfposixFileSystemPOSIXcpp">tags/Safari-608.1.35/Source/WTF/wtf/posix/FileSystemPOSIX.cpp</a></li>
<li><a href="#tagsSafari608135SourceWTFwtftextStringBuildercpp">tags/Safari-608.1.35/Source/WTF/wtf/text/StringBuilder.cpp</a></li>
<li><a href="#tagsSafari608135SourceWTFwtftextStringBuilderh">tags/Safari-608.1.35/Source/WTF/wtf/text/StringBuilder.h</a></li>
<li><a href="#tagsSafari608135SourceWTFwtftextStringConcatenateh">tags/Safari-608.1.35/Source/WTF/wtf/text/StringConcatenate.h</a></li>
<li><a href="#tagsSafari608135ToolsChangeLog">tags/Safari-608.1.35/Tools/ChangeLog</a></li>
<li><a href="#tagsSafari608135ToolsTestWebKitAPITestsWTFStringBuildercpp">tags/Safari-608.1.35/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari608135SourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-608.1.35/Source/WTF/ChangeLog (247350 => 247351)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-608.1.35/Source/WTF/ChangeLog        2019-07-11 14:09:55 UTC (rev 247350)
+++ tags/Safari-608.1.35/Source/WTF/ChangeLog   2019-07-11 15:33:17 UTC (rev 247351)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2019-07-11  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r247307. rdar://problem/52859522
+
+    Unreviewed, rolling out r247286.
+    
+    Caused TestWTF.WTF.StringOperators to fail on debug bots
+    
+    Reverted changeset:
+    
+    "Add StringBuilder member function which allows makeString()
+    style variadic argument construction"
+    https://bugs.webkit.org/show_bug.cgi?id=198997
+    https://trac.webkit.org/changeset/247286
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247307 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-07-10  Ryan Haddad  <ryanhaddad@apple.com>
+
+            Unreviewed, rolling out r247286.
+
+            Caused TestWTF.WTF.StringOperators to fail on debug bots
+
+            Reverted changeset:
+
+            "Add StringBuilder member function which allows makeString()
+            style variadic argument construction"
+            https://bugs.webkit.org/show_bug.cgi?id=198997
+            https://trac.webkit.org/changeset/247286
+
</ins><span class="cx"> 2019-07-09  Sam Weinig  <weinig@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Add StringBuilder member function which allows makeString() style variadic argument construction
</span></span></pre></div>
<a id="tagsSafari608135SourceWTFwtfposixFileSystemPOSIXcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-608.1.35/Source/WTF/wtf/posix/FileSystemPOSIX.cpp (247350 => 247351)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-608.1.35/Source/WTF/wtf/posix/FileSystemPOSIX.cpp    2019-07-11 14:09:55 UTC (rev 247350)
+++ tags/Safari-608.1.35/Source/WTF/wtf/posix/FileSystemPOSIX.cpp       2019-07-11 15:33:17 UTC (rev 247351)
</span><span class="lines">@@ -301,8 +301,10 @@
</span><span class="cx"> {
</span><span class="cx">     StringBuilder builder;
</span><span class="cx">     builder.append(path);
</span><del>-    for (auto& component : components)
-        builder.flexibleAppend('/', component);
</del><ins>+    for (auto& component : components) {
+        builder.append('/');
+        builder.append(component);
+    }
</ins><span class="cx">     return builder.toString();
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="tagsSafari608135SourceWTFwtftextStringBuildercpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-608.1.35/Source/WTF/wtf/text/StringBuilder.cpp (247350 => 247351)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-608.1.35/Source/WTF/wtf/text/StringBuilder.cpp       2019-07-11 14:09:55 UTC (rev 247350)
+++ tags/Safari-608.1.35/Source/WTF/wtf/text/StringBuilder.cpp  2019-07-11 15:33:17 UTC (rev 247351)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx">     ASSERT(m_buffer->length() == requiredLength);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-template<>
</del><ins>+template <>
</ins><span class="cx"> void StringBuilder::reallocateBuffer<LChar>(unsigned requiredLength)
</span><span class="cx"> {
</span><span class="cx">     // If the buffer has only one ref (by this StringBuilder), reallocate it,
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx">     ASSERT(hasOverflowed() || m_buffer->length() == requiredLength);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-template<>
</del><ins>+template <>
</ins><span class="cx"> void StringBuilder::reallocateBuffer<UChar>(unsigned requiredLength)
</span><span class="cx"> {
</span><span class="cx">     // If the buffer has only one ref (by this StringBuilder), reallocate it,
</span><span class="lines">@@ -231,29 +231,21 @@
</span><span class="cx">     ASSERT(hasOverflowed() || !newCapacity || m_buffer->length() >= newCapacity);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-// Make 'additionalLength' additional capacity be available in m_buffer, update m_string & m_length,
</del><ins>+// Make 'length' additional capacity be available in m_buffer, update m_string & m_length,
</ins><span class="cx"> // return a pointer to the newly allocated storage.
</span><span class="cx"> // Returns nullptr if the size of the new builder would have overflowed
</span><del>-template<typename CharacterType>
-ALWAYS_INLINE CharacterType* StringBuilder::appendUninitialized(unsigned additionalLength)
</del><ins>+template <typename CharType>
+ALWAYS_INLINE CharType* StringBuilder::appendUninitialized(unsigned length)
</ins><span class="cx"> {
</span><del>-    ASSERT(additionalLength);
</del><ins>+    ASSERT(length);
</ins><span class="cx"> 
</span><span class="cx">     // Calculate the new size of the builder after appending.
</span><del>-    CheckedInt32 requiredLength = m_length + additionalLength;
</del><ins>+    CheckedInt32 requiredLength = m_length + length;
</ins><span class="cx">     if (requiredLength.hasOverflowed()) {
</span><span class="cx">         didOverflow();
</span><span class="cx">         return nullptr;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    return appendUninitializedWithoutOverflowCheck<CharacterType>(requiredLength);
-}
-
-template<typename CharacterType>
-ALWAYS_INLINE CharacterType* StringBuilder::appendUninitializedWithoutOverflowCheck(CheckedInt32 requiredLength)
-{
-    ASSERT(!requiredLength.hasOverflowed());
-
</del><span class="cx">     if (m_buffer && (requiredLength.unsafeGet<unsigned>() <= m_buffer->length())) {
</span><span class="cx">         // If the buffer is valid it must be at least as long as the current builder contents!
</span><span class="cx">         ASSERT(m_buffer->length() >= m_length.unsafeGet<unsigned>());
</span><span class="lines">@@ -260,26 +252,16 @@
</span><span class="cx">         unsigned currentLength = m_length.unsafeGet();
</span><span class="cx">         m_string = String();
</span><span class="cx">         m_length = requiredLength;
</span><del>-        return getBufferCharacters<CharacterType>() + currentLength;
</del><ins>+        return getBufferCharacters<CharType>() + currentLength;
</ins><span class="cx">     }
</span><span class="cx">     
</span><del>-    return appendUninitializedSlow<CharacterType>(requiredLength.unsafeGet());
</del><ins>+    return appendUninitializedSlow<CharType>(requiredLength.unsafeGet());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-UChar* StringBuilder::appendUninitializedWithoutOverflowCheckForUChar(CheckedInt32 requiredLength)
-{
-    return appendUninitializedWithoutOverflowCheck<UChar>(requiredLength);
-}
-
-LChar* StringBuilder::appendUninitializedWithoutOverflowCheckForLChar(CheckedInt32 requiredLength)
-{
-    return appendUninitializedWithoutOverflowCheck<LChar>(requiredLength);
-}
-
-// Make 'requiredLength' capacity be available in m_buffer, update m_string & m_length,
</del><ins>+// Make 'length' additional capacity be available in m_buffer, update m_string & m_length,
</ins><span class="cx"> // return a pointer to the newly allocated storage.
</span><del>-template<typename CharacterType>
-CharacterType* StringBuilder::appendUninitializedSlow(unsigned requiredLength)
</del><ins>+template <typename CharType>
+CharType* StringBuilder::appendUninitializedSlow(unsigned requiredLength)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(!hasOverflowed());
</span><span class="cx">     ASSERT(requiredLength);
</span><span class="lines">@@ -288,15 +270,15 @@
</span><span class="cx">         // If the buffer is valid it must be at least as long as the current builder contents!
</span><span class="cx">         ASSERT(m_buffer->length() >= m_length.unsafeGet<unsigned>());
</span><span class="cx">         
</span><del>-        reallocateBuffer<CharacterType>(expandedCapacity(capacity(), requiredLength));
</del><ins>+        reallocateBuffer<CharType>(expandedCapacity(capacity(), requiredLength));
</ins><span class="cx">     } else {
</span><span class="cx">         ASSERT(m_string.length() == m_length.unsafeGet<unsigned>());
</span><del>-        allocateBuffer(m_length ? m_string.characters<CharacterType>() : nullptr, expandedCapacity(capacity(), requiredLength));
</del><ins>+        allocateBuffer(m_length ? m_string.characters<CharType>() : nullptr, expandedCapacity(capacity(), requiredLength));
</ins><span class="cx">     }
</span><span class="cx">     if (UNLIKELY(hasOverflowed()))
</span><span class="cx">         return nullptr;
</span><span class="cx"> 
</span><del>-    CharacterType* result = getBufferCharacters<CharacterType>() + m_length.unsafeGet();
</del><ins>+    CharType* result = getBufferCharacters<CharType>() + m_length.unsafeGet();
</ins><span class="cx">     m_length = requiredLength;
</span><span class="cx">     ASSERT(!hasOverflowed());
</span><span class="cx">     ASSERT(m_buffer->length() >= m_length.unsafeGet<unsigned>());
</span></span></pre></div>
<a id="tagsSafari608135SourceWTFwtftextStringBuilderh"></a>
<div class="modfile"><h4>Modified: tags/Safari-608.1.35/Source/WTF/wtf/text/StringBuilder.h (247350 => 247351)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-608.1.35/Source/WTF/wtf/text/StringBuilder.h 2019-07-11 14:09:55 UTC (rev 247350)
+++ tags/Safari-608.1.35/Source/WTF/wtf/text/StringBuilder.h    2019-07-11 15:33:17 UTC (rev 247351)
</span><span class="lines">@@ -231,9 +231,6 @@
</span><span class="cx">     WTF_EXPORT_PRIVATE void appendFixedWidthNumber(float, unsigned decimalPlaces);
</span><span class="cx">     WTF_EXPORT_PRIVATE void appendFixedWidthNumber(double, unsigned decimalPlaces);
</span><span class="cx"> 
</span><del>-    // FIXME: Rename to append(...) after renaming any overloads of append that take more than one argument.
-    template<typename... StringTypes> void flexibleAppend(StringTypes...);
-
</del><span class="cx">     String toString()
</span><span class="cx">     {
</span><span class="cx">         if (!m_string.isNull()) {
</span><span class="lines">@@ -353,19 +350,16 @@
</span><span class="cx">     void allocateBuffer(const LChar* currentCharacters, unsigned requiredLength);
</span><span class="cx">     void allocateBuffer(const UChar* currentCharacters, unsigned requiredLength);
</span><span class="cx">     void allocateBufferUpConvert(const LChar* currentCharacters, unsigned requiredLength);
</span><del>-    template<typename CharacterType> void reallocateBuffer(unsigned requiredLength);
-    template<typename CharacterType> ALWAYS_INLINE CharacterType* appendUninitialized(unsigned additionalLength);
-    template<typename CharacterType> ALWAYS_INLINE CharacterType* appendUninitializedWithoutOverflowCheck(CheckedInt32 requiredLength);
-    template<typename CharacterType> CharacterType* appendUninitializedSlow(unsigned requiredLength);
-    
-    WTF_EXPORT_PRIVATE UChar* appendUninitializedWithoutOverflowCheckForUChar(CheckedInt32 requiredLength);
-    WTF_EXPORT_PRIVATE LChar* appendUninitializedWithoutOverflowCheckForLChar(CheckedInt32 requiredLength);
-    
-    template<typename CharacterType> ALWAYS_INLINE CharacterType* getBufferCharacters();
</del><ins>+    template <typename CharType>
+    void reallocateBuffer(unsigned requiredLength);
+    template <typename CharType>
+    ALWAYS_INLINE CharType* appendUninitialized(unsigned length);
+    template <typename CharType>
+    CharType* appendUninitializedSlow(unsigned length);
+    template <typename CharType>
+    ALWAYS_INLINE CharType * getBufferCharacters();
</ins><span class="cx">     WTF_EXPORT_PRIVATE void reifyString() const;
</span><span class="cx"> 
</span><del>-    template<typename... StringTypeAdapters> void flexibleAppendFromAdapters(StringTypeAdapters...);
-
</del><span class="cx">     mutable String m_string;
</span><span class="cx">     RefPtr<StringImpl> m_buffer;
</span><span class="cx">     union {
</span><span class="lines">@@ -380,7 +374,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-template<>
</del><ins>+template <>
</ins><span class="cx"> ALWAYS_INLINE LChar* StringBuilder::getBufferCharacters<LChar>()
</span><span class="cx"> {
</span><span class="cx">     ASSERT(m_is8Bit);
</span><span class="lines">@@ -387,7 +381,7 @@
</span><span class="cx">     return m_bufferCharacters8;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-template<>
</del><ins>+template <>
</ins><span class="cx"> ALWAYS_INLINE UChar* StringBuilder::getBufferCharacters<UChar>()
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!m_is8Bit);
</span><span class="lines">@@ -394,41 +388,9 @@
</span><span class="cx">     return m_bufferCharacters16;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-template<typename... StringTypeAdapters>
-void StringBuilder::flexibleAppendFromAdapters(StringTypeAdapters... adapters)
</del><ins>+template <typename CharType>
+bool equal(const StringBuilder& s, const CharType* buffer, unsigned length)
</ins><span class="cx"> {
</span><del>-    auto requiredLength = checkedSum<int32_t>(m_length, adapters.length()...);
-    if (requiredLength.hasOverflowed()) {
-        didOverflow();
-        return;
-    }
-
-    if (m_is8Bit && are8Bit(adapters...)) {
-        LChar* dest = appendUninitializedWithoutOverflowCheckForLChar(requiredLength);
-        if (!dest) {
-            ASSERT(hasOverflowed());
-            return;
-        }
-        stringTypeAdapterAccumulator(dest, adapters...);
-    } else {
-        UChar* dest = appendUninitializedWithoutOverflowCheckForUChar(requiredLength);
-        if (!dest) {
-            ASSERT(hasOverflowed());
-            return;
-        }
-        stringTypeAdapterAccumulator(dest, adapters...);
-    }
-}
-
-template<typename... StringTypes>
-void StringBuilder::flexibleAppend(StringTypes... strings)
-{
-    flexibleAppendFromAdapters(StringTypeAdapter<StringTypes>(strings)...);
-}
-
-template<typename CharacterType>
-bool equal(const StringBuilder& s, const CharacterType* buffer, unsigned length)
-{
</del><span class="cx">     if (s.length() != length)
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="lines">@@ -438,7 +400,7 @@
</span><span class="cx">     return equal(s.characters16(), buffer, length);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-template<typename StringType>
</del><ins>+template <typename StringType>
</ins><span class="cx"> bool equal(const StringBuilder& a, const StringType& b)
</span><span class="cx"> {
</span><span class="cx">     if (a.length() != b.length())
</span></span></pre></div>
<a id="tagsSafari608135SourceWTFwtftextStringConcatenateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-608.1.35/Source/WTF/wtf/text/StringConcatenate.h (247350 => 247351)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-608.1.35/Source/WTF/wtf/text/StringConcatenate.h     2019-07-11 14:09:55 UTC (rev 247350)
+++ tags/Safari-608.1.35/Source/WTF/wtf/text/StringConcatenate.h        2019-07-11 15:33:17 UTC (rev 247351)
</span><span class="lines">@@ -248,16 +248,16 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> template<typename ResultType, typename Adapter>
</span><del>-inline void stringTypeAdapterAccumulator(ResultType* result, Adapter adapter)
</del><ins>+inline void makeStringAccumulator(ResultType* result, Adapter adapter)
</ins><span class="cx"> {
</span><span class="cx">     adapter.writeTo(result);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> template<typename ResultType, typename Adapter, typename... Adapters>
</span><del>-inline void stringTypeAdapterAccumulator(ResultType* result, Adapter adapter, Adapters ...adapters)
</del><ins>+inline void makeStringAccumulator(ResultType* result, Adapter adapter, Adapters ...adapters)
</ins><span class="cx"> {
</span><span class="cx">     adapter.writeTo(result);
</span><del>-    stringTypeAdapterAccumulator(result + adapter.length(), adapters...);
</del><ins>+    makeStringAccumulator(result + adapter.length(), adapters...);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> template<typename StringTypeAdapter, typename... StringTypeAdapters>
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx">         if (!resultImpl)
</span><span class="cx">             return String();
</span><span class="cx"> 
</span><del>-        stringTypeAdapterAccumulator(buffer, adapter, adapters...);
</del><ins>+        makeStringAccumulator(buffer, adapter, adapters...);
</ins><span class="cx"> 
</span><span class="cx">         return resultImpl;
</span><span class="cx">     }
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx">     if (!resultImpl)
</span><span class="cx">         return String();
</span><span class="cx"> 
</span><del>-    stringTypeAdapterAccumulator(buffer, adapter, adapters...);
</del><ins>+    makeStringAccumulator(buffer, adapter, adapters...);
</ins><span class="cx"> 
</span><span class="cx">     return resultImpl;
</span><span class="cx"> }
</span></span></pre></div>
<a id="tagsSafari608135ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-608.1.35/Tools/ChangeLog (247350 => 247351)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-608.1.35/Tools/ChangeLog     2019-07-11 14:09:55 UTC (rev 247350)
+++ tags/Safari-608.1.35/Tools/ChangeLog        2019-07-11 15:33:17 UTC (rev 247351)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2019-07-11  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r247307. rdar://problem/52859522
+
+    Unreviewed, rolling out r247286.
+    
+    Caused TestWTF.WTF.StringOperators to fail on debug bots
+    
+    Reverted changeset:
+    
+    "Add StringBuilder member function which allows makeString()
+    style variadic argument construction"
+    https://bugs.webkit.org/show_bug.cgi?id=198997
+    https://trac.webkit.org/changeset/247286
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247307 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-07-10  Ryan Haddad  <ryanhaddad@apple.com>
+
+            Unreviewed, rolling out r247286.
+
+            Caused TestWTF.WTF.StringOperators to fail on debug bots
+
+            Reverted changeset:
+
+            "Add StringBuilder member function which allows makeString()
+            style variadic argument construction"
+            https://bugs.webkit.org/show_bug.cgi?id=198997
+            https://trac.webkit.org/changeset/247286
+
</ins><span class="cx"> 2019-07-09  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Fix integer type encoding / decoding in WKRemoteObjectCoder
</span></span></pre></div>
<a id="tagsSafari608135ToolsTestWebKitAPITestsWTFStringBuildercpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-608.1.35/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp (247350 => 247351)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-608.1.35/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp     2019-07-11 14:09:55 UTC (rev 247350)
+++ tags/Safari-608.1.35/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp        2019-07-11 15:33:17 UTC (rev 247351)
</span><span class="lines">@@ -116,29 +116,6 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-TEST(StringBuilderTest, FlexibleAppend)
-{
-    {
-        StringBuilder builder;
-        builder.flexibleAppend(String("0123456789"));
-        expectBuilderContent("0123456789", builder);
-        builder.flexibleAppend("abcd");
-        expectBuilderContent("0123456789abcd", builder);
-        builder.flexibleAppend('e');
-        expectBuilderContent("0123456789abcde", builder);
-        builder.flexibleAppend("");
-        expectBuilderContent("0123456789abcde", builder);
-    }
-
-    {
-        StringBuilder builder;
-        builder.flexibleAppend(String("0123456789"), "abcd", 'e', "");
-        expectBuilderContent("0123456789abcde", builder);
-        builder.flexibleAppend(String("A"), "B", 'C', "");
-        expectBuilderContent("0123456789abcdeABC", builder);
-    }
-}
-
</del><span class="cx"> TEST(StringBuilderTest, ToString)
</span><span class="cx"> {
</span><span class="cx">     StringBuilder builder;
</span></span></pre>
</div>
</div>

</body>
</html>