<!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>[198168] trunk</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/198168">198168</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-03-14 16:20:27 -0700 (Mon, 14 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Need to distinguish between Symbol() and Symbol("").
https://bugs.webkit.org/show_bug.cgi?id=155438
Reviewed by Saam Barati.
Source/JavaScriptCore:
* runtime/PrivateName.h:
(JSC::PrivateName::PrivateName):
Source/WTF:
While toString of both Symbol() and Symbol("") yields "Symbol()", Function.name
should yield "" and "[]" respectively. Hence, we need to tell between the two.
This functionality will be needed later in https://bugs.webkit.org/show_bug.cgi?id=155437.
We achieve this by creating another singleton instance like the empty StringImpl
as the null StringImpl. isNullSymbol() tests if the Stringimpl instance is a
symbol, and its substring is the null() singleton.
* wtf/text/StringImpl.cpp:
(WTF::StringImpl::createSymbol):
(WTF::StringImpl::createNullSymbol):
(WTF::StringImpl::containsOnlyWhitespace):
(WTF::StringImpl::createSymbolEmpty): Deleted.
* wtf/text/StringImpl.h:
(WTF::StringImpl::tryCreateUninitialized):
(WTF::StringImpl::stringKind):
(WTF::StringImpl::isSymbol):
(WTF::StringImpl::isAtomic):
(WTF::StringImpl::isNullSymbol):
* wtf/text/StringStatics.cpp:
(WTF::StringImpl::null):
Tools:
* TestWebKitAPI/Tests/WTF/StringImpl.cpp:
(TestWebKitAPI::TEST):
- Test that the a symbol with an empty string is not equivalent to a null symbol. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimePrivateNameh">trunk/Source/JavaScriptCore/runtime/PrivateName.h</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextStringImplcpp">trunk/Source/WTF/wtf/text/StringImpl.cpp</a></li>
<li><a href="#trunkSourceWTFwtftextStringImplh">trunk/Source/WTF/wtf/text/StringImpl.h</a></li>
<li><a href="#trunkSourceWTFwtftextStringStaticscpp">trunk/Source/WTF/wtf/text/StringStatics.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFStringImplcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/StringImpl.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (198167 => 198168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-14 23:14:15 UTC (rev 198167)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-14 23:20:27 UTC (rev 198168)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-03-14 Mark Lam <mark.lam@apple.com>
+
+ Need to distinguish between Symbol() and Symbol("").
+ https://bugs.webkit.org/show_bug.cgi?id=155438
+
+ Reviewed by Saam Barati.
+
+ * runtime/PrivateName.h:
+ (JSC::PrivateName::PrivateName):
+
</ins><span class="cx"> 2016-03-14 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Temporarily disable the separated heap.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimePrivateNameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/PrivateName.h (198167 => 198168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/PrivateName.h 2016-03-14 23:14:15 UTC (rev 198167)
+++ trunk/Source/JavaScriptCore/runtime/PrivateName.h 2016-03-14 23:20:27 UTC (rev 198168)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> class PrivateName {
</span><span class="cx"> public:
</span><span class="cx"> PrivateName()
</span><del>- : m_uid(StringImpl::createSymbolEmpty())
</del><ins>+ : m_uid(StringImpl::createNullSymbol())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (198167 => 198168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-03-14 23:14:15 UTC (rev 198167)
+++ trunk/Source/WTF/ChangeLog 2016-03-14 23:20:27 UTC (rev 198168)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-03-14 Mark Lam <mark.lam@apple.com>
+
+ Need to distinguish between Symbol() and Symbol("").
+ https://bugs.webkit.org/show_bug.cgi?id=155438
+
+ Reviewed by Saam Barati.
+
+ While toString of both Symbol() and Symbol("") yields "Symbol()", Function.name
+ should yield "" and "[]" respectively. Hence, we need to tell between the two.
+ This functionality will be needed later in https://bugs.webkit.org/show_bug.cgi?id=155437.
+
+ We achieve this by creating another singleton instance like the empty StringImpl
+ as the null StringImpl. isNullSymbol() tests if the Stringimpl instance is a
+ symbol, and its substring is the null() singleton.
+
+ * wtf/text/StringImpl.cpp:
+ (WTF::StringImpl::createSymbol):
+ (WTF::StringImpl::createNullSymbol):
+ (WTF::StringImpl::containsOnlyWhitespace):
+ (WTF::StringImpl::createSymbolEmpty): Deleted.
+ * wtf/text/StringImpl.h:
+ (WTF::StringImpl::tryCreateUninitialized):
+ (WTF::StringImpl::stringKind):
+ (WTF::StringImpl::isSymbol):
+ (WTF::StringImpl::isAtomic):
+ (WTF::StringImpl::isNullSymbol):
+ * wtf/text/StringStatics.cpp:
+ (WTF::StringImpl::null):
+
</ins><span class="cx"> 2016-03-13 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE(ES6_TEMPLATE_LITERAL_SYNTAX) guards
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringImpl.cpp (198167 => 198168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringImpl.cpp 2016-03-14 23:14:15 UTC (rev 198167)
+++ trunk/Source/WTF/wtf/text/StringImpl.cpp 2016-03-14 23:20:27 UTC (rev 198168)
</span><span class="lines">@@ -306,9 +306,9 @@
</span><span class="cx"> return adoptRef(static_cast<SymbolImpl&>(*new (NotNull, stringImpl) StringImpl(CreateSymbol, rep->m_data16, rep->length(), ownerRep)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<SymbolImpl> StringImpl::createSymbolEmpty()
</del><ins>+Ref<SymbolImpl> StringImpl::createNullSymbol()
</ins><span class="cx"> {
</span><del>- return createSymbol(empty());
</del><ins>+ return createSymbol(null());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool StringImpl::containsOnlyWhitespace()
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringImpl.h (198167 => 198168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringImpl.h 2016-03-14 23:14:15 UTC (rev 198167)
+++ trunk/Source/WTF/wtf/text/StringImpl.h 2016-03-14 23:20:27 UTC (rev 198168)
</span><span class="lines">@@ -408,7 +408,7 @@
</span><span class="cx"> return constructInternal<T>(resultImpl, length);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- WTF_EXPORT_STRING_API static Ref<SymbolImpl> createSymbolEmpty();
</del><ins>+ WTF_EXPORT_STRING_API static Ref<SymbolImpl> createNullSymbol();
</ins><span class="cx"> WTF_EXPORT_STRING_API static Ref<SymbolImpl> createSymbol(PassRefPtr<StringImpl> rep);
</span><span class="cx">
</span><span class="cx"> // Reallocate the StringImpl. The originalString must be only owned by the PassRefPtr,
</span><span class="lines">@@ -484,6 +484,7 @@
</span><span class="cx"> StringKind stringKind() const { return static_cast<StringKind>(m_hashAndFlags & s_hashMaskStringKind); }
</span><span class="cx"> bool isSymbol() const { return m_hashAndFlags & s_hashFlagStringKindIsSymbol; }
</span><span class="cx"> bool isAtomic() const { return m_hashAndFlags & s_hashFlagStringKindIsAtomic; }
</span><ins>+ bool isNullSymbol() const { return isSymbol() && (substringBuffer() == null()); }
</ins><span class="cx">
</span><span class="cx"> void setIsAtomic(bool isAtomic)
</span><span class="cx"> {
</span><span class="lines">@@ -863,6 +864,7 @@
</span><span class="cx"> template <typename CharType> static Ref<StringImpl> createInternal(const CharType*, unsigned);
</span><span class="cx"> WTF_EXPORT_PRIVATE NEVER_INLINE unsigned hashSlowCase() const;
</span><span class="cx"> WTF_EXPORT_PRIVATE static unsigned nextHashForSymbol();
</span><ins>+ WTF_EXPORT_PRIVATE static StringImpl* null();
</ins><span class="cx">
</span><span class="cx"> // The bottom bit in the ref count indicates a static (immortal) string.
</span><span class="cx"> static const unsigned s_refCountFlagIsStaticString = 0x1;
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringStaticscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringStatics.cpp (198167 => 198168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringStatics.cpp 2016-03-14 23:14:15 UTC (rev 198167)
+++ trunk/Source/WTF/wtf/text/StringStatics.cpp 2016-03-14 23:20:27 UTC (rev 198168)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010 Apple Inc. All Rights Reserved.
</del><ins>+ * Copyright (C) 2010, 2016 Apple Inc. All Rights Reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -41,6 +41,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><ins>+StringImpl* StringImpl::null()
+{
+ static NeverDestroyed<StringImpl> nullString(ConstructEmptyString);
+ return &nullString.get();
+}
+
</ins><span class="cx"> StringImpl* StringImpl::empty()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<StringImpl> emptyString(ConstructEmptyString);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (198167 => 198168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-03-14 23:14:15 UTC (rev 198167)
+++ trunk/Tools/ChangeLog 2016-03-14 23:20:27 UTC (rev 198168)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-03-14 Mark Lam <mark.lam@apple.com>
+
+ Need to distinguish between Symbol() and Symbol("").
+ https://bugs.webkit.org/show_bug.cgi?id=155438
+
+ Reviewed by Saam Barati.
+
+ * TestWebKitAPI/Tests/WTF/StringImpl.cpp:
+ (TestWebKitAPI::TEST):
+ - Test that the a symbol with an empty string is not equivalent to a null symbol.
+
</ins><span class="cx"> 2016-03-14 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove blank lines after #include "config.h"
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFStringImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/StringImpl.cpp (198167 => 198168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/StringImpl.cpp 2016-03-14 23:14:15 UTC (rev 198167)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/StringImpl.cpp 2016-03-14 23:20:27 UTC (rev 198168)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -513,10 +513,11 @@
</span><span class="cx"> ASSERT_FALSE(empty->endsWithIgnoringASCIICase(*reference.get()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TEST(WTF, StringImplCreateSymbolEmpty)
</del><ins>+TEST(WTF, StringImplCreateNullSymbol)
</ins><span class="cx"> {
</span><del>- RefPtr<StringImpl> reference = StringImpl::createSymbolEmpty();
</del><ins>+ RefPtr<StringImpl> reference = StringImpl::createNullSymbol();
</ins><span class="cx"> ASSERT_TRUE(reference->isSymbol());
</span><ins>+ ASSERT_TRUE(reference->isNullSymbol());
</ins><span class="cx"> ASSERT_FALSE(reference->isAtomic());
</span><span class="cx"> ASSERT_EQ(0u, reference->length());
</span><span class="cx"> ASSERT_TRUE(equal(reference.get(), ""));
</span><span class="lines">@@ -527,11 +528,23 @@
</span><span class="cx"> RefPtr<StringImpl> original = stringFromUTF8("original");
</span><span class="cx"> RefPtr<StringImpl> reference = StringImpl::createSymbol(original);
</span><span class="cx"> ASSERT_TRUE(reference->isSymbol());
</span><ins>+ ASSERT_FALSE(reference->isNullSymbol());
</ins><span class="cx"> ASSERT_FALSE(reference->isAtomic());
</span><span class="cx"> ASSERT_FALSE(original->isSymbol());
</span><span class="cx"> ASSERT_FALSE(original->isAtomic());
</span><span class="cx"> ASSERT_EQ(original->length(), reference->length());
</span><span class="cx"> ASSERT_TRUE(equal(reference.get(), "original"));
</span><ins>+
+ RefPtr<StringImpl> empty = stringFromUTF8("");
+ RefPtr<StringImpl> emptyReference = StringImpl::createSymbol(empty);
+ ASSERT_TRUE(emptyReference->isSymbol());
+ ASSERT_FALSE(emptyReference->isNullSymbol());
+ ASSERT_FALSE(emptyReference->isAtomic());
+ ASSERT_FALSE(empty->isSymbol());
+ ASSERT_FALSE(empty->isNullSymbol());
+ ASSERT_TRUE(empty->isAtomic());
+ ASSERT_EQ(empty->length(), emptyReference->length());
+ ASSERT_TRUE(equal(emptyReference.get(), ""));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WTF, StringImplSymbolToAtomicString)
</span><span class="lines">@@ -548,9 +561,9 @@
</span><span class="cx"> ASSERT_FALSE(reference->isAtomic());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TEST(WTF, StringImplSymbolEmptyToAtomicString)
</del><ins>+TEST(WTF, StringImplNullSymbolToAtomicString)
</ins><span class="cx"> {
</span><del>- RefPtr<StringImpl> reference = StringImpl::createSymbolEmpty();
</del><ins>+ RefPtr<StringImpl> reference = StringImpl::createNullSymbol();
</ins><span class="cx"> ASSERT_TRUE(reference->isSymbol());
</span><span class="cx"> ASSERT_FALSE(reference->isAtomic());
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>