<!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>[245332] branches/safari-607.2.1.2-branch</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/245332">245332</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2019-05-15 11:20:49 -0700 (Wed, 15 May 2019)</dd>
</dl>

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

    [JSC] We should check OOM for description string of Symbol
    https://bugs.webkit.org/show_bug.cgi?id=197634

    Reviewed by Keith Miller.

    JSTests:

    * stress/check-symbol-description-oom.js: Added.
    (shouldThrow):

    Source/JavaScriptCore:

    When resoling JSString for description of Symbol, we should check OOM error.
    We also change JSValueMakeSymbol(..., nullptr) to returning a symbol value
    without description, (1) to simplify the code and (2) give a way for JSC API
    to create a symbol value without description.

    * API/JSValueRef.cpp:
    (JSValueMakeSymbol):
    * API/tests/testapi.cpp:
    (TestAPI::symbolsTypeof):
    (TestAPI::symbolsDescription):
    (testCAPIViaCpp):
    * dfg/DFGOperations.cpp:
    * runtime/Symbol.cpp:
    (JSC::Symbol::createWithDescription):
    * runtime/Symbol.h:
    * runtime/SymbolConstructor.cpp:
    (JSC::callSymbol):

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

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari607212branchJSTestsChangeLog">branches/safari-607.2.1.2-branch/JSTests/ChangeLog</a></li>
<li><a href="#branchessafari607212branchSourceJavaScriptCoreAPIJSValueRefcpp">branches/safari-607.2.1.2-branch/Source/JavaScriptCore/API/JSValueRef.cpp</a></li>
<li><a href="#branchessafari607212branchSourceJavaScriptCoreAPIteststestapicpp">branches/safari-607.2.1.2-branch/Source/JavaScriptCore/API/tests/testapi.cpp</a></li>
<li><a href="#branchessafari607212branchSourceJavaScriptCoreChangeLog">branches/safari-607.2.1.2-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari607212branchSourceJavaScriptCoredfgDFGOperationscpp">branches/safari-607.2.1.2-branch/Source/JavaScriptCore/dfg/DFGOperations.cpp</a></li>
<li><a href="#branchessafari607212branchSourceJavaScriptCoreruntimeSymbolcpp">branches/safari-607.2.1.2-branch/Source/JavaScriptCore/runtime/Symbol.cpp</a></li>
<li><a href="#branchessafari607212branchSourceJavaScriptCoreruntimeSymbolh">branches/safari-607.2.1.2-branch/Source/JavaScriptCore/runtime/Symbol.h</a></li>
<li><a href="#branchessafari607212branchSourceJavaScriptCoreruntimeSymbolConstructorcpp">branches/safari-607.2.1.2-branch/Source/JavaScriptCore/runtime/SymbolConstructor.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari607212branchJSTestsstresschecksymboldescriptionoomjs">branches/safari-607.2.1.2-branch/JSTests/stress/check-symbol-description-oom.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari607212branchJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-607.2.1.2-branch/JSTests/ChangeLog (245331 => 245332)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607.2.1.2-branch/JSTests/ChangeLog       2019-05-15 18:20:44 UTC (rev 245331)
+++ branches/safari-607.2.1.2-branch/JSTests/ChangeLog  2019-05-15 18:20:49 UTC (rev 245332)
</span><span class="lines">@@ -1,5 +1,51 @@
</span><span class="cx"> 2019-05-15  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r244996. rdar://problem/50754980
+
+    [JSC] We should check OOM for description string of Symbol
+    https://bugs.webkit.org/show_bug.cgi?id=197634
+    
+    Reviewed by Keith Miller.
+    
+    JSTests:
+    
+    * stress/check-symbol-description-oom.js: Added.
+    (shouldThrow):
+    
+    Source/JavaScriptCore:
+    
+    When resoling JSString for description of Symbol, we should check OOM error.
+    We also change JSValueMakeSymbol(..., nullptr) to returning a symbol value
+    without description, (1) to simplify the code and (2) give a way for JSC API
+    to create a symbol value without description.
+    
+    * API/JSValueRef.cpp:
+    (JSValueMakeSymbol):
+    * API/tests/testapi.cpp:
+    (TestAPI::symbolsTypeof):
+    (TestAPI::symbolsDescription):
+    (testCAPIViaCpp):
+    * dfg/DFGOperations.cpp:
+    * runtime/Symbol.cpp:
+    (JSC::Symbol::createWithDescription):
+    * runtime/Symbol.h:
+    * runtime/SymbolConstructor.cpp:
+    (JSC::callSymbol):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244996 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-05-06  Yusuke Suzuki  <ysuzuki@apple.com>
+
+            [JSC] We should check OOM for description string of Symbol
+            https://bugs.webkit.org/show_bug.cgi?id=197634
+
+            Reviewed by Keith Miller.
+
+            * stress/check-symbol-description-oom.js: Added.
+            (shouldThrow):
+
+2019-05-15  Alan Coon  <alancoon@apple.com>
+
</ins><span class="cx">         Cherry-pick r243948. rdar://problem/50754972
</span><span class="cx"> 
</span><span class="cx">     SIGSEGV in JSC::BytecodeGenerator::addStringConstant
</span></span></pre></div>
<a id="branchessafari607212branchJSTestsstresschecksymboldescriptionoomjs"></a>
<div class="addfile"><h4>Added: branches/safari-607.2.1.2-branch/JSTests/stress/check-symbol-description-oom.js (0 => 245332)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607.2.1.2-branch/JSTests/stress/check-symbol-description-oom.js                          (rev 0)
+++ branches/safari-607.2.1.2-branch/JSTests/stress/check-symbol-description-oom.js     2019-05-15 18:20:49 UTC (rev 245332)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+function shouldThrow(func, errorMessage) {
+    var errorThrown = false;
+    var error = null;
+    try {
+        func();
+    } catch (e) {
+        errorThrown = true;
+        error = e;
+    }
+    if (!errorThrown)
+        throw new Error('not thrown');
+    if (String(error) !== errorMessage)
+        throw new Error(`bad error: ${String(error)}`);
+}
+
+const s0 = (-1).toLocaleString();
+const s1 = s0.padEnd(2147483647, '  ');
+shouldThrow(() => Symbol(s1), `Error: Out of memory`);
</ins></span></pre></div>
<a id="branchessafari607212branchSourceJavaScriptCoreAPIJSValueRefcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-607.2.1.2-branch/Source/JavaScriptCore/API/JSValueRef.cpp (245331 => 245332)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607.2.1.2-branch/Source/JavaScriptCore/API/JSValueRef.cpp        2019-05-15 18:20:44 UTC (rev 245331)
+++ branches/safari-607.2.1.2-branch/Source/JavaScriptCore/API/JSValueRef.cpp   2019-05-15 18:20:49 UTC (rev 245332)
</span><span class="lines">@@ -330,13 +330,12 @@
</span><span class="cx">         return nullptr;
</span><span class="cx">     }
</span><span class="cx">     ExecState* exec = toJS(ctx);
</span><ins>+    VM& vm = exec->vm();
</ins><span class="cx">     JSLockHolder locker(exec);
</span><del>-    auto scope = DECLARE_CATCH_SCOPE(exec->vm());
</del><span class="cx"> 
</span><del>-    JSString* jsDescription = jsString(exec, description ? description->string() : String());
-    RETURN_IF_EXCEPTION(scope, nullptr);
-
-    return toRef(exec, Symbol::create(exec, jsDescription));
</del><ins>+    if (!description)
+        return toRef(exec, Symbol::create(vm));
+    return toRef(exec, Symbol::createWithDescription(vm, description->string()));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> JSValueRef JSValueMakeString(JSContextRef ctx, JSStringRef string)
</span></span></pre></div>
<a id="branchessafari607212branchSourceJavaScriptCoreAPIteststestapicpp"></a>
<div class="modfile"><h4>Modified: branches/safari-607.2.1.2-branch/Source/JavaScriptCore/API/tests/testapi.cpp (245331 => 245332)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607.2.1.2-branch/Source/JavaScriptCore/API/tests/testapi.cpp     2019-05-15 18:20:44 UTC (rev 245331)
+++ branches/safari-607.2.1.2-branch/Source/JavaScriptCore/API/tests/testapi.cpp        2019-05-15 18:20:49 UTC (rev 245332)
</span><span class="lines">@@ -129,6 +129,7 @@
</span><span class="cx"> 
</span><span class="cx">     void basicSymbol();
</span><span class="cx">     void symbolsTypeof();
</span><ins>+    void symbolsDescription();
</ins><span class="cx">     void symbolsGetPropertyForKey();
</span><span class="cx">     void symbolsSetPropertyForKey();
</span><span class="cx">     void symbolsHasPropertyForKey();
</span><span class="lines">@@ -267,6 +268,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static const char* isSymbolFunction = "(function isSymbol(symbol) { return typeof(symbol) === 'symbol'; })";
</span><ins>+static const char* getSymbolDescription = "(function getSymbolDescription(symbol) { return symbol.description; })";
</ins><span class="cx"> static const char* getFunction = "(function get(object, key) { return object[key]; })";
</span><span class="cx"> static const char* setFunction = "(function set(object, key, value) { object[key] = value; })";
</span><span class="cx"> 
</span><span class="lines">@@ -280,11 +282,32 @@
</span><span class="cx"> 
</span><span class="cx"> void TestAPI::symbolsTypeof()
</span><span class="cx"> {
</span><del>-    APIString description("dope");
-    JSValueRef symbol = JSValueMakeSymbol(context, description);
-    check(functionReturnsTrue(isSymbolFunction, symbol), "JSValueMakeSymbol makes a symbol value");
</del><ins>+    {
+        JSValueRef symbol = JSValueMakeSymbol(context, nullptr);
+        check(functionReturnsTrue(isSymbolFunction, symbol), "JSValueMakeSymbol makes a symbol value");
+    }
+    {
+        APIString description("dope");
+        JSValueRef symbol = JSValueMakeSymbol(context, description);
+        check(functionReturnsTrue(isSymbolFunction, symbol), "JSValueMakeSymbol makes a symbol value");
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void TestAPI::symbolsDescription()
+{
+    {
+        JSValueRef symbol = JSValueMakeSymbol(context, nullptr);
+        auto result = callFunction(getSymbolDescription, symbol);
+        check(JSValueIsStrictEqual(context, result.value(), JSValueMakeUndefined(context)), "JSValueMakeSymbol with nullptr description produces a symbol value without description");
+    }
+    {
+        APIString description("dope");
+        JSValueRef symbol = JSValueMakeSymbol(context, description);
+        auto result = callFunction(getSymbolDescription, symbol);
+        check(JSValueIsStrictEqual(context, result.value(), JSValueMakeString(context, description)), "JSValueMakeSymbol with description string produces a symbol value with description");
+    }
+}
+
</ins><span class="cx"> void TestAPI::symbolsGetPropertyForKey()
</span><span class="cx"> {
</span><span class="cx">     auto objects = interestingObjects();
</span><span class="lines">@@ -494,6 +517,7 @@
</span><span class="cx"> 
</span><span class="cx">     RUN(basicSymbol());
</span><span class="cx">     RUN(symbolsTypeof());
</span><ins>+    RUN(symbolsDescription());
</ins><span class="cx">     RUN(symbolsGetPropertyForKey());
</span><span class="cx">     RUN(symbolsSetPropertyForKey());
</span><span class="cx">     RUN(symbolsHasPropertyForKey());
</span></span></pre></div>
<a id="branchessafari607212branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-607.2.1.2-branch/Source/JavaScriptCore/ChangeLog (245331 => 245332)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607.2.1.2-branch/Source/JavaScriptCore/ChangeLog 2019-05-15 18:20:44 UTC (rev 245331)
+++ branches/safari-607.2.1.2-branch/Source/JavaScriptCore/ChangeLog    2019-05-15 18:20:49 UTC (rev 245332)
</span><span class="lines">@@ -1,5 +1,66 @@
</span><span class="cx"> 2019-05-15  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r244996. rdar://problem/50754980
+
+    [JSC] We should check OOM for description string of Symbol
+    https://bugs.webkit.org/show_bug.cgi?id=197634
+    
+    Reviewed by Keith Miller.
+    
+    JSTests:
+    
+    * stress/check-symbol-description-oom.js: Added.
+    (shouldThrow):
+    
+    Source/JavaScriptCore:
+    
+    When resoling JSString for description of Symbol, we should check OOM error.
+    We also change JSValueMakeSymbol(..., nullptr) to returning a symbol value
+    without description, (1) to simplify the code and (2) give a way for JSC API
+    to create a symbol value without description.
+    
+    * API/JSValueRef.cpp:
+    (JSValueMakeSymbol):
+    * API/tests/testapi.cpp:
+    (TestAPI::symbolsTypeof):
+    (TestAPI::symbolsDescription):
+    (testCAPIViaCpp):
+    * dfg/DFGOperations.cpp:
+    * runtime/Symbol.cpp:
+    (JSC::Symbol::createWithDescription):
+    * runtime/Symbol.h:
+    * runtime/SymbolConstructor.cpp:
+    (JSC::callSymbol):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244996 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-05-06  Yusuke Suzuki  <ysuzuki@apple.com>
+
+            [JSC] We should check OOM for description string of Symbol
+            https://bugs.webkit.org/show_bug.cgi?id=197634
+
+            Reviewed by Keith Miller.
+
+            When resoling JSString for description of Symbol, we should check OOM error.
+            We also change JSValueMakeSymbol(..., nullptr) to returning a symbol value
+            without description, (1) to simplify the code and (2) give a way for JSC API
+            to create a symbol value without description.
+
+            * API/JSValueRef.cpp:
+            (JSValueMakeSymbol):
+            * API/tests/testapi.cpp:
+            (TestAPI::symbolsTypeof):
+            (TestAPI::symbolsDescription):
+            (testCAPIViaCpp):
+            * dfg/DFGOperations.cpp:
+            * runtime/Symbol.cpp:
+            (JSC::Symbol::createWithDescription):
+            * runtime/Symbol.h:
+            * runtime/SymbolConstructor.cpp:
+            (JSC::callSymbol):
+
+2019-05-15  Alan Coon  <alancoon@apple.com>
+
</ins><span class="cx">         Cherry-pick r243948. rdar://problem/50754972
</span><span class="cx"> 
</span><span class="cx">     SIGSEGV in JSC::BytecodeGenerator::addStringConstant
</span></span></pre></div>
<a id="branchessafari607212branchSourceJavaScriptCoredfgDFGOperationscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-607.2.1.2-branch/Source/JavaScriptCore/dfg/DFGOperations.cpp (245331 => 245332)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607.2.1.2-branch/Source/JavaScriptCore/dfg/DFGOperations.cpp     2019-05-15 18:20:44 UTC (rev 245331)
+++ branches/safari-607.2.1.2-branch/Source/JavaScriptCore/dfg/DFGOperations.cpp        2019-05-15 18:20:49 UTC (rev 245332)
</span><span class="lines">@@ -2272,8 +2272,12 @@
</span><span class="cx"> {
</span><span class="cx">     VM& vm = exec->vm();
</span><span class="cx">     NativeCallFrameTracer tracer(&vm, exec);
</span><ins>+    auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> 
</span><del>-    return Symbol::create(exec, description);
</del><ins>+    String string = description->value(exec);
+    RETURN_IF_EXCEPTION(scope, nullptr);
+
+    return Symbol::createWithDescription(vm, string);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> JSCell* JIT_OPERATION operationNewStringObject(ExecState* exec, JSString* string, Structure* structure)
</span></span></pre></div>
<a id="branchessafari607212branchSourceJavaScriptCoreruntimeSymbolcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-607.2.1.2-branch/Source/JavaScriptCore/runtime/Symbol.cpp (245331 => 245332)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607.2.1.2-branch/Source/JavaScriptCore/runtime/Symbol.cpp        2019-05-15 18:20:44 UTC (rev 245331)
+++ branches/safari-607.2.1.2-branch/Source/JavaScriptCore/runtime/Symbol.cpp   2019-05-15 18:20:49 UTC (rev 245332)
</span><span class="lines">@@ -116,11 +116,9 @@
</span><span class="cx">     return symbol;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-Symbol* Symbol::create(ExecState* exec, JSString* description)
</del><ins>+Symbol* Symbol::createWithDescription(VM& vm, const String& description)
</ins><span class="cx"> {
</span><del>-    VM& vm = exec->vm();
-    String desc = description->value(exec);
-    Symbol* symbol = new (NotNull, allocateCell<Symbol>(vm.heap)) Symbol(vm, desc);
</del><ins>+    Symbol* symbol = new (NotNull, allocateCell<Symbol>(vm.heap)) Symbol(vm, description);
</ins><span class="cx">     symbol->finishCreation(vm);
</span><span class="cx">     return symbol;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari607212branchSourceJavaScriptCoreruntimeSymbolh"></a>
<div class="modfile"><h4>Modified: branches/safari-607.2.1.2-branch/Source/JavaScriptCore/runtime/Symbol.h (245331 => 245332)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607.2.1.2-branch/Source/JavaScriptCore/runtime/Symbol.h  2019-05-15 18:20:44 UTC (rev 245331)
+++ branches/safari-607.2.1.2-branch/Source/JavaScriptCore/runtime/Symbol.h     2019-05-15 18:20:49 UTC (rev 245332)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     static Symbol* create(VM&);
</span><del>-    static Symbol* create(ExecState*, JSString* description);
</del><ins>+    static Symbol* createWithDescription(VM&, const String&);
</ins><span class="cx">     JS_EXPORT_PRIVATE static Symbol* create(VM&, SymbolImpl& uid);
</span><span class="cx"> 
</span><span class="cx">     const PrivateName& privateName() const { return m_privateName; }
</span></span></pre></div>
<a id="branchessafari607212branchSourceJavaScriptCoreruntimeSymbolConstructorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-607.2.1.2-branch/Source/JavaScriptCore/runtime/SymbolConstructor.cpp (245331 => 245332)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607.2.1.2-branch/Source/JavaScriptCore/runtime/SymbolConstructor.cpp     2019-05-15 18:20:44 UTC (rev 245331)
+++ branches/safari-607.2.1.2-branch/Source/JavaScriptCore/runtime/SymbolConstructor.cpp        2019-05-15 18:20:49 UTC (rev 245332)
</span><span class="lines">@@ -79,10 +79,16 @@
</span><span class="cx"> 
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL callSymbol(ExecState* exec)
</span><span class="cx"> {
</span><ins>+    VM& vm = exec->vm();
+    auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx">     JSValue description = exec->argument(0);
</span><span class="cx">     if (description.isUndefined())
</span><del>-        return JSValue::encode(Symbol::create(exec->vm()));
-    return JSValue::encode(Symbol::create(exec, description.toString(exec)));
</del><ins>+        return JSValue::encode(Symbol::create(vm));
+
+    String string = description.toWTFString(exec);
+    RETURN_IF_EXCEPTION(scope, { });
+    return JSValue::encode(Symbol::createWithDescription(vm, string));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL symbolConstructorFor(ExecState* exec)
</span></span></pre>
</div>
</div>

</body>
</html>