<!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>[176583] trunk/Source/JavaScriptCore</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/176583">176583</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-11-29 16:06:58 -0800 (Sat, 29 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>PropertyTable keys should be AtomicStringImpl.
<https://webkit.org/b/139096>
Reviewed by Sam Weinig.
Since PropertyTable keys are really always Identifiers, switch the key
type from StringImpl* to AtomicStringImpl*.
We have code in the GetByVal opcode implementations that assumes things
about this, so this change adds confidence to those algorithms.
* bytecode/ComplexGetStatus.cpp:
(JSC::ComplexGetStatus::computeFor):
* bytecode/ComplexGetStatus.h:
* bytecode/GetByIdStatus.cpp:
(JSC::GetByIdStatus::computeFromLLInt):
(JSC::GetByIdStatus::computeFor):
(JSC::GetByIdStatus::computeForStubInfo):
* bytecode/GetByIdStatus.h:
* bytecode/PutByIdStatus.cpp:
(JSC::PutByIdStatus::computeFromLLInt):
(JSC::PutByIdStatus::computeFor):
(JSC::PutByIdStatus::computeForStubInfo):
* bytecode/PutByIdStatus.h:
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::parseBlock):
(JSC::DFG::ByteCodeParser::InlineStackEntry::InlineStackEntry):
* dfg/DFGDesiredIdentifiers.cpp:
(JSC::DFG::DesiredIdentifiers::addLazily):
(JSC::DFG::DesiredIdentifiers::at):
* dfg/DFGDesiredIdentifiers.h:
(JSC::DFG::DesiredIdentifiers::operator[]):
* dfg/DFGFixupPhase.cpp:
(JSC::DFG::FixupPhase::isStringPrototypeMethodSane):
* runtime/Identifier.h:
(JSC::Identifier::impl):
* runtime/IntendedStructureChain.cpp:
(JSC::IntendedStructureChain::mayInterceptStoreTo):
* runtime/IntendedStructureChain.h:
* runtime/PropertyMapHashTable.h:
* runtime/Structure.cpp:
(JSC::StructureTransitionTable::contains):
(JSC::StructureTransitionTable::get):
(JSC::Structure::addPropertyTransitionToExistingStructureImpl):
(JSC::Structure::addPropertyTransitionToExistingStructureConcurrently):
(JSC::Structure::getConcurrently):
(JSC::Structure::add):
(JSC::Structure::remove):
* runtime/Structure.h:
(JSC::PropertyMapEntry::PropertyMapEntry):
* runtime/StructureInlines.h:
(JSC::Structure::getConcurrently):
* runtime/StructureTransitionTable.h:
(JSC::StructureTransitionTable::Hash::hash):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeComplexGetStatuscpp">trunk/Source/JavaScriptCore/bytecode/ComplexGetStatus.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeComplexGetStatush">trunk/Source/JavaScriptCore/bytecode/ComplexGetStatus.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeGetByIdStatuscpp">trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeGetByIdStatush">trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodePutByIdStatuscpp">trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodePutByIdStatush">trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp">trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGDesiredIdentifierscpp">trunk/Source/JavaScriptCore/dfg/DFGDesiredIdentifiers.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGDesiredIdentifiersh">trunk/Source/JavaScriptCore/dfg/DFGDesiredIdentifiers.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGFixupPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIdentifierh">trunk/Source/JavaScriptCore/runtime/Identifier.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntendedStructureChaincpp">trunk/Source/JavaScriptCore/runtime/IntendedStructureChain.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntendedStructureChainh">trunk/Source/JavaScriptCore/runtime/IntendedStructureChain.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimePropertyMapHashTableh">trunk/Source/JavaScriptCore/runtime/PropertyMapHashTable.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStructurecpp">trunk/Source/JavaScriptCore/runtime/Structure.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStructureh">trunk/Source/JavaScriptCore/runtime/Structure.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStructureInlinesh">trunk/Source/JavaScriptCore/runtime/StructureInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStructureTransitionTableh">trunk/Source/JavaScriptCore/runtime/StructureTransitionTable.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (176582 => 176583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-11-29 23:40:30 UTC (rev 176582)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-11-30 00:06:58 UTC (rev 176583)
</span><span class="lines">@@ -1,3 +1,60 @@
</span><ins>+2014-11-29 Andreas Kling <akling@apple.com>
+
+ PropertyTable keys should be AtomicStringImpl.
+ <https://webkit.org/b/139096>
+
+ Reviewed by Sam Weinig.
+
+ Since PropertyTable keys are really always Identifiers, switch the key
+ type from StringImpl* to AtomicStringImpl*.
+
+ We have code in the GetByVal opcode implementations that assumes things
+ about this, so this change adds confidence to those algorithms.
+
+ * bytecode/ComplexGetStatus.cpp:
+ (JSC::ComplexGetStatus::computeFor):
+ * bytecode/ComplexGetStatus.h:
+ * bytecode/GetByIdStatus.cpp:
+ (JSC::GetByIdStatus::computeFromLLInt):
+ (JSC::GetByIdStatus::computeFor):
+ (JSC::GetByIdStatus::computeForStubInfo):
+ * bytecode/GetByIdStatus.h:
+ * bytecode/PutByIdStatus.cpp:
+ (JSC::PutByIdStatus::computeFromLLInt):
+ (JSC::PutByIdStatus::computeFor):
+ (JSC::PutByIdStatus::computeForStubInfo):
+ * bytecode/PutByIdStatus.h:
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::parseBlock):
+ (JSC::DFG::ByteCodeParser::InlineStackEntry::InlineStackEntry):
+ * dfg/DFGDesiredIdentifiers.cpp:
+ (JSC::DFG::DesiredIdentifiers::addLazily):
+ (JSC::DFG::DesiredIdentifiers::at):
+ * dfg/DFGDesiredIdentifiers.h:
+ (JSC::DFG::DesiredIdentifiers::operator[]):
+ * dfg/DFGFixupPhase.cpp:
+ (JSC::DFG::FixupPhase::isStringPrototypeMethodSane):
+ * runtime/Identifier.h:
+ (JSC::Identifier::impl):
+ * runtime/IntendedStructureChain.cpp:
+ (JSC::IntendedStructureChain::mayInterceptStoreTo):
+ * runtime/IntendedStructureChain.h:
+ * runtime/PropertyMapHashTable.h:
+ * runtime/Structure.cpp:
+ (JSC::StructureTransitionTable::contains):
+ (JSC::StructureTransitionTable::get):
+ (JSC::Structure::addPropertyTransitionToExistingStructureImpl):
+ (JSC::Structure::addPropertyTransitionToExistingStructureConcurrently):
+ (JSC::Structure::getConcurrently):
+ (JSC::Structure::add):
+ (JSC::Structure::remove):
+ * runtime/Structure.h:
+ (JSC::PropertyMapEntry::PropertyMapEntry):
+ * runtime/StructureInlines.h:
+ (JSC::Structure::getConcurrently):
+ * runtime/StructureTransitionTable.h:
+ (JSC::StructureTransitionTable::Hash::hash):
+
</ins><span class="cx"> 2014-11-28 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Use std::unique_ptr<>|make_unique<> in ftl, bytecode of JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeComplexGetStatuscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/ComplexGetStatus.cpp (176582 => 176583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/ComplexGetStatus.cpp 2014-11-29 23:40:30 UTC (rev 176582)
+++ trunk/Source/JavaScriptCore/bytecode/ComplexGetStatus.cpp 2014-11-30 00:06:58 UTC (rev 176583)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> ComplexGetStatus ComplexGetStatus::computeFor(
</span><span class="cx"> CodeBlock* profiledBlock, Structure* headStructure, StructureChain* chain,
</span><del>- unsigned chainCount, StringImpl* uid)
</del><ins>+ unsigned chainCount, AtomicStringImpl* uid)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: We should assert that we never see a structure that
</span><span class="cx"> // hasImpureGetOwnPropertySlot() but for which we don't
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeComplexGetStatush"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/ComplexGetStatus.h (176582 => 176583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/ComplexGetStatus.h 2014-11-29 23:40:30 UTC (rev 176582)
+++ trunk/Source/JavaScriptCore/bytecode/ComplexGetStatus.h 2014-11-30 00:06:58 UTC (rev 176583)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx">
</span><span class="cx"> static ComplexGetStatus computeFor(
</span><span class="cx"> CodeBlock* profiledBlock, Structure* headStructure, StructureChain* chain,
</span><del>- unsigned chainCount, StringImpl* uid);
</del><ins>+ unsigned chainCount, AtomicStringImpl* uid);
</ins><span class="cx">
</span><span class="cx"> Kind kind() const { return m_kind; }
</span><span class="cx"> unsigned attributes() const { return m_attributes; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeGetByIdStatuscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp (176582 => 176583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp 2014-11-29 23:40:30 UTC (rev 176582)
+++ trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp 2014-11-30 00:06:58 UTC (rev 176583)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-GetByIdStatus GetByIdStatus::computeFromLLInt(CodeBlock* profiledBlock, unsigned bytecodeIndex, StringImpl* uid)
</del><ins>+GetByIdStatus GetByIdStatus::computeFromLLInt(CodeBlock* profiledBlock, unsigned bytecodeIndex, AtomicStringImpl* uid)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(profiledBlock);
</span><span class="cx"> UNUSED_PARAM(bytecodeIndex);
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> return GetByIdStatus(Simple, false, GetByIdVariant(StructureSet(structure), offset));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-GetByIdStatus GetByIdStatus::computeFor(CodeBlock* profiledBlock, StubInfoMap& map, unsigned bytecodeIndex, StringImpl* uid)
</del><ins>+GetByIdStatus GetByIdStatus::computeFor(CodeBlock* profiledBlock, StubInfoMap& map, unsigned bytecodeIndex, AtomicStringImpl* uid)
</ins><span class="cx"> {
</span><span class="cx"> ConcurrentJITLocker locker(profiledBlock->m_lock);
</span><span class="cx">
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(JIT)
</span><span class="cx"> GetByIdStatus GetByIdStatus::computeForStubInfo(
</span><del>- const ConcurrentJITLocker& locker, CodeBlock* profiledBlock, StructureStubInfo* stubInfo, StringImpl* uid,
</del><ins>+ const ConcurrentJITLocker& locker, CodeBlock* profiledBlock, StructureStubInfo* stubInfo, AtomicStringImpl* uid,
</ins><span class="cx"> CallLinkStatus::ExitSiteData callExitSiteData)
</span><span class="cx"> {
</span><span class="cx"> if (!stubInfo || !stubInfo->seen)
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx">
</span><span class="cx"> GetByIdStatus GetByIdStatus::computeFor(
</span><span class="cx"> CodeBlock* profiledBlock, CodeBlock* dfgBlock, StubInfoMap& baselineMap,
</span><del>- StubInfoMap& dfgMap, CodeOrigin codeOrigin, StringImpl* uid)
</del><ins>+ StubInfoMap& dfgMap, CodeOrigin codeOrigin, AtomicStringImpl* uid)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx"> if (dfgBlock) {
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx"> return computeFor(profiledBlock, baselineMap, codeOrigin.bytecodeIndex, uid);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-GetByIdStatus GetByIdStatus::computeFor(const StructureSet& set, StringImpl* uid)
</del><ins>+GetByIdStatus GetByIdStatus::computeFor(const StructureSet& set, AtomicStringImpl* uid)
</ins><span class="cx"> {
</span><span class="cx"> // For now we only handle the super simple self access case. We could handle the
</span><span class="cx"> // prototype case in the future.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeGetByIdStatush"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.h (176582 => 176583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.h 2014-11-29 23:40:30 UTC (rev 176582)
+++ trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.h 2014-11-30 00:06:58 UTC (rev 176583)
</span><span class="lines">@@ -67,10 +67,10 @@
</span><span class="cx"> m_variants.append(variant);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static GetByIdStatus computeFor(CodeBlock*, StubInfoMap&, unsigned bytecodeIndex, StringImpl* uid);
- static GetByIdStatus computeFor(const StructureSet&, StringImpl* uid);
</del><ins>+ static GetByIdStatus computeFor(CodeBlock*, StubInfoMap&, unsigned bytecodeIndex, AtomicStringImpl* uid);
+ static GetByIdStatus computeFor(const StructureSet&, AtomicStringImpl* uid);
</ins><span class="cx">
</span><del>- static GetByIdStatus computeFor(CodeBlock* baselineBlock, CodeBlock* dfgBlock, StubInfoMap& baselineMap, StubInfoMap& dfgMap, CodeOrigin, StringImpl* uid);
</del><ins>+ static GetByIdStatus computeFor(CodeBlock* baselineBlock, CodeBlock* dfgBlock, StubInfoMap& baselineMap, StubInfoMap& dfgMap, CodeOrigin, AtomicStringImpl* uid);
</ins><span class="cx">
</span><span class="cx"> State state() const { return m_state; }
</span><span class="cx">
</span><span class="lines">@@ -97,9 +97,9 @@
</span><span class="cx"> #if ENABLE(JIT)
</span><span class="cx"> static GetByIdStatus computeForStubInfo(
</span><span class="cx"> const ConcurrentJITLocker&, CodeBlock* profiledBlock, StructureStubInfo*,
</span><del>- StringImpl* uid, CallLinkStatus::ExitSiteData);
</del><ins>+ AtomicStringImpl* uid, CallLinkStatus::ExitSiteData);
</ins><span class="cx"> #endif
</span><del>- static GetByIdStatus computeFromLLInt(CodeBlock*, unsigned bytecodeIndex, StringImpl* uid);
</del><ins>+ static GetByIdStatus computeFromLLInt(CodeBlock*, unsigned bytecodeIndex, AtomicStringImpl* uid);
</ins><span class="cx">
</span><span class="cx"> bool appendVariant(const GetByIdVariant&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodePutByIdStatuscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp (176582 => 176583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp 2014-11-29 23:40:30 UTC (rev 176582)
+++ trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp 2014-11-30 00:06:58 UTC (rev 176583)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-PutByIdStatus PutByIdStatus::computeFromLLInt(CodeBlock* profiledBlock, unsigned bytecodeIndex, StringImpl* uid)
</del><ins>+PutByIdStatus PutByIdStatus::computeFromLLInt(CodeBlock* profiledBlock, unsigned bytecodeIndex, AtomicStringImpl* uid)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(profiledBlock);
</span><span class="cx"> UNUSED_PARAM(bytecodeIndex);
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> return PutByIdVariant::transition(structure, newStructure, intendedChain.get(), offset);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PutByIdStatus PutByIdStatus::computeFor(CodeBlock* profiledBlock, StubInfoMap& map, unsigned bytecodeIndex, StringImpl* uid)
</del><ins>+PutByIdStatus PutByIdStatus::computeFor(CodeBlock* profiledBlock, StubInfoMap& map, unsigned bytecodeIndex, AtomicStringImpl* uid)
</ins><span class="cx"> {
</span><span class="cx"> ConcurrentJITLocker locker(profiledBlock->m_lock);
</span><span class="cx">
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> #if ENABLE(JIT)
</span><span class="cx"> PutByIdStatus PutByIdStatus::computeForStubInfo(
</span><span class="cx"> const ConcurrentJITLocker& locker, CodeBlock* profiledBlock, StructureStubInfo* stubInfo,
</span><del>- StringImpl* uid, CallLinkStatus::ExitSiteData callExitSiteData)
</del><ins>+ AtomicStringImpl* uid, CallLinkStatus::ExitSiteData callExitSiteData)
</ins><span class="cx"> {
</span><span class="cx"> if (!stubInfo || !stubInfo->seen)
</span><span class="cx"> return PutByIdStatus();
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-PutByIdStatus PutByIdStatus::computeFor(CodeBlock* baselineBlock, CodeBlock* dfgBlock, StubInfoMap& baselineMap, StubInfoMap& dfgMap, CodeOrigin codeOrigin, StringImpl* uid)
</del><ins>+PutByIdStatus PutByIdStatus::computeFor(CodeBlock* baselineBlock, CodeBlock* dfgBlock, StubInfoMap& baselineMap, StubInfoMap& dfgMap, CodeOrigin codeOrigin, AtomicStringImpl* uid)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx"> if (dfgBlock) {
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx"> return computeFor(baselineBlock, baselineMap, codeOrigin.bytecodeIndex, uid);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PutByIdStatus PutByIdStatus::computeFor(JSGlobalObject* globalObject, const StructureSet& set, StringImpl* uid, bool isDirect)
</del><ins>+PutByIdStatus PutByIdStatus::computeFor(JSGlobalObject* globalObject, const StructureSet& set, AtomicStringImpl* uid, bool isDirect)
</ins><span class="cx"> {
</span><span class="cx"> if (toUInt32FromStringImpl(uid) != PropertyName::NotAnIndex)
</span><span class="cx"> return PutByIdStatus(TakesSlowPath);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodePutByIdStatush"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.h (176582 => 176583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.h 2014-11-29 23:40:30 UTC (rev 176582)
+++ trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.h 2014-11-30 00:06:58 UTC (rev 176583)
</span><span class="lines">@@ -70,10 +70,10 @@
</span><span class="cx"> m_variants.append(variant);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static PutByIdStatus computeFor(CodeBlock*, StubInfoMap&, unsigned bytecodeIndex, StringImpl* uid);
- static PutByIdStatus computeFor(JSGlobalObject*, const StructureSet&, StringImpl* uid, bool isDirect);
</del><ins>+ static PutByIdStatus computeFor(CodeBlock*, StubInfoMap&, unsigned bytecodeIndex, AtomicStringImpl* uid);
+ static PutByIdStatus computeFor(JSGlobalObject*, const StructureSet&, AtomicStringImpl* uid, bool isDirect);
</ins><span class="cx">
</span><del>- static PutByIdStatus computeFor(CodeBlock* baselineBlock, CodeBlock* dfgBlock, StubInfoMap& baselineMap, StubInfoMap& dfgMap, CodeOrigin, StringImpl* uid);
</del><ins>+ static PutByIdStatus computeFor(CodeBlock* baselineBlock, CodeBlock* dfgBlock, StubInfoMap& baselineMap, StubInfoMap& dfgMap, CodeOrigin, AtomicStringImpl* uid);
</ins><span class="cx">
</span><span class="cx"> State state() const { return m_state; }
</span><span class="cx">
</span><span class="lines">@@ -96,10 +96,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(JIT)
</span><span class="cx"> static PutByIdStatus computeForStubInfo(
</span><del>- const ConcurrentJITLocker&, CodeBlock*, StructureStubInfo*, StringImpl* uid,
</del><ins>+ const ConcurrentJITLocker&, CodeBlock*, StructureStubInfo*, AtomicStringImpl* uid,
</ins><span class="cx"> CallLinkStatus::ExitSiteData);
</span><span class="cx"> #endif
</span><del>- static PutByIdStatus computeFromLLInt(CodeBlock*, unsigned bytecodeIndex, StringImpl* uid);
</del><ins>+ static PutByIdStatus computeFromLLInt(CodeBlock*, unsigned bytecodeIndex, AtomicStringImpl* uid);
</ins><span class="cx">
</span><span class="cx"> bool appendVariant(const PutByIdVariant&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (176582 => 176583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2014-11-29 23:40:30 UTC (rev 176582)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2014-11-30 00:06:58 UTC (rev 176583)
</span><span class="lines">@@ -2834,7 +2834,7 @@
</span><span class="cx"> Node* base = get(VirtualRegister(currentInstruction[2].u.operand));
</span><span class="cx"> unsigned identifierNumber = m_inlineStackTop->m_identifierRemap[currentInstruction[3].u.operand];
</span><span class="cx">
</span><del>- StringImpl* uid = m_graph.identifiers()[identifierNumber];
</del><ins>+ AtomicStringImpl* uid = m_graph.identifiers()[identifierNumber];
</ins><span class="cx"> GetByIdStatus getByIdStatus = GetByIdStatus::computeFor(
</span><span class="cx"> m_inlineStackTop->m_profiledBlock, m_dfgCodeBlock,
</span><span class="cx"> m_inlineStackTop->m_stubInfos, m_dfgStubInfos,
</span><span class="lines">@@ -3208,7 +3208,7 @@
</span><span class="cx"> int dst = currentInstruction[1].u.operand;
</span><span class="cx"> int scope = currentInstruction[2].u.operand;
</span><span class="cx"> unsigned identifierNumber = m_inlineStackTop->m_identifierRemap[currentInstruction[3].u.operand];
</span><del>- StringImpl* uid = m_graph.identifiers()[identifierNumber];
</del><ins>+ AtomicStringImpl* uid = m_graph.identifiers()[identifierNumber];
</ins><span class="cx"> ResolveType resolveType = ResolveModeAndType(currentInstruction[4].u.operand).type();
</span><span class="cx">
</span><span class="cx"> Structure* structure = 0;
</span><span class="lines">@@ -3297,7 +3297,7 @@
</span><span class="cx"> unsigned identifierNumber = m_inlineStackTop->m_identifierRemap[currentInstruction[2].u.operand];
</span><span class="cx"> unsigned value = currentInstruction[3].u.operand;
</span><span class="cx"> ResolveType resolveType = ResolveModeAndType(currentInstruction[4].u.operand).type();
</span><del>- StringImpl* uid = m_graph.identifiers()[identifierNumber];
</del><ins>+ AtomicStringImpl* uid = m_graph.identifiers()[identifierNumber];
</ins><span class="cx">
</span><span class="cx"> Structure* structure = 0;
</span><span class="cx"> VariableWatchpointSet* watchpoints = 0;
</span><span class="lines">@@ -3709,7 +3709,7 @@
</span><span class="cx"> m_switchRemap.resize(codeBlock->numberOfSwitchJumpTables());
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < codeBlock->numberOfIdentifiers(); ++i) {
</span><del>- StringImpl* rep = codeBlock->identifier(i).impl();
</del><ins>+ AtomicStringImpl* rep = codeBlock->identifier(i).impl();
</ins><span class="cx"> BorrowedIdentifierMap::AddResult result = byteCodeParser->m_identifierMap.add(rep, byteCodeParser->m_graph.identifiers().numberOfIdentifiers());
</span><span class="cx"> if (result.isNewEntry)
</span><span class="cx"> byteCodeParser->m_graph.identifiers().addLazily(rep);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGDesiredIdentifierscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGDesiredIdentifiers.cpp (176582 => 176583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGDesiredIdentifiers.cpp 2014-11-29 23:40:30 UTC (rev 176582)
+++ trunk/Source/JavaScriptCore/dfg/DFGDesiredIdentifiers.cpp 2014-11-30 00:06:58 UTC (rev 176583)
</span><span class="lines">@@ -52,14 +52,14 @@
</span><span class="cx"> return m_codeBlock->numberOfIdentifiers() + m_addedIdentifiers.size();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DesiredIdentifiers::addLazily(StringImpl* rep)
</del><ins>+void DesiredIdentifiers::addLazily(AtomicStringImpl* rep)
</ins><span class="cx"> {
</span><span class="cx"> m_addedIdentifiers.append(rep);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StringImpl* DesiredIdentifiers::at(unsigned index) const
</del><ins>+AtomicStringImpl* DesiredIdentifiers::at(unsigned index) const
</ins><span class="cx"> {
</span><del>- StringImpl* result;
</del><ins>+ AtomicStringImpl* result;
</ins><span class="cx"> if (index < m_codeBlock->numberOfIdentifiers())
</span><span class="cx"> result = m_codeBlock->identifier(index).impl();
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGDesiredIdentifiersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGDesiredIdentifiers.h (176582 => 176583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGDesiredIdentifiers.h 2014-11-29 23:40:30 UTC (rev 176582)
+++ trunk/Source/JavaScriptCore/dfg/DFGDesiredIdentifiers.h 2014-11-30 00:06:58 UTC (rev 176583)
</span><span class="lines">@@ -45,17 +45,17 @@
</span><span class="cx"> ~DesiredIdentifiers();
</span><span class="cx">
</span><span class="cx"> unsigned numberOfIdentifiers();
</span><del>- void addLazily(StringImpl*);
</del><ins>+ void addLazily(AtomicStringImpl*);
</ins><span class="cx">
</span><del>- StringImpl* at(unsigned index) const;
</del><ins>+ AtomicStringImpl* at(unsigned index) const;
</ins><span class="cx">
</span><del>- StringImpl* operator[](unsigned index) const { return at(index); }
</del><ins>+ AtomicStringImpl* operator[](unsigned index) const { return at(index); }
</ins><span class="cx">
</span><span class="cx"> void reallyAdd(VM&, CommonData*);
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> CodeBlock* m_codeBlock;
</span><del>- Vector<StringImpl*> m_addedIdentifiers;
</del><ins>+ Vector<AtomicStringImpl*> m_addedIdentifiers;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } } // namespace JSC::DFG
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGFixupPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp (176582 => 176583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2014-11-29 23:40:30 UTC (rev 176582)
+++ trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2014-11-30 00:06:58 UTC (rev 176583)
</span><span class="lines">@@ -1440,7 +1440,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool isStringPrototypeMethodSane(
</span><del>- JSObject* stringPrototype, Structure* stringPrototypeStructure, StringImpl* uid)
</del><ins>+ JSObject* stringPrototype, Structure* stringPrototypeStructure, AtomicStringImpl* uid)
</ins><span class="cx"> {
</span><span class="cx"> unsigned attributesUnused;
</span><span class="cx"> PropertyOffset offset =
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIdentifierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Identifier.h (176582 => 176583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Identifier.h 2014-11-29 23:40:30 UTC (rev 176582)
+++ trunk/Source/JavaScriptCore/runtime/Identifier.h 2014-11-30 00:06:58 UTC (rev 176583)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> Identifier(VM* vm, const String& s) : m_string(add(vm, s.impl())) { ASSERT(m_string.impl()->isAtomic()); }
</span><span class="cx">
</span><span class="cx"> const String& string() const { return m_string; }
</span><del>- StringImpl* impl() const { return m_string.impl(); }
</del><ins>+ AtomicStringImpl* impl() const { return static_cast<AtomicStringImpl*>(m_string.impl()); }
</ins><span class="cx">
</span><span class="cx"> int length() const { return m_string.length(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntendedStructureChaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntendedStructureChain.cpp (176582 => 176583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntendedStructureChain.cpp 2014-11-29 23:40:30 UTC (rev 176582)
+++ trunk/Source/JavaScriptCore/runtime/IntendedStructureChain.cpp 2014-11-30 00:06:58 UTC (rev 176583)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool IntendedStructureChain::mayInterceptStoreTo(StringImpl* uid)
</del><ins>+bool IntendedStructureChain::mayInterceptStoreTo(AtomicStringImpl* uid)
</ins><span class="cx"> {
</span><span class="cx"> for (unsigned i = 0; i < m_vector.size(); ++i) {
</span><span class="cx"> unsigned attributes;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntendedStructureChainh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntendedStructureChain.h (176582 => 176583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntendedStructureChain.h 2014-11-29 23:40:30 UTC (rev 176582)
+++ trunk/Source/JavaScriptCore/runtime/IntendedStructureChain.h 2014-11-30 00:06:58 UTC (rev 176583)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> bool isStillValid() const;
</span><span class="cx"> bool matches(StructureChain*) const;
</span><del>- bool mayInterceptStoreTo(StringImpl* uid);
</del><ins>+ bool mayInterceptStoreTo(AtomicStringImpl* uid);
</ins><span class="cx"> bool isNormalized();
</span><span class="cx">
</span><span class="cx"> bool takesSlowPathInDFGForImpureProperty();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimePropertyMapHashTableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/PropertyMapHashTable.h (176582 => 176583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/PropertyMapHashTable.h 2014-11-29 23:40:30 UTC (rev 176582)
+++ trunk/Source/JavaScriptCore/runtime/PropertyMapHashTable.h 2014-11-30 00:06:58 UTC (rev 176583)
</span><span class="lines">@@ -30,13 +30,13 @@
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><del>-#include <wtf/text/StringImpl.h>
</del><ins>+#include <wtf/text/AtomicStringImpl.h>
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> #define DUMP_PROPERTYMAP_STATS 0
</span><span class="cx"> #define DUMP_PROPERTYMAP_COLLISIONS 0
</span><span class="cx">
</span><del>-#define PROPERTY_MAP_DELETED_ENTRY_KEY ((StringImpl*)1)
</del><ins>+#define PROPERTY_MAP_DELETED_ENTRY_KEY ((AtomicStringImpl*)1)
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> return Structure::create(vm, globalObject, prototype, TypeInfo(CellType, StructureFlags), info());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- typedef StringImpl* KeyType;
</del><ins>+ typedef AtomicStringImpl* KeyType;
</ins><span class="cx"> typedef PropertyMapEntry ValueType;
</span><span class="cx">
</span><span class="cx"> // The in order iterator provides overloaded * and -> to access the Value at the current position.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStructurecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Structure.cpp (176582 => 176583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Structure.cpp 2014-11-29 23:40:30 UTC (rev 176582)
+++ trunk/Source/JavaScriptCore/runtime/Structure.cpp 2014-11-30 00:06:58 UTC (rev 176583)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> static HashSet<Structure*>& liveStructureSet = *(new HashSet<Structure*>);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-bool StructureTransitionTable::contains(StringImpl* rep, unsigned attributes) const
</del><ins>+bool StructureTransitionTable::contains(AtomicStringImpl* rep, unsigned attributes) const
</ins><span class="cx"> {
</span><span class="cx"> if (isUsingSingleSlot()) {
</span><span class="cx"> Structure* transition = singleTransition();
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> return map()->get(std::make_pair(rep, attributes));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Structure* StructureTransitionTable::get(StringImpl* rep, unsigned attributes) const
</del><ins>+inline Structure* StructureTransitionTable::get(AtomicStringImpl* rep, unsigned attributes) const
</ins><span class="cx"> {
</span><span class="cx"> if (isUsingSingleSlot()) {
</span><span class="cx"> Structure* transition = singleTransition();
</span><span class="lines">@@ -315,7 +315,7 @@
</span><span class="cx"> checkOffsetConsistency();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Structure* Structure::addPropertyTransitionToExistingStructureImpl(Structure* structure, StringImpl* uid, unsigned attributes, PropertyOffset& offset)
</del><ins>+Structure* Structure::addPropertyTransitionToExistingStructureImpl(Structure* structure, AtomicStringImpl* uid, unsigned attributes, PropertyOffset& offset)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!structure->isDictionary());
</span><span class="cx"> ASSERT(structure->isObject());
</span><span class="lines">@@ -335,7 +335,7 @@
</span><span class="cx"> return addPropertyTransitionToExistingStructureImpl(structure, propertyName.uid(), attributes, offset);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Structure* Structure::addPropertyTransitionToExistingStructureConcurrently(Structure* structure, StringImpl* uid, unsigned attributes, PropertyOffset& offset)
</del><ins>+Structure* Structure::addPropertyTransitionToExistingStructureConcurrently(Structure* structure, AtomicStringImpl* uid, unsigned attributes, PropertyOffset& offset)
</ins><span class="cx"> {
</span><span class="cx"> ConcurrentJITLocker locker(structure->m_lock);
</span><span class="cx"> return addPropertyTransitionToExistingStructureImpl(structure, uid, attributes, offset);
</span><span class="lines">@@ -850,7 +850,7 @@
</span><span class="cx"> return PropertyTable::create(vm, numberOfSlotsForLastOffset(m_offset, m_inlineCapacity));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PropertyOffset Structure::getConcurrently(StringImpl* uid, unsigned& attributes)
</del><ins>+PropertyOffset Structure::getConcurrently(AtomicStringImpl* uid, unsigned& attributes)
</ins><span class="cx"> {
</span><span class="cx"> PropertyOffset result = invalidOffset;
</span><span class="cx">
</span><span class="lines">@@ -890,7 +890,7 @@
</span><span class="cx"> if (attributes & DontEnum)
</span><span class="cx"> setHasNonEnumerableProperties(true);
</span><span class="cx">
</span><del>- StringImpl* rep = propertyName.uid();
</del><ins>+ AtomicStringImpl* rep = propertyName.uid();
</ins><span class="cx">
</span><span class="cx"> if (!propertyTable())
</span><span class="cx"> createPropertyMap(locker, vm);
</span><span class="lines">@@ -909,7 +909,7 @@
</span><span class="cx">
</span><span class="cx"> checkConsistency();
</span><span class="cx">
</span><del>- StringImpl* rep = propertyName.uid();
</del><ins>+ AtomicStringImpl* rep = propertyName.uid();
</ins><span class="cx">
</span><span class="cx"> if (!propertyTable())
</span><span class="cx"> return invalidOffset;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStructureh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Structure.h (176582 => 176583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Structure.h 2014-11-29 23:40:30 UTC (rev 176582)
+++ trunk/Source/JavaScriptCore/runtime/Structure.h 2014-11-30 00:06:58 UTC (rev 176583)
</span><span class="lines">@@ -48,9 +48,8 @@
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/PrintStream.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><del>-#include <wtf/text/StringImpl.h>
</del><ins>+#include <wtf/text/AtomicStringImpl.h>
</ins><span class="cx">
</span><del>-
</del><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> class DeferGC;
</span><span class="lines">@@ -74,7 +73,7 @@
</span><span class="cx"> static const unsigned outOfLineGrowthFactor = 2;
</span><span class="cx">
</span><span class="cx"> struct PropertyMapEntry {
</span><del>- StringImpl* key;
</del><ins>+ AtomicStringImpl* key;
</ins><span class="cx"> PropertyOffset offset;
</span><span class="cx"> unsigned attributes;
</span><span class="cx">
</span><span class="lines">@@ -85,7 +84,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- PropertyMapEntry(StringImpl* key, PropertyOffset offset, unsigned attributes)
</del><ins>+ PropertyMapEntry(AtomicStringImpl* key, PropertyOffset offset, unsigned attributes)
</ins><span class="cx"> : key(key)
</span><span class="cx"> , offset(offset)
</span><span class="cx"> , attributes(attributes)
</span><span class="lines">@@ -133,7 +132,7 @@
</span><span class="cx"> static void dumpStatistics();
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE static Structure* addPropertyTransition(VM&, Structure*, PropertyName, unsigned attributes, PropertyOffset&, PutPropertySlot::Context = PutPropertySlot::UnknownContext);
</span><del>- static Structure* addPropertyTransitionToExistingStructureConcurrently(Structure*, StringImpl* uid, unsigned attributes, PropertyOffset&);
</del><ins>+ static Structure* addPropertyTransitionToExistingStructureConcurrently(Structure*, AtomicStringImpl* uid, unsigned attributes, PropertyOffset&);
</ins><span class="cx"> JS_EXPORT_PRIVATE static Structure* addPropertyTransitionToExistingStructure(Structure*, PropertyName, unsigned attributes, PropertyOffset&);
</span><span class="cx"> static Structure* removePropertyTransition(VM&, Structure*, PropertyName, PropertyOffset&);
</span><span class="cx"> JS_EXPORT_PRIVATE static Structure* changePrototypeTransition(VM&, Structure*, JSValue prototype);
</span><span class="lines">@@ -289,8 +288,8 @@
</span><span class="cx"> template<typename Functor>
</span><span class="cx"> void forEachPropertyConcurrently(const Functor&);
</span><span class="cx">
</span><del>- PropertyOffset getConcurrently(StringImpl* uid);
- PropertyOffset getConcurrently(StringImpl* uid, unsigned& attributes);
</del><ins>+ PropertyOffset getConcurrently(AtomicStringImpl* uid);
+ PropertyOffset getConcurrently(AtomicStringImpl* uid, unsigned& attributes);
</ins><span class="cx">
</span><span class="cx"> Vector<PropertyMapEntry> getPropertiesConcurrently();
</span><span class="cx">
</span><span class="lines">@@ -486,7 +485,7 @@
</span><span class="cx">
</span><span class="cx"> static Structure* create(VM&, Structure*);
</span><span class="cx">
</span><del>- static Structure* addPropertyTransitionToExistingStructureImpl(Structure*, StringImpl* uid, unsigned attributes, PropertyOffset&);
</del><ins>+ static Structure* addPropertyTransitionToExistingStructureImpl(Structure*, AtomicStringImpl* uid, unsigned attributes, PropertyOffset&);
</ins><span class="cx">
</span><span class="cx"> // This will return the structure that has a usable property table, that property table,
</span><span class="cx"> // and the list of structures that we visited before we got to it. If it returns a
</span><span class="lines">@@ -594,7 +593,7 @@
</span><span class="cx">
</span><span class="cx"> WriteBarrier<JSCell> m_previousOrRareData;
</span><span class="cx">
</span><del>- RefPtr<StringImpl> m_nameInPrevious;
</del><ins>+ RefPtr<AtomicStringImpl> m_nameInPrevious;
</ins><span class="cx">
</span><span class="cx"> const ClassInfo* m_classInfo;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStructureInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StructureInlines.h (176582 => 176583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StructureInlines.h 2014-11-29 23:40:30 UTC (rev 176582)
+++ trunk/Source/JavaScriptCore/runtime/StructureInlines.h 2014-11-30 00:06:58 UTC (rev 176583)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline PropertyOffset Structure::getConcurrently(StringImpl* uid)
</del><ins>+inline PropertyOffset Structure::getConcurrently(AtomicStringImpl* uid)
</ins><span class="cx"> {
</span><span class="cx"> unsigned attributesIgnored;
</span><span class="cx"> return getConcurrently(uid, attributesIgnored);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStructureTransitionTableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StructureTransitionTable.h (176582 => 176583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StructureTransitionTable.h 2014-11-29 23:40:30 UTC (rev 176582)
+++ trunk/Source/JavaScriptCore/runtime/StructureTransitionTable.h 2014-11-30 00:06:58 UTC (rev 176583)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "WeakGCMap.h"
</span><span class="cx"> #include <wtf/HashFunctions.h>
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><del>-#include <wtf/text/StringImpl.h>
</del><ins>+#include <wtf/text/AtomicStringImpl.h>
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="lines">@@ -94,11 +94,11 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> struct Hash {
</span><del>- typedef std::pair<StringImpl*, unsigned> Key;
</del><ins>+ typedef std::pair<AtomicStringImpl*, unsigned> Key;
</ins><span class="cx">
</span><span class="cx"> static unsigned hash(const Key& p)
</span><span class="cx"> {
</span><del>- return PtrHash<StringImpl*>::hash(p.first) + p.second;
</del><ins>+ return PtrHash<AtomicStringImpl*>::hash(p.first) + p.second;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool equal(const Key& a, const Key& b)
</span><span class="lines">@@ -131,8 +131,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void add(VM&, Structure*);
</span><del>- inline bool contains(StringImpl* rep, unsigned attributes) const;
- inline Structure* get(StringImpl* rep, unsigned attributes) const;
</del><ins>+ inline bool contains(AtomicStringImpl* rep, unsigned attributes) const;
+ inline Structure* get(AtomicStringImpl* rep, unsigned attributes) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> bool isUsingSingleSlot() const
</span></span></pre>
</div>
</div>
</body>
</html>