<!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>[170736] branches/ftlopt/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/170736">170736</a></dd>
<dt>Author</dt> <dd>mmirman@apple.com</dd>
<dt>Date</dt> <dd>2014-07-02 16:41:08 -0700 (Wed, 02 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Added In for cells to the FTL</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesftloptSourceJavaScriptCoreChangeLog">branches/ftlopt/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreftlFTLCapabilitiescpp">branches/ftlopt/Source/JavaScriptCore/ftl/FTLCapabilities.cpp</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreftlFTLCompilecpp">branches/ftlopt/Source/JavaScriptCore/ftl/FTLCompile.cpp</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreftlFTLInlineCacheDescriptorh">branches/ftlopt/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptor.h</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreftlFTLInlineCacheSizecpp">branches/ftlopt/Source/JavaScriptCore/ftl/FTLInlineCacheSize.cpp</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreftlFTLInlineCacheSizeh">branches/ftlopt/Source/JavaScriptCore/ftl/FTLInlineCacheSize.h</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreftlFTLIntrinsicRepositoryh">branches/ftlopt/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">branches/ftlopt/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreftlFTLSlowPathCallcpp">branches/ftlopt/Source/JavaScriptCore/ftl/FTLSlowPathCall.cpp</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreftlFTLSlowPathCallh">branches/ftlopt/Source/JavaScriptCore/ftl/FTLSlowPathCall.h</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreftlFTLStateh">branches/ftlopt/Source/JavaScriptCore/ftl/FTLState.h</a></li>
<li><a href="#branchesftloptSourceJavaScriptCorejitJITOperationsh">branches/ftlopt/Source/JavaScriptCore/jit/JITOperations.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchesftloptSourceJavaScriptCoretestsstressftlcheckinvariablejs">branches/ftlopt/Source/JavaScriptCore/tests/stress/ftl-checkin-variable.js</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoretestsstressftlcheckinjs">branches/ftlopt/Source/JavaScriptCore/tests/stress/ftl-checkin.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesftloptSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/ChangeLog (170735 => 170736)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/ChangeLog 2014-07-02 23:02:45 UTC (rev 170735)
+++ branches/ftlopt/Source/JavaScriptCore/ChangeLog 2014-07-02 23:41:08 UTC (rev 170736)
</span><span class="lines">@@ -271,6 +271,36 @@
</span><span class="cx"> (foo):
</span><span class="cx"> (test):
</span><span class="cx">
</span><ins>+2014-07-01 Matthew Mirman <mmirman@apple.com>
+
+ Added an implementation of the "in" check to FTL.
+ https://bugs.webkit.org/show_bug.cgi?id=134508
+
+ Reviewed by Filip Pizlo.
+
+ * ftl/FTLCapabilities.cpp: enabled compilation for "in"
+ (JSC::FTL::canCompile): ditto
+ * ftl/FTLCompile.cpp:
+ (JSC::FTL::generateCheckInICFastPath): added.
+ (JSC::FTL::fixFunctionBasedOnStackMaps): added case for CheckIn descriptors.
+ * ftl/FTLInlineCacheDescriptor.h:
+ (JSC::FTL::CheckInGenerator::CheckInGenerator): added.
+ (JSC::FTL::CheckInDescriptor::CheckInDescriptor): added.
+ * ftl/FTLInlineCacheSize.cpp:
+ (JSC::FTL::sizeOfCheckIn): added. Currently larger than necessary.
+ * ftl/FTLInlineCacheSize.h: ditto
+ * ftl/FTLIntrinsicRepository.h: Added function type for operationInGeneric
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::compileNode): added case for In.
+ (JSC::FTL::LowerDFGToLLVM::compileIn): added.
+ * ftl/FTLSlowPathCall.cpp: Added a callOperation for operationIn
+ (JSC::FTL::callOperation): ditto
+ * ftl/FTLSlowPathCall.h: ditto
+ * ftl/FTLState.h: Added a vector to hold CheckIn descriptors.
+ * jit/JITOperations.h: made operationIns internal.
+ * tests/stress/ftl-checkin.js: Added.
+ * tests/stress/ftl-checkin-variable.js: Added.
+
</ins><span class="cx"> 2014-06-30 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r169121 from trunk.
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreftlFTLCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/ftl/FTLCapabilities.cpp (170735 => 170736)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2014-07-02 23:02:45 UTC (rev 170735)
+++ branches/ftlopt/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2014-07-02 23:41:08 UTC (rev 170736)
</span><span class="lines">@@ -165,6 +165,10 @@
</span><span class="cx"> // case because it would prevent us from catching bugs where the FTL backend
</span><span class="cx"> // pipeline failed to optimize out an Identity.
</span><span class="cx"> break;
</span><ins>+ case In:
+ if (node->child2().useKind() == CellUse)
+ break;
+ return CannotCompile;
</ins><span class="cx"> case PutByIdDirect:
</span><span class="cx"> case PutById:
</span><span class="cx"> if (node->child1().useKind() == CellUse)
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreftlFTLCompilecpp"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/ftl/FTLCompile.cpp (170735 => 170736)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/ftl/FTLCompile.cpp 2014-07-02 23:02:45 UTC (rev 170735)
+++ branches/ftlopt/Source/JavaScriptCore/ftl/FTLCompile.cpp 2014-07-02 23:41:08 UTC (rev 170736)
</span><span class="lines">@@ -166,6 +166,68 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void generateCheckInICFastPath(
+ State& state, CodeBlock* codeBlock, GeneratedFunction generatedFunction,
+ StackMaps::RecordMap& recordMap, CheckInDescriptor& ic, size_t sizeOfIC)
+{
+ VM& vm = state.graph.m_vm;
+
+ StackMaps::RecordMap::iterator iter = recordMap.find(ic.stackmapID());
+ if (iter == recordMap.end()) {
+ // It was optimized out.
+ return;
+ }
+
+ Vector<StackMaps::Record>& records = iter->value;
+
+ RELEASE_ASSERT(records.size() == ic.m_generators.size());
+
+ for (unsigned i = records.size(); i--;) {
+ StackMaps::Record& record = records[i];
+ auto generator = ic.m_generators[i];
+
+ StructureStubInfo& stubInfo = *generator.m_stub;
+ auto call = generator.m_slowCall;
+ auto slowPathBegin = generator.m_beginLabel;
+
+ CCallHelpers fastPathJIT(&vm, codeBlock);
+
+ auto jump = fastPathJIT.patchableJump();
+ auto done = fastPathJIT.label();
+
+ char* startOfIC =
+ bitwise_cast<char*>(generatedFunction) + record.instructionOffset;
+
+ LinkBuffer fastPath(vm, &fastPathJIT, startOfIC, sizeOfIC);
+ LinkBuffer& slowPath = *state.finalizer->sideCodeLinkBuffer;
+ // Note: we could handle the !isValid() case. We just don't appear to have a
+ // reason to do so, yet.
+ RELEASE_ASSERT(fastPath.isValid());
+
+ MacroAssembler::AssemblerType_T::fillNops(
+ startOfIC + fastPath.size(), sizeOfIC - fastPath.size());
+
+ state.finalizer->sideCodeLinkBuffer->link(
+ ic.m_slowPathDone[i], CodeLocationLabel(startOfIC + sizeOfIC));
+
+ CodeLocationLabel slowPathBeginLoc = slowPath.locationOf(slowPathBegin);
+ fastPath.link(jump, slowPathBeginLoc);
+
+ CodeLocationCall callReturnLocation = fastPath.locationOf(call);
+
+ stubInfo.patch.deltaCallToDone = MacroAssembler::differenceBetweenCodePtr(
+ callReturnLocation, fastPath.locationOf(done));
+
+ stubInfo.patch.deltaCallToJump = MacroAssembler::differenceBetweenCodePtr(
+ callReturnLocation, fastPath.locationOf(jump));
+ stubInfo.callReturnLocation = callReturnLocation;
+ stubInfo.patch.deltaCallToSlowCase = MacroAssembler::differenceBetweenCodePtr(
+ callReturnLocation, slowPathBeginLoc);
+
+ }
+}
+
+
</ins><span class="cx"> static RegisterSet usedRegistersFor(const StackMaps::Record& record)
</span><span class="cx"> {
</span><span class="cx"> if (Options::assumeAllRegsInFTLICAreLive())
</span><span class="lines">@@ -290,7 +352,7 @@
</span><span class="cx"> state.finalizer->exitThunksLinkBuffer = linkBuffer.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!state.getByIds.isEmpty() || !state.putByIds.isEmpty()) {
</del><ins>+ if (!state.getByIds.isEmpty() || !state.putByIds.isEmpty() || !state.checkIns.isEmpty()) {
</ins><span class="cx"> CCallHelpers slowPathJIT(&vm, codeBlock);
</span><span class="cx">
</span><span class="cx"> CCallHelpers::JumpList exceptionTarget;
</span><span class="lines">@@ -320,13 +382,13 @@
</span><span class="cx"> JSValueRegs(result), NeedToSpill);
</span><span class="cx">
</span><span class="cx"> MacroAssembler::Label begin = slowPathJIT.label();
</span><del>-
</del><ins>+
</ins><span class="cx"> MacroAssembler::Call call = callOperation(
</span><span class="cx"> state, usedRegisters, slowPathJIT, getById.codeOrigin(), &exceptionTarget,
</span><span class="cx"> operationGetByIdOptimize, result, gen.stubInfo(), base, getById.uid());
</span><del>-
</del><ins>+
</ins><span class="cx"> gen.reportSlowPathCall(begin, call);
</span><del>-
</del><ins>+
</ins><span class="cx"> getById.m_slowPathDone.append(slowPathJIT.jump());
</span><span class="cx"> getById.m_generators.append(gen);
</span><span class="cx"> }
</span><span class="lines">@@ -369,6 +431,44 @@
</span><span class="cx"> putById.m_generators.append(gen);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+
+ for (unsigned i = state.checkIns.size(); i--;) {
+ CheckInDescriptor& checkIn = state.checkIns[i];
+
+ if (verboseCompilationEnabled())
+ dataLog("Handling checkIn stackmap #", checkIn.stackmapID(), "\n");
+
+ iter = recordMap.find(checkIn.stackmapID());
+ if (iter == recordMap.end()) {
+ // It was optimized out.
+ continue;
+ }
+
+ for (unsigned i = 0; i < iter->value.size(); ++i) {
+ StackMaps::Record& record = iter->value[i];
+ RegisterSet usedRegisters = usedRegistersFor(record);
+ GPRReg result = record.locations[0].directGPR();
+ GPRReg obj = record.locations[1].directGPR();
+ StructureStubInfo* stubInfo = codeBlock->addStubInfo();
+ stubInfo->codeOrigin = checkIn.codeOrigin();
+ stubInfo->patch.baseGPR = static_cast<int8_t>(obj);
+ stubInfo->patch.valueGPR = static_cast<int8_t>(result);
+ stubInfo->patch.usedRegisters = usedRegisters;
+ stubInfo->patch.spillMode = NeedToSpill;
+
+ MacroAssembler::Label begin = slowPathJIT.label();
+
+ MacroAssembler::Call slowCall = callOperation(
+ state, usedRegisters, slowPathJIT, checkIn.codeOrigin(), &exceptionTarget,
+ operationInOptimize, result, stubInfo, obj, checkIn.m_id);
+
+ checkIn.m_slowPathDone.append(slowPathJIT.jump());
+
+ checkIn.m_generators.append(CheckInGenerator(stubInfo, slowCall, begin));
+ }
+ }
+
</ins><span class="cx">
</span><span class="cx"> exceptionTarget.link(&slowPathJIT);
</span><span class="cx"> MacroAssembler::Jump exceptionJump = slowPathJIT.jump();
</span><span class="lines">@@ -388,6 +488,12 @@
</span><span class="cx"> state, codeBlock, generatedFunction, recordMap, state.putByIds[i],
</span><span class="cx"> sizeOfPutById());
</span><span class="cx"> }
</span><ins>+
+ for (unsigned i = state.checkIns.size(); i--;) {
+ generateCheckInICFastPath(
+ state, codeBlock, generatedFunction, recordMap, state.checkIns[i],
+ sizeOfCheckIn());
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Handling JS calls is weird: we need to ensure that we sort them by the PC in LLVM
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreftlFTLInlineCacheDescriptorh"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptor.h (170735 => 170736)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptor.h 2014-07-02 23:02:45 UTC (rev 170735)
+++ branches/ftlopt/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptor.h 2014-07-02 23:41:08 UTC (rev 170736)
</span><span class="lines">@@ -94,6 +94,35 @@
</span><span class="cx"> PutKind m_putKind;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+struct CheckInGenerator {
+ StructureStubInfo* m_stub;
+ MacroAssembler::Call m_slowCall;
+ MacroAssembler::Label m_beginLabel;
+
+ CheckInGenerator(StructureStubInfo* stub, MacroAssembler::Call slowCall, MacroAssembler::Label beginLabel)
+ : m_stub(stub)
+ , m_slowCall(slowCall)
+ , m_beginLabel(beginLabel)
+ {
+ }
+};
+
+class CheckInDescriptor : public InlineCacheDescriptor {
+public:
+ CheckInDescriptor() { }
+
+ CheckInDescriptor(unsigned stackmapID, CodeOrigin codeOrigin, const StringImpl* id)
+ : InlineCacheDescriptor(stackmapID, codeOrigin, nullptr)
+ , m_id(id)
+ {
+ }
+
+
+ const StringImpl* m_id;
+ Vector<CheckInGenerator> m_generators;
+};
+
+
</ins><span class="cx"> } } // namespace JSC::FTL
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(FTL_JIT)
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreftlFTLInlineCacheSizecpp"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/ftl/FTLInlineCacheSize.cpp (170735 => 170736)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/ftl/FTLInlineCacheSize.cpp 2014-07-02 23:02:45 UTC (rev 170735)
+++ branches/ftlopt/Source/JavaScriptCore/ftl/FTLInlineCacheSize.cpp 2014-07-02 23:41:08 UTC (rev 170736)
</span><span class="lines">@@ -61,6 +61,16 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+size_t sizeOfCheckIn()
+{
+#if CPU(ARM64)
+ return 4;
+#else
+ return 5;
+#endif
+}
+
+
</ins><span class="cx"> size_t sizeOfCall()
</span><span class="cx"> {
</span><span class="cx"> #if CPU(ARM64)
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreftlFTLInlineCacheSizeh"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/ftl/FTLInlineCacheSize.h (170735 => 170736)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/ftl/FTLInlineCacheSize.h 2014-07-02 23:02:45 UTC (rev 170735)
+++ branches/ftlopt/Source/JavaScriptCore/ftl/FTLInlineCacheSize.h 2014-07-02 23:41:08 UTC (rev 170736)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> size_t sizeOfGetById();
</span><span class="cx"> size_t sizeOfPutById();
</span><span class="cx"> size_t sizeOfCall();
</span><ins>+size_t sizeOfCheckIn();
</ins><span class="cx">
</span><span class="cx"> } } // namespace JSC::FTL
</span><span class="cx">
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreftlFTLIntrinsicRepositoryh"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h (170735 => 170736)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h 2014-07-02 23:02:45 UTC (rev 170735)
+++ branches/ftlopt/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h 2014-07-02 23:41:08 UTC (rev 170736)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> macro(J_JITOperation_E, functionType(int64, intPtr)) \
</span><span class="cx"> macro(J_JITOperation_EA, functionType(int64, intPtr, intPtr)) \
</span><span class="cx"> macro(J_JITOperation_EAZ, functionType(int64, intPtr, intPtr, int32)) \
</span><ins>+ macro(J_JITOperation_ECJ, functionType(int64, intPtr, intPtr, int64)) \
</ins><span class="cx"> macro(J_JITOperation_EDA, functionType(int64, intPtr, doubleType, intPtr)) \
</span><span class="cx"> macro(J_JITOperation_EJ, functionType(int64, intPtr, int64)) \
</span><span class="cx"> macro(J_JITOperation_EJA, functionType(int64, intPtr, int64, intPtr)) \
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (170735 => 170736)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-07-02 23:02:45 UTC (rev 170735)
+++ branches/ftlopt/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-07-02 23:41:08 UTC (rev 170736)
</span><span class="lines">@@ -478,6 +478,9 @@
</span><span class="cx"> compileGetById();
</span><span class="cx"> break;
</span><span class="cx"> case PutByIdDirect:
</span><ins>+ case In:
+ compileIn();
+ break;
</ins><span class="cx"> case PutById:
</span><span class="cx"> compilePutById();
</span><span class="cx"> break;
</span><span class="lines">@@ -3930,6 +3933,33 @@
</span><span class="cx"> setBoolean(m_out.notNull(pointerResult));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void compileIn()
+ {
+ Edge base = m_node->child2();
+ LValue cell = lowCell(base);
+ speculateObject(base, cell);
+ if (JSString* string = m_node->child1()->dynamicCastConstant<JSString*>()) {
+ if (string->tryGetValueImpl() && string->tryGetValueImpl()->isAtomic()) {
+
+ const StringImpl* str = string->tryGetValueImpl();
+ unsigned stackmapID = m_stackmapIDs++;
+
+ LValue call = m_out.call(
+ m_out.patchpointInt64Intrinsic(),
+ m_out.constInt64(stackmapID), m_out.constInt32(sizeOfCheckIn()),
+ constNull(m_out.ref8), m_out.constInt32(1), cell);
+
+ setInstructionCallingConvention(call, LLVMAnyRegCallConv);
+
+ m_ftlState.checkIns.append(CheckInDescriptor(stackmapID, m_node->origin.semantic, str));
+ setJSValue(call);
+ return;
+ }
+ }
+
+ setJSValue(vmCall(m_out.operation(operationGenericIn), m_callFrame, cell, lowJSValue(m_node->child1())));
+ }
+
</ins><span class="cx"> void compileCheckHasInstance()
</span><span class="cx"> {
</span><span class="cx"> speculate(
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreftlFTLSlowPathCallcpp"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/ftl/FTLSlowPathCall.cpp (170735 => 170736)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/ftl/FTLSlowPathCall.cpp 2014-07-02 23:02:45 UTC (rev 170735)
+++ branches/ftlopt/Source/JavaScriptCore/ftl/FTLSlowPathCall.cpp 2014-07-02 23:41:08 UTC (rev 170736)
</span><span class="lines">@@ -176,6 +176,19 @@
</span><span class="cx"> MacroAssembler::Call callOperation(
</span><span class="cx"> State& state, const RegisterSet& usedRegisters, CCallHelpers& jit,
</span><span class="cx"> CodeOrigin codeOrigin, MacroAssembler::JumpList* exceptionTarget,
</span><ins>+ J_JITOperation_ESsiCI operation, GPRReg result, StructureStubInfo* stubInfo,
+ GPRReg object, const StringImpl* uid)
+{
+ storeCodeOrigin(state, jit, codeOrigin);
+ CallContext context(state, usedRegisters, jit, 4, result);
+ jit.setupArgumentsWithExecState(
+ CCallHelpers::TrustedImmPtr(stubInfo), object, CCallHelpers::TrustedImmPtr(uid));
+ return context.makeCall(bitwise_cast<void*>(operation), exceptionTarget);
+}
+
+MacroAssembler::Call callOperation(
+ State& state, const RegisterSet& usedRegisters, CCallHelpers& jit,
+ CodeOrigin codeOrigin, MacroAssembler::JumpList* exceptionTarget,
</ins><span class="cx"> J_JITOperation_ESsiJI operation, GPRReg result, StructureStubInfo* stubInfo,
</span><span class="cx"> GPRReg object, StringImpl* uid)
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreftlFTLSlowPathCallh"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/ftl/FTLSlowPathCall.h (170735 => 170736)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/ftl/FTLSlowPathCall.h 2014-07-02 23:02:45 UTC (rev 170735)
+++ branches/ftlopt/Source/JavaScriptCore/ftl/FTLSlowPathCall.h 2014-07-02 23:41:08 UTC (rev 170736)
</span><span class="lines">@@ -59,6 +59,10 @@
</span><span class="cx">
</span><span class="cx"> MacroAssembler::Call callOperation(
</span><span class="cx"> State&, const RegisterSet&, CCallHelpers&, CodeOrigin, CCallHelpers::JumpList*,
</span><ins>+ J_JITOperation_ESsiCI, GPRReg, StructureStubInfo*, GPRReg,
+ const StringImpl*);
+MacroAssembler::Call callOperation(
+ State&, const RegisterSet&, CCallHelpers&, CodeOrigin, CCallHelpers::JumpList*,
</ins><span class="cx"> J_JITOperation_ESsiJI, GPRReg result, StructureStubInfo*, GPRReg object,
</span><span class="cx"> StringImpl* uid);
</span><span class="cx"> MacroAssembler::Call callOperation(
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreftlFTLStateh"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/ftl/FTLState.h (170735 => 170736)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/ftl/FTLState.h 2014-07-02 23:02:45 UTC (rev 170735)
+++ branches/ftlopt/Source/JavaScriptCore/ftl/FTLState.h 2014-07-02 23:41:08 UTC (rev 170736)
</span><span class="lines">@@ -73,6 +73,7 @@
</span><span class="cx"> unsigned capturedStackmapID;
</span><span class="cx"> SegmentedVector<GetByIdDescriptor> getByIds;
</span><span class="cx"> SegmentedVector<PutByIdDescriptor> putByIds;
</span><ins>+ SegmentedVector<CheckInDescriptor> checkIns;
</ins><span class="cx"> Vector<JSCall> jsCalls;
</span><span class="cx"> Vector<CString> codeSectionNames;
</span><span class="cx"> Vector<CString> dataSectionNames;
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCorejitJITOperationsh"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/jit/JITOperations.h (170735 => 170736)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/jit/JITOperations.h 2014-07-02 23:02:45 UTC (rev 170735)
+++ branches/ftlopt/Source/JavaScriptCore/jit/JITOperations.h 2014-07-02 23:41:08 UTC (rev 170736)
</span><span class="lines">@@ -201,9 +201,9 @@
</span><span class="cx"> EncodedJSValue JIT_OPERATION operationGetById(ExecState*, StructureStubInfo*, EncodedJSValue, StringImpl*) WTF_INTERNAL;
</span><span class="cx"> EncodedJSValue JIT_OPERATION operationGetByIdBuildList(ExecState*, StructureStubInfo*, EncodedJSValue, StringImpl*) WTF_INTERNAL;
</span><span class="cx"> EncodedJSValue JIT_OPERATION operationGetByIdOptimize(ExecState*, StructureStubInfo*, EncodedJSValue, StringImpl*) WTF_INTERNAL;
</span><del>-EncodedJSValue JIT_OPERATION operationInOptimize(ExecState*, StructureStubInfo*, JSCell*, StringImpl*);
-EncodedJSValue JIT_OPERATION operationIn(ExecState*, StructureStubInfo*, JSCell*, StringImpl*);
-EncodedJSValue JIT_OPERATION operationGenericIn(ExecState*, JSCell*, EncodedJSValue);
</del><ins>+EncodedJSValue JIT_OPERATION operationInOptimize(ExecState*, StructureStubInfo*, JSCell*, StringImpl*) WTF_INTERNAL;
+EncodedJSValue JIT_OPERATION operationIn(ExecState*, StructureStubInfo*, JSCell*, StringImpl*) WTF_INTERNAL;
+EncodedJSValue JIT_OPERATION operationGenericIn(ExecState*, JSCell*, EncodedJSValue) WTF_INTERNAL;
</ins><span class="cx"> EncodedJSValue JIT_OPERATION operationCallGetter(ExecState*, JSCell*, JSCell*) WTF_INTERNAL;
</span><span class="cx"> void JIT_OPERATION operationPutByIdStrict(ExecState*, StructureStubInfo*, EncodedJSValue encodedValue, EncodedJSValue encodedBase, StringImpl*) WTF_INTERNAL;
</span><span class="cx"> void JIT_OPERATION operationPutByIdNonStrict(ExecState*, StructureStubInfo*, EncodedJSValue encodedValue, EncodedJSValue encodedBase, StringImpl*) WTF_INTERNAL;
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoretestsstressftlcheckinvariablejs"></a>
<div class="addfile"><h4>Added: branches/ftlopt/Source/JavaScriptCore/tests/stress/ftl-checkin-variable.js (0 => 170736)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/tests/stress/ftl-checkin-variable.js (rev 0)
+++ branches/ftlopt/Source/JavaScriptCore/tests/stress/ftl-checkin-variable.js 2014-07-02 23:41:08 UTC (rev 170736)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+function foo(l,x){
+ var t = l in x;
+ return t;
+}
+
+noInline(foo);
+
+var r;
+for (var i = 0; i < 1000000; ++i) {
+ var z = { 'y' : i, 's' : i + 1 };
+ z.s = 10;
+ r = foo("s",z);
+}
+
+if (!r) {
+ print ("Error: " + r);
+}
</ins></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoretestsstressftlcheckinjs"></a>
<div class="addfile"><h4>Added: branches/ftlopt/Source/JavaScriptCore/tests/stress/ftl-checkin.js (0 => 170736)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/tests/stress/ftl-checkin.js (rev 0)
+++ branches/ftlopt/Source/JavaScriptCore/tests/stress/ftl-checkin.js 2014-07-02 23:41:08 UTC (rev 170736)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+function foo(x){
+ var t = "s" in x;
+ return t;
+}
+
+noInline(foo);
+
+var r;
+for (var i = 0; i < 1000000; ++i) {
+ var z = { 'y' : i, 's' : i + 1 };
+ z.s = 10;
+ r = foo(z);
+}
+
+if (!r) {
+ print ("Error: " + r);
+}
</ins></span></pre>
</div>
</div>
</body>
</html>