<!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>[158716] 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/158716">158716</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2013-11-05 20:38:23 -0800 (Tue, 05 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>FTL should support StringCharAt
https://bugs.webkit.org/show_bug.cgi?id=123855

Reviewed by Oliver Hunt.
        
This is just like GetByVal for String, so we reuse that code.

* ftl/FTLCapabilities.cpp:
(JSC::FTL::canCompile):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::compileNode):
(JSC::FTL::LowerDFGToLLVM::compileGetByVal):
(JSC::FTL::LowerDFGToLLVM::compileStringCharAt):</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 (158715 => 158716)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2013-11-06 03:59:43 UTC (rev 158715)
+++ trunk/Source/JavaScriptCore/ChangeLog        2013-11-06 04:38:23 UTC (rev 158716)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2013-11-05  Filip Pizlo  &lt;fpizlo@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        FTL should support StringCharAt
+        https://bugs.webkit.org/show_bug.cgi?id=123855
+
+        Reviewed by Oliver Hunt.
+        
+        This is just like GetByVal for String, so we reuse that code.
+
+        * ftl/FTLCapabilities.cpp:
+        (JSC::FTL::canCompile):
+        * ftl/FTLLowerDFGToLLVM.cpp:
+        (JSC::FTL::LowerDFGToLLVM::compileNode):
+        (JSC::FTL::LowerDFGToLLVM::compileGetByVal):
+        (JSC::FTL::LowerDFGToLLVM::compileStringCharAt):
+
+2013-11-05  Filip Pizlo  &lt;fpizlo@apple.com&gt;
+
</ins><span class="cx">         Remove old unused code for hypothetical LLVM intrinsics
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=123824
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp (158715 => 158716)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp        2013-11-06 03:59:43 UTC (rev 158715)
+++ trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp        2013-11-06 04:38:23 UTC (rev 158716)
</span><span class="lines">@@ -96,6 +96,7 @@
</span><span class="cx">     case PutClosureVar:
</span><span class="cx">     case Int52ToValue:
</span><span class="cx">     case InvalidationPoint:
</span><ins>+    case StringCharAt:
</ins><span class="cx">         // These are OK.
</span><span class="cx">         break;
</span><span class="cx">     case GetById:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (158715 => 158716)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp        2013-11-06 03:59:43 UTC (rev 158715)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp        2013-11-06 04:38:23 UTC (rev 158716)
</span><span class="lines">@@ -365,6 +365,9 @@
</span><span class="cx">         case PutByValAlias:
</span><span class="cx">             compilePutByVal();
</span><span class="cx">             break;
</span><ins>+        case StringCharAt:
+            compileStringCharAt();
+            break;
</ins><span class="cx">         case GetByOffset:
</span><span class="cx">             compileGetByOffset();
</span><span class="cx">             break;
</span><span class="lines">@@ -1352,12 +1355,12 @@
</span><span class="cx">     
</span><span class="cx">     void compileGetByVal()
</span><span class="cx">     {
</span><del>-        LValue index = lowInt32(m_node-&gt;child2());
-        LValue storage = lowStorage(m_node-&gt;child3());
-        
</del><span class="cx">         switch (m_node-&gt;arrayMode().type()) {
</span><span class="cx">         case Array::Int32:
</span><span class="cx">         case Array::Contiguous: {
</span><ins>+            LValue index = lowInt32(m_node-&gt;child2());
+            LValue storage = lowStorage(m_node-&gt;child3());
+            
</ins><span class="cx">             if (m_node-&gt;arrayMode().isInBounds()) {
</span><span class="cx">                 speculate(
</span><span class="cx">                     OutOfBounds, noValue(), 0,
</span><span class="lines">@@ -1381,6 +1384,9 @@
</span><span class="cx">         }
</span><span class="cx">             
</span><span class="cx">         case Array::Double: {
</span><ins>+            LValue index = lowInt32(m_node-&gt;child2());
+            LValue storage = lowStorage(m_node-&gt;child3());
+            
</ins><span class="cx">             if (m_node-&gt;arrayMode().isInBounds()) {
</span><span class="cx">                 speculate(
</span><span class="cx">                     OutOfBounds, noValue(), 0,
</span><span class="lines">@@ -1408,100 +1414,14 @@
</span><span class="cx">         }
</span><span class="cx">             
</span><span class="cx">         case Array::String: {
</span><del>-            LValue base = lowCell(m_node-&gt;child1());
-            
-            LBasicBlock fastPath = FTL_NEW_BLOCK(m_out, (&quot;GetByVal String fast path&quot;));
-            LBasicBlock slowPath = FTL_NEW_BLOCK(m_out, (&quot;GetByVal String slow path&quot;));
-            LBasicBlock continuation = FTL_NEW_BLOCK(m_out, (&quot;GetByVal String continuation&quot;));
-            
-            m_out.branch(
-                m_out.aboveOrEqual(
-                    index, m_out.load32(base, m_heaps.JSString_length)),
-                slowPath, fastPath);
-            
-            LBasicBlock lastNext = m_out.appendTo(fastPath, slowPath);
-            
-            LValue stringImpl = m_out.loadPtr(base, m_heaps.JSString_value);
-            
-            LBasicBlock is8Bit = FTL_NEW_BLOCK(m_out, (&quot;GetByVal String 8-bit case&quot;));
-            LBasicBlock is16Bit = FTL_NEW_BLOCK(m_out, (&quot;GetByVal String 16-bit case&quot;));
-            LBasicBlock bitsContinuation = FTL_NEW_BLOCK(m_out, (&quot;GetByVal String bitness continuation&quot;));
-            LBasicBlock bigCharacter = FTL_NEW_BLOCK(m_out, (&quot;GetByVal String big character&quot;));
-            
-            m_out.branch(
-                m_out.testIsZero32(
-                    m_out.load32(stringImpl, m_heaps.StringImpl_hashAndFlags),
-                    m_out.constInt32(StringImpl::flagIs8Bit())),
-                is16Bit, is8Bit);
-            
-            m_out.appendTo(is8Bit, is16Bit);
-            
-            ValueFromBlock char8Bit = m_out.anchor(m_out.zeroExt(
-                m_out.load8(m_out.baseIndex(
-                    m_heaps.characters8,
-                    storage, m_out.zeroExt(index, m_out.intPtr),
-                    m_state.forNode(m_node-&gt;child2()).m_value)),
-                m_out.int32));
-            m_out.jump(bitsContinuation);
-            
-            m_out.appendTo(is16Bit, bigCharacter);
-            
-            ValueFromBlock char16Bit = m_out.anchor(m_out.zeroExt(
-                m_out.load16(m_out.baseIndex(
-                    m_heaps.characters16,
-                    storage, m_out.zeroExt(index, m_out.intPtr),
-                    m_state.forNode(m_node-&gt;child2()).m_value)),
-                m_out.int32));
-            m_out.branch(m_out.aboveOrEqual(char16Bit.value(), m_out.constInt32(0x100)), bigCharacter, bitsContinuation);
-            
-            m_out.appendTo(bigCharacter, bitsContinuation);
-            
-            Vector&lt;ValueFromBlock, 4&gt; results;
-            results.append(m_out.anchor(vmCall(
-                m_out.operation(operationSingleCharacterString),
-                m_callFrame, char16Bit.value())));
-            m_out.jump(continuation);
-            
-            m_out.appendTo(bitsContinuation, slowPath);
-            
-            LValue character = m_out.phi(m_out.int32, char8Bit, char16Bit);
-            
-            LValue smallStrings = m_out.constIntPtr(vm().smallStrings.singleCharacterStrings());
-            
-            results.append(m_out.anchor(m_out.loadPtr(m_out.baseIndex(
-                m_heaps.singleCharacterStrings, smallStrings,
-                m_out.zeroExt(character, m_out.intPtr)))));
-            m_out.jump(continuation);
-            
-            m_out.appendTo(slowPath, continuation);
-            
-            if (m_node-&gt;arrayMode().isInBounds()) {
-                speculate(OutOfBounds, noValue(), 0, m_out.booleanTrue);
-                results.append(m_out.anchor(m_out.intPtrZero));
-            } else {
-                JSGlobalObject* globalObject = m_graph.globalObjectFor(m_node-&gt;codeOrigin);
-                
-                if (globalObject-&gt;stringPrototypeChainIsSane()) {
-                    LBasicBlock negativeIndex = FTL_NEW_BLOCK(m_out, (&quot;GetByVal String negative index&quot;));
-                    
-                    results.append(m_out.anchor(m_out.constInt64(JSValue::encode(jsUndefined()))));
-                    m_out.branch(m_out.lessThan(index, m_out.int32Zero), negativeIndex, continuation);
-                    
-                    m_out.appendTo(negativeIndex, continuation);
-                }
-                
-                results.append(m_out.anchor(vmCall(
-                    m_out.operation(operationGetByValStringInt), base, index)));
-            }
-            
-            m_out.jump(continuation);
-            
-            m_out.appendTo(continuation, lastNext);
-            setJSValue(m_out.phi(m_out.int64, results));
</del><ins>+            compileStringCharAt();
</ins><span class="cx">             return;
</span><span class="cx">         }
</span><span class="cx">             
</span><span class="cx">         default: {
</span><ins>+            LValue index = lowInt32(m_node-&gt;child2());
+            LValue storage = lowStorage(m_node-&gt;child3());
+            
</ins><span class="cx">             TypedArrayType type = m_node-&gt;arrayMode().typedArrayType();
</span><span class="cx">             
</span><span class="cx">             if (isTypedView(type)) {
</span><span class="lines">@@ -1802,6 +1722,102 @@
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx">     
</span><ins>+    void compileStringCharAt()
+    {
+        LValue base = lowCell(m_node-&gt;child1());
+        LValue index = lowInt32(m_node-&gt;child2());
+        LValue storage = lowStorage(m_node-&gt;child3());
+            
+        LBasicBlock fastPath = FTL_NEW_BLOCK(m_out, (&quot;GetByVal String fast path&quot;));
+        LBasicBlock slowPath = FTL_NEW_BLOCK(m_out, (&quot;GetByVal String slow path&quot;));
+        LBasicBlock continuation = FTL_NEW_BLOCK(m_out, (&quot;GetByVal String continuation&quot;));
+            
+        m_out.branch(
+            m_out.aboveOrEqual(
+                index, m_out.load32(base, m_heaps.JSString_length)),
+            slowPath, fastPath);
+            
+        LBasicBlock lastNext = m_out.appendTo(fastPath, slowPath);
+            
+        LValue stringImpl = m_out.loadPtr(base, m_heaps.JSString_value);
+            
+        LBasicBlock is8Bit = FTL_NEW_BLOCK(m_out, (&quot;GetByVal String 8-bit case&quot;));
+        LBasicBlock is16Bit = FTL_NEW_BLOCK(m_out, (&quot;GetByVal String 16-bit case&quot;));
+        LBasicBlock bitsContinuation = FTL_NEW_BLOCK(m_out, (&quot;GetByVal String bitness continuation&quot;));
+        LBasicBlock bigCharacter = FTL_NEW_BLOCK(m_out, (&quot;GetByVal String big character&quot;));
+            
+        m_out.branch(
+            m_out.testIsZero32(
+                m_out.load32(stringImpl, m_heaps.StringImpl_hashAndFlags),
+                m_out.constInt32(StringImpl::flagIs8Bit())),
+            is16Bit, is8Bit);
+            
+        m_out.appendTo(is8Bit, is16Bit);
+            
+        ValueFromBlock char8Bit = m_out.anchor(m_out.zeroExt(
+            m_out.load8(m_out.baseIndex(
+                m_heaps.characters8,
+                storage, m_out.zeroExt(index, m_out.intPtr),
+                m_state.forNode(m_node-&gt;child2()).m_value)),
+            m_out.int32));
+        m_out.jump(bitsContinuation);
+            
+        m_out.appendTo(is16Bit, bigCharacter);
+            
+        ValueFromBlock char16Bit = m_out.anchor(m_out.zeroExt(
+            m_out.load16(m_out.baseIndex(
+                m_heaps.characters16,
+                storage, m_out.zeroExt(index, m_out.intPtr),
+                m_state.forNode(m_node-&gt;child2()).m_value)),
+            m_out.int32));
+        m_out.branch(m_out.aboveOrEqual(char16Bit.value(), m_out.constInt32(0x100)), bigCharacter, bitsContinuation);
+            
+        m_out.appendTo(bigCharacter, bitsContinuation);
+            
+        Vector&lt;ValueFromBlock, 4&gt; results;
+        results.append(m_out.anchor(vmCall(
+            m_out.operation(operationSingleCharacterString),
+            m_callFrame, char16Bit.value())));
+        m_out.jump(continuation);
+            
+        m_out.appendTo(bitsContinuation, slowPath);
+            
+        LValue character = m_out.phi(m_out.int32, char8Bit, char16Bit);
+            
+        LValue smallStrings = m_out.constIntPtr(vm().smallStrings.singleCharacterStrings());
+            
+        results.append(m_out.anchor(m_out.loadPtr(m_out.baseIndex(
+            m_heaps.singleCharacterStrings, smallStrings,
+            m_out.zeroExt(character, m_out.intPtr)))));
+        m_out.jump(continuation);
+            
+        m_out.appendTo(slowPath, continuation);
+            
+        if (m_node-&gt;arrayMode().isInBounds()) {
+            speculate(OutOfBounds, noValue(), 0, m_out.booleanTrue);
+            results.append(m_out.anchor(m_out.intPtrZero));
+        } else {
+            JSGlobalObject* globalObject = m_graph.globalObjectFor(m_node-&gt;codeOrigin);
+                
+            if (globalObject-&gt;stringPrototypeChainIsSane()) {
+                LBasicBlock negativeIndex = FTL_NEW_BLOCK(m_out, (&quot;GetByVal String negative index&quot;));
+                    
+                results.append(m_out.anchor(m_out.constInt64(JSValue::encode(jsUndefined()))));
+                m_out.branch(m_out.lessThan(index, m_out.int32Zero), negativeIndex, continuation);
+                    
+                m_out.appendTo(negativeIndex, continuation);
+            }
+                
+            results.append(m_out.anchor(vmCall(
+                m_out.operation(operationGetByValStringInt), base, index)));
+        }
+            
+        m_out.jump(continuation);
+            
+        m_out.appendTo(continuation, lastNext);
+        setJSValue(m_out.phi(m_out.int64, results));
+    }
+    
</ins><span class="cx">     void compileGetByOffset()
</span><span class="cx">     {
</span><span class="cx">         StorageAccessData&amp; data =
</span></span></pre>
</div>
</div>

</body>
</html>