<!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>[183446] 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/183446">183446</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-04-27 19:14:26 -0700 (Mon, 27 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, roll out <a href="http://trac.webkit.org/projects/webkit/changeset/183438">r183438</a> "RegExp matches arrays should use contiguous indexing". It
causes many debug test failures.
* runtime/JSGlobalObject.cpp:
(JSC::JSGlobalObject::init):
(JSC::JSGlobalObject::visitChildren):
* runtime/JSGlobalObject.h:
(JSC::JSGlobalObject::regExpMatchesArrayStructure):
* runtime/JSObject.h:
(JSC::JSObject::initializeIndex):
* runtime/RegExpMatchesArray.cpp:
(JSC::createRegExpMatchesArray):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjecth">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjecth">trunk/Source/JavaScriptCore/runtime/JSObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpMatchesArraycpp">trunk/Source/JavaScriptCore/runtime/RegExpMatchesArray.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (183445 => 183446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-04-28 01:25:26 UTC (rev 183445)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-04-28 02:14:26 UTC (rev 183446)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-04-27 Filip Pizlo <fpizlo@apple.com>
+
+ Unreviewed, roll out r183438 "RegExp matches arrays should use contiguous indexing". It
+ causes many debug test failures.
+
+ * runtime/JSGlobalObject.cpp:
+ (JSC::JSGlobalObject::init):
+ (JSC::JSGlobalObject::visitChildren):
+ * runtime/JSGlobalObject.h:
+ (JSC::JSGlobalObject::regExpMatchesArrayStructure):
+ * runtime/JSObject.h:
+ (JSC::JSObject::initializeIndex):
+ * runtime/RegExpMatchesArray.cpp:
+ (JSC::createRegExpMatchesArray):
+
</ins><span class="cx"> 2015-04-27 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> RegExp matches arrays should use contiguous indexing.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp (183445 => 183446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2015-04-28 01:25:26 UTC (rev 183445)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2015-04-28 02:14:26 UTC (rev 183446)
</span><span class="lines">@@ -305,6 +305,8 @@
</span><span class="cx"> for (unsigned i = 0; i < NumberOfIndexingShapes; ++i)
</span><span class="cx"> m_arrayStructureForIndexingShapeDuringAllocation[i] = m_originalArrayStructureForIndexingShape[i];
</span><span class="cx">
</span><ins>+ m_regExpMatchesArrayStructure.set(vm, this, Structure::create(vm, this, m_arrayPrototype.get(), TypeInfo(ObjectType, StructureFlags), JSArray::info(), ArrayWithSlowPutArrayStorage));
+
</ins><span class="cx"> RegExp* emptyRegex = RegExp::create(vm, "", NoFlags);
</span><span class="cx">
</span><span class="cx"> m_regExpPrototype.set(vm, this, RegExpPrototype::create(vm, RegExpPrototype::createStructure(vm, this, m_objectPrototype.get()), emptyRegex));
</span><span class="lines">@@ -762,6 +764,7 @@
</span><span class="cx"> visitor.append(&thisObject->m_boundFunctionStructure);
</span><span class="cx"> visitor.append(&thisObject->m_namedFunctionStructure);
</span><span class="cx"> visitor.append(&thisObject->m_symbolObjectStructure);
</span><ins>+ visitor.append(&thisObject->m_regExpMatchesArrayStructure);
</ins><span class="cx"> visitor.append(&thisObject->m_regExpStructure);
</span><span class="cx"> visitor.append(&thisObject->m_consoleStructure);
</span><span class="cx"> visitor.append(&thisObject->m_dollarVMStructure);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h (183445 => 183446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2015-04-28 01:25:26 UTC (rev 183445)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2015-04-28 02:14:26 UTC (rev 183446)
</span><span class="lines">@@ -232,6 +232,7 @@
</span><span class="cx"> WriteBarrier<Structure> m_namedFunctionStructure;
</span><span class="cx"> PropertyOffset m_functionNameOffset;
</span><span class="cx"> WriteBarrier<Structure> m_privateNameStructure;
</span><ins>+ WriteBarrier<Structure> m_regExpMatchesArrayStructure;
</ins><span class="cx"> WriteBarrier<Structure> m_regExpStructure;
</span><span class="cx"> WriteBarrier<Structure> m_consoleStructure;
</span><span class="cx"> WriteBarrier<Structure> m_dollarVMStructure;
</span><span class="lines">@@ -473,6 +474,7 @@
</span><span class="cx"> Structure* privateNameStructure() const { return m_privateNameStructure.get(); }
</span><span class="cx"> Structure* internalFunctionStructure() const { return m_internalFunctionStructure.get(); }
</span><span class="cx"> Structure* mapStructure() const { return m_mapStructure.get(); }
</span><ins>+ Structure* regExpMatchesArrayStructure() const { return m_regExpMatchesArrayStructure.get(); }
</ins><span class="cx"> Structure* regExpStructure() const { return m_regExpStructure.get(); }
</span><span class="cx"> Structure* setStructure() const { return m_setStructure.get(); }
</span><span class="cx"> Structure* stringObjectStructure() const { return m_stringObjectStructure.get(); }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.h (183445 => 183446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.h 2015-04-28 01:25:26 UTC (rev 183445)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.h 2015-04-28 02:14:26 UTC (rev 183446)
</span><span class="lines">@@ -364,15 +364,10 @@
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> void initializeIndex(VM& vm, unsigned i, JSValue v)
</span><span class="cx"> {
</span><del>- initializeIndex(vm, i, v, indexingType());
- }
-
- void initializeIndex(VM& vm, unsigned i, JSValue v, IndexingType indexingType)
- {
- switch (indexingType) {
</del><ins>+ switch (indexingType()) {
</ins><span class="cx"> case ALL_UNDECIDED_INDEXING_TYPES: {
</span><span class="cx"> setIndexQuicklyToUndecided(vm, i, v);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpMatchesArraycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExpMatchesArray.cpp (183445 => 183446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExpMatchesArray.cpp 2015-04-28 01:25:26 UTC (rev 183445)
+++ trunk/Source/JavaScriptCore/runtime/RegExpMatchesArray.cpp 2015-04-28 02:14:26 UTC (rev 183446)
</span><span class="lines">@@ -35,16 +35,16 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(result);
</span><span class="cx"> VM& vm = exec->vm();
</span><del>- JSArray* array = JSArray::tryCreateUninitialized(vm, exec->lexicalGlobalObject()->arrayStructureForIndexingTypeDuringAllocation(ContiguousShape), regExp->numSubpatterns() + 1);
</del><ins>+ JSArray* array = JSArray::tryCreateUninitialized(vm, exec->lexicalGlobalObject()->regExpMatchesArrayStructure(), regExp->numSubpatterns() + 1);
</ins><span class="cx"> RELEASE_ASSERT(array);
</span><span class="cx">
</span><span class="cx"> SamplingRegion samplingRegion("Reifying substring properties");
</span><span class="cx">
</span><del>- array->initializeIndex(vm, 0, jsSubstring(exec, input, result.start, result.end - result.start), ContiguousShape);
</del><ins>+ array->putDirectIndex(exec, 0, jsSubstring(exec, input, result.start, result.end - result.start));
</ins><span class="cx">
</span><span class="cx"> if (unsigned numSubpatterns = regExp->numSubpatterns()) {
</span><span class="cx"> Vector<int, 32> subpatternResults;
</span><del>- int position = regExp->match(vm, input->value(exec), result.start, subpatternResults);
</del><ins>+ int position = regExp->match(exec->vm(), input->value(exec), result.start, subpatternResults);
</ins><span class="cx"> ASSERT_UNUSED(position, position >= 0 && static_cast<size_t>(position) == result.start);
</span><span class="cx"> ASSERT(result.start == static_cast<size_t>(subpatternResults[0]));
</span><span class="cx"> ASSERT(result.end == static_cast<size_t>(subpatternResults[1]));
</span><span class="lines">@@ -52,14 +52,14 @@
</span><span class="cx"> for (unsigned i = 1; i <= numSubpatterns; ++i) {
</span><span class="cx"> int start = subpatternResults[2 * i];
</span><span class="cx"> if (start >= 0)
</span><del>- array->initializeIndex(vm, i, jsSubstring(exec, input, start, subpatternResults[2 * i + 1] - start), ContiguousShape);
</del><ins>+ array->putDirectIndex(exec, i, jsSubstring(exec, input, start, subpatternResults[2 * i + 1] - start));
</ins><span class="cx"> else
</span><del>- array->initializeIndex(vm, i, jsUndefined(), ContiguousShape);
</del><ins>+ array->putDirectIndex(exec, i, jsUndefined());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- array->putDirect(vm, vm.propertyNames->index, jsNumber(result.start));
- array->putDirect(vm, vm.propertyNames->input, input);
</del><ins>+ array->putDirect(exec->vm(), exec->propertyNames().index, jsNumber(result.start));
+ array->putDirect(exec->vm(), exec->propertyNames().input, input);
</ins><span class="cx">
</span><span class="cx"> return array;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>