<!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>[196668] 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/196668">196668</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-16 15:47:06 -0800 (Tue, 16 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/196652">r196652</a>.
https://bugs.webkit.org/show_bug.cgi?id=154315
This change caused LayoutTest crashes (Requested by ryanhaddad
on #webkit).
Reverted changeset:
"FTL should support NewTypedArray"
https://bugs.webkit.org/show_bug.cgi?id=154268
http://trac.webkit.org/changeset/196652</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLCapabilitiescpp">trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (196667 => 196668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-02-16 23:45:27 UTC (rev 196667)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-02-16 23:47:06 UTC (rev 196668)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-02-16 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r196652.
+ https://bugs.webkit.org/show_bug.cgi?id=154315
+
+ This change caused LayoutTest crashes (Requested by ryanhaddad
+ on #webkit).
+
+ Reverted changeset:
+
+ "FTL should support NewTypedArray"
+ https://bugs.webkit.org/show_bug.cgi?id=154268
+ http://trac.webkit.org/changeset/196652
+
</ins><span class="cx"> 2016-02-16 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> RemoteInspector should forward new automation session requests to its client
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp (196667 => 196668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2016-02-16 23:45:27 UTC (rev 196667)
+++ trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2016-02-16 23:47:06 UTC (rev 196668)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2015 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">@@ -72,7 +72,6 @@
</span><span class="cx"> case NewObject:
</span><span class="cx"> case NewArray:
</span><span class="cx"> case NewArrayBuffer:
</span><del>- case NewTypedArray:
</del><span class="cx"> case GetByOffset:
</span><span class="cx"> case GetGetterSetterByOffset:
</span><span class="cx"> case GetGetter:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (196667 => 196668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2016-02-16 23:45:27 UTC (rev 196667)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2016-02-16 23:47:06 UTC (rev 196668)
</span><span class="lines">@@ -845,9 +845,6 @@
</span><span class="cx"> case NewArrayWithSize:
</span><span class="cx"> compileNewArrayWithSize();
</span><span class="cx"> break;
</span><del>- case NewTypedArray:
- compileNewTypedArray();
- break;
</del><span class="cx"> case GetTypedArrayByteOffset:
</span><span class="cx"> compileGetTypedArrayByteOffset();
</span><span class="cx"> break;
</span><span class="lines">@@ -4093,7 +4090,8 @@
</span><span class="cx">
</span><span class="cx"> LValue butterfly = m_out.sub(endOfStorage, payloadSize);
</span><span class="cx">
</span><del>- LValue object = allocateObject<JSArray>(structure, butterfly, failCase);
</del><ins>+ LValue object = allocateObject<JSArray>(
+ structure, butterfly, failCase);
</ins><span class="cx">
</span><span class="cx"> m_out.store32(publicLength, butterfly, m_heaps.Butterfly_publicLength);
</span><span class="cx"> m_out.store32(vectorLength, butterfly, m_heaps.Butterfly_vectorLength);
</span><span class="lines">@@ -4161,63 +4159,6 @@
</span><span class="cx"> m_out.constIntPtr(structure));
</span><span class="cx"> setJSValue(vmCall(m_out.int64, m_out.operation(operationNewArrayWithSize), m_callFrame, structureValue, publicLength));
</span><span class="cx"> }
</span><del>-
- void compileNewTypedArray()
- {
- JSGlobalObject* globalObject = m_graph.globalObjectFor(m_node->origin.semantic);
- TypedArrayType type = m_node->typedArrayType();
- Structure* structure = globalObject->typedArrayStructure(type);
-
- LValue size = lowInt32(m_node->child1());
-
- LBasicBlock smallEnoughCase = FTL_NEW_BLOCK(m_out, ("NewTypedArray small enough case"));
- LBasicBlock nonZeroCase = FTL_NEW_BLOCK(m_out, ("NewTypedArray non-zero case"));
- LBasicBlock slowCase = FTL_NEW_BLOCK(m_out, ("NewTypedArray slow case"));
- LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("NewTypedArray continuation"));
-
- m_out.branch(
- m_out.above(size, m_out.constInt32(JSArrayBufferView::fastSizeLimit)),
- rarely(slowCase), usually(smallEnoughCase));
-
- LBasicBlock lastNext = m_out.appendTo(smallEnoughCase, nonZeroCase);
-
- m_out.branch(m_out.notZero32(size), usually(nonZeroCase), rarely(slowCase));
-
- m_out.appendTo(nonZeroCase, slowCase);
-
- LValue byteSize = m_out.shl(m_out.zeroExtPtr(size), m_out.constInt32(logElementSize(type)));
- if (elementSize(type) < 8) {
- byteSize = m_out.bitAnd(
- m_out.add(byteSize, m_out.constIntPtr(7)),
- m_out.constIntPtr(~static_cast<intptr_t>(7)));
- }
-
- LValue storage = allocateBasicStorage(byteSize, slowCase);
-
- LValue fastResultValue = allocateObject<JSArrayBufferView>(structure, storage, slowCase);
-
- m_out.storePtr(storage, fastResultValue, m_heaps.JSArrayBufferView_vector);
- m_out.store32(size, fastResultValue, m_heaps.JSArrayBufferView_length);
- m_out.store32(m_out.constInt32(FastTypedArray), fastResultValue, m_heaps.JSArrayBufferView_mode);
-
- ValueFromBlock fastResult = m_out.anchor(fastResultValue);
- m_out.jump(continuation);
-
- m_out.appendTo(slowCase, continuation);
-
- LValue slowResultValue = lazySlowPath(
- [=] (const Vector<Location>& locations) -> RefPtr<LazySlowPath::Generator> {
- return createLazyCallGenerator(
- operationNewTypedArrayWithSizeForType(type), locations[0].directGPR(),
- CCallHelpers::TrustedImmPtr(structure), locations[1].directGPR());
- },
- size);
- ValueFromBlock slowResult = m_out.anchor(slowResultValue);
- m_out.jump(continuation);
-
- m_out.appendTo(continuation, lastNext);
- setJSValue(m_out.phi(m_out.intPtr, fastResult, slowResult));
- }
</del><span class="cx">
</span><span class="cx"> void compileAllocatePropertyStorage()
</span><span class="cx"> {
</span><span class="lines">@@ -7991,11 +7932,6 @@
</span><span class="cx"> return m_out.sub(
</span><span class="cx"> m_out.loadPtr(m_out.absolute(&allocator.m_currentPayloadEnd)), newRemaining);
</span><span class="cx"> }
</span><del>-
- LValue allocateBasicStorage(LValue size, LBasicBlock slowPath)
- {
- return m_out.sub(allocateBasicStorageAndGetEnd(size, slowPath), size);
- }
</del><span class="cx">
</span><span class="cx"> LValue allocateObject(Structure* structure)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>