<!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>[194998] 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/194998">194998</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2016-01-13 15:45:14 -0800 (Wed, 13 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ES6] Support subclassing the String builtin object
https://bugs.webkit.org/show_bug.cgi?id=153068
Reviewed by Michael Saboff.
This patch adds subclassing of strings. Also, this patch fixes a bug where we could have
the wrong indexing type for builtins constructed without storage.
* runtime/PrototypeMap.cpp:
(JSC::PrototypeMap::emptyStructureForPrototypeFromBaseStructure):
* runtime/StringConstructor.cpp:
(JSC::constructWithStringConstructor):
* tests/stress/class-subclassing-string.js: Added.
(test):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimePrototypeMapcpp">trunk/Source/JavaScriptCore/runtime/PrototypeMap.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStringConstructorcpp">trunk/Source/JavaScriptCore/runtime/StringConstructor.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressclasssubclassingstringjs">trunk/Source/JavaScriptCore/tests/stress/class-subclassing-string.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194997 => 194998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-01-13 23:31:08 UTC (rev 194997)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-01-13 23:45:14 UTC (rev 194998)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-01-13 Keith Miller <keith_miller@apple.com>
+
+ [ES6] Support subclassing the String builtin object
+ https://bugs.webkit.org/show_bug.cgi?id=153068
+
+ Reviewed by Michael Saboff.
+
+ This patch adds subclassing of strings. Also, this patch fixes a bug where we could have
+ the wrong indexing type for builtins constructed without storage.
+
+ * runtime/PrototypeMap.cpp:
+ (JSC::PrototypeMap::emptyStructureForPrototypeFromBaseStructure):
+ * runtime/StringConstructor.cpp:
+ (JSC::constructWithStringConstructor):
+ * tests/stress/class-subclassing-string.js: Added.
+ (test):
+
</ins><span class="cx"> 2016-01-13 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> The StringFromCharCode DFG intrinsic should support untyped operands.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimePrototypeMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/PrototypeMap.cpp (194997 => 194998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/PrototypeMap.cpp 2016-01-13 23:31:08 UTC (rev 194997)
+++ trunk/Source/JavaScriptCore/runtime/PrototypeMap.cpp 2016-01-13 23:45:14 UTC (rev 194998)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> {
</span><span class="cx"> // We currently do not have inline capacity static analysis for subclasses and all internal function constructors have a default inline capacity of 0.
</span><span class="cx"> IndexingType indexingType = baseStructure->indexingType();
</span><del>- if (prototype->structure()->anyObjectInChainMayInterceptIndexedAccesses())
</del><ins>+ if (prototype->structure()->anyObjectInChainMayInterceptIndexedAccesses() && hasIndexedProperties(indexingType))
</ins><span class="cx"> indexingType = (indexingType & ~IndexingShapeMask) | SlowPutArrayStorageShape;
</span><span class="cx">
</span><span class="cx"> return createEmptyStructure(prototype, baseStructure->typeInfo(), baseStructure->classInfo(), indexingType, 0);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStringConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StringConstructor.cpp (194997 => 194998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StringConstructor.cpp 2016-01-13 23:31:08 UTC (rev 194997)
+++ trunk/Source/JavaScriptCore/runtime/StringConstructor.cpp 2016-01-13 23:45:14 UTC (rev 194998)
</span><span class="lines">@@ -126,9 +126,9 @@
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx">
</span><span class="cx"> if (!exec->argumentCount())
</span><del>- return JSValue::encode(StringObject::create(vm, globalObject->stringObjectStructure()));
</del><ins>+ return JSValue::encode(StringObject::create(vm, InternalFunction::createSubclassStructure(exec, exec->newTarget(), globalObject->stringObjectStructure())));
</ins><span class="cx">
</span><del>- return JSValue::encode(StringObject::create(vm, globalObject->stringObjectStructure(), exec->uncheckedArgument(0).toString(exec)));
</del><ins>+ return JSValue::encode(StringObject::create(vm, InternalFunction::createSubclassStructure(exec, exec->newTarget(), globalObject->stringObjectStructure()), exec->uncheckedArgument(0).toString(exec)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ConstructType StringConstructor::getConstructData(JSCell*, ConstructData& constructData)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressclasssubclassingstringjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/class-subclassing-string.js (0 => 194998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/class-subclassing-string.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/class-subclassing-string.js 2016-01-13 23:45:14 UTC (rev 194998)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+A = class extends String { }
+B = class extends A { get 4() { return 1; } }
+C = class extends B { }
+
+A.prototype[3] = 1;
+
+function test() {
+ let a = new A("foo");
+ let b = new B("baz");
+ let c = new C("bar");
+
+ // String objects have a non-writable length property
+ a.length = 1;
+ b.length = 1;
+ c.length = 1;
+
+ if (a.length !== 3 || b.length !== 3 || c.length !== 3)
+ throw "not string objects";
+
+ if (!(a instanceof A && a instanceof String))
+ throw "a has incorrect prototype chain";
+
+ if (!(b instanceof B && b instanceof A && b instanceof String))
+ throw "b has incorrect prototype chain";
+
+ if (!(c instanceof C && c instanceof B && c instanceof A && c instanceof String))
+ throw "c has incorrect prototype chain";
+
+ if (a[4] !== undefined || b[4] !== 1 || c[4] !== 1)
+ throw "bad indexing type with accessors on chain";
+
+ if (a[3] !== 1 || b[3] !== 1 || c[3] !== 1)
+ throw "bad indexing type with values on chain";
+}
+noInline(test);
+
+for (i = 0; i < 10000; i++)
+ test();
</ins></span></pre>
</div>
</div>
</body>
</html>