<!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>[184152] 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/184152">184152</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-11 22:48:57 -0700 (Mon, 11 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/184123">r184123</a>.
https://bugs.webkit.org/show_bug.cgi?id=144899
Seems to have introduced flaky crashes in many JS tests
(Requested by rniwa on #webkit).
Reverted changeset:
"REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/180595">r180595</a>): same-callee profiling no longer works"
https://bugs.webkit.org/show_bug.cgi?id=144787
http://trac.webkit.org/changeset/184123</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeBytecodeListjson">trunk/Source/JavaScriptCore/bytecode/BytecodeList.json</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeBytecodeUseDefh">trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp">trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOpcodescpp">trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOpcodes32_64cpp">trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCommonSlowPathscpp">trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCellh">trunk/Source/JavaScriptCore/runtime/JSCell.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeWriteBarrierh">trunk/Source/JavaScriptCore/runtime/WriteBarrier.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstresscreatethiswithcalleevariantsjs">trunk/Source/JavaScriptCore/tests/stress/create-this-with-callee-variants.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (184151 => 184152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-05-12 05:38:11 UTC (rev 184151)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-05-12 05:48:57 UTC (rev 184152)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-05-11 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r184123.
+ https://bugs.webkit.org/show_bug.cgi?id=144899
+
+ Seems to have introduced flaky crashes in many JS tests
+ (Requested by rniwa on #webkit).
+
+ Reverted changeset:
+
+ "REGRESSION(r180595): same-callee profiling no longer works"
+ https://bugs.webkit.org/show_bug.cgi?id=144787
+ http://trac.webkit.org/changeset/184123
+
</ins><span class="cx"> 2015-05-11 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Move Windows build target to Windows 7 (or newer)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeBytecodeListjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/BytecodeList.json (184151 => 184152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/BytecodeList.json 2015-05-12 05:38:11 UTC (rev 184151)
+++ trunk/Source/JavaScriptCore/bytecode/BytecodeList.json 2015-05-12 05:48:57 UTC (rev 184152)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> { "name" : "op_create_direct_arguments", "length" : 2 },
</span><span class="cx"> { "name" : "op_create_scoped_arguments", "length" : 3 },
</span><span class="cx"> { "name" : "op_create_out_of_band_arguments", "length" : 2 },
</span><del>- { "name" : "op_create_this", "length" : 5 },
</del><ins>+ { "name" : "op_create_this", "length" : 4 },
</ins><span class="cx"> { "name" : "op_to_this", "length" : 4 },
</span><span class="cx"> { "name" : "op_check_tdz", "length" : 2 },
</span><span class="cx"> { "name" : "op_new_object", "length" : 4 },
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeBytecodeUseDefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h (184151 => 184152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h 2015-05-12 05:38:11 UTC (rev 184151)
+++ trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h 2015-05-12 05:48:57 UTC (rev 184152)
</span><span class="lines">@@ -142,6 +142,7 @@
</span><span class="cx"> case op_not:
</span><span class="cx"> case op_mov:
</span><span class="cx"> case op_new_array_with_size:
</span><ins>+ case op_create_this:
</ins><span class="cx"> case op_del_by_id:
</span><span class="cx"> case op_unsigned:
</span><span class="cx"> case op_new_func:
</span><span class="lines">@@ -182,11 +183,6 @@
</span><span class="cx"> functor(codeBlock, instruction, opcodeID, instruction[3].u.operand);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- case op_create_this: {
- functor(codeBlock, instruction, opcodeID, instruction[2].u.operand);
- functor(codeBlock, instruction, opcodeID, instruction[4].u.operand);
- return;
- }
</del><span class="cx"> case op_has_structure_property:
</span><span class="cx"> case op_construct_varargs:
</span><span class="cx"> case op_call_varargs: {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (184151 => 184152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-05-12 05:38:11 UTC (rev 184151)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-05-12 05:48:57 UTC (rev 184152)
</span><span class="lines">@@ -795,9 +795,8 @@
</span><span class="cx"> int r0 = (++it)->u.operand;
</span><span class="cx"> int r1 = (++it)->u.operand;
</span><span class="cx"> unsigned inferredInlineCapacity = (++it)->u.operand;
</span><del>- unsigned cachedFunction = (++it)->u.operand;
</del><span class="cx"> printLocationAndOp(out, exec, location, it, "create_this");
</span><del>- out.printf("%s, %s, %u, %u", registerName(r0).data(), registerName(r1).data(), inferredInlineCapacity, cachedFunction);
</del><ins>+ out.printf("%s, %s, %u", registerName(r0).data(), registerName(r1).data(), inferredInlineCapacity);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case op_to_this: {
</span><span class="lines">@@ -2554,18 +2553,6 @@
</span><span class="cx"> curInstruction[3].u.toThisStatus = merge(
</span><span class="cx"> curInstruction[3].u.toThisStatus, ToThisClearedByGC);
</span><span class="cx"> break;
</span><del>- case op_create_this: {
- auto& cacheWriteBarrier = curInstruction[4].u.jsCell;
- if (!cacheWriteBarrier || cacheWriteBarrier.unvalidatedGet() == JSCell::seenMultipleCalleeObjects())
- break;
- JSCell* cachedFunction = cacheWriteBarrier.get();
- if (Heap::isMarked(cachedFunction))
- break;
- if (Options::verboseOSR())
- dataLogF("Clearing LLInt create_this with cached callee %p.\n", cachedFunction);
- cacheWriteBarrier.clear();
- break;
- }
</del><span class="cx"> case op_resolve_scope: {
</span><span class="cx"> // Right now this isn't strictly necessary. Any symbol tables that this will refer to
</span><span class="cx"> // are for outer functions, and we refer to those functions strongly, and they refer
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (184151 => 184152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2015-05-12 05:38:11 UTC (rev 184151)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2015-05-12 05:48:57 UTC (rev 184152)
</span><span class="lines">@@ -1653,12 +1653,10 @@
</span><span class="cx"> size_t begin = instructions().size();
</span><span class="cx"> m_staticPropertyAnalyzer.createThis(m_thisRegister.index(), begin + 3);
</span><span class="cx">
</span><del>- m_codeBlock->addPropertyAccessInstruction(instructions().size());
</del><span class="cx"> emitOpcode(op_create_this);
</span><span class="cx"> instructions().append(m_thisRegister.index());
</span><span class="cx"> instructions().append(m_thisRegister.index());
</span><span class="cx"> instructions().append(0);
</span><del>- instructions().append(0);
</del><span class="cx"> return dst;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (184151 => 184152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-05-12 05:38:11 UTC (rev 184151)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-05-12 05:48:57 UTC (rev 184152)
</span><span class="lines">@@ -2669,24 +2669,8 @@
</span><span class="cx"> case op_create_this: {
</span><span class="cx"> int calleeOperand = currentInstruction[2].u.operand;
</span><span class="cx"> Node* callee = get(VirtualRegister(calleeOperand));
</span><del>-
- JSFunction* function = callee->dynamicCastConstant<JSFunction*>();
- if (!function) {
- JSCell* cachedFunction = currentInstruction[4].u.jsCell.unvalidatedGet();
- RELEASE_ASSERT(cachedFunction); // LLint and BaselineJIT always set it to a JSFunction* or seenMultipleCalleeObjects().
- if (cachedFunction != JSCell::seenMultipleCalleeObjects()) {
- ASSERT(cachedFunction->inherits(JSFunction::info()));
-
- FrozenValue* frozen = m_graph.freeze(cachedFunction);
- addToGraph(CheckCell, OpInfo(frozen), callee);
- set(VirtualRegister(currentInstruction[1].u.operand), addToGraph(JSConstant, OpInfo(frozen)));
-
- function = static_cast<JSFunction*>(cachedFunction);
- }
- }
-
</del><span class="cx"> bool alreadyEmitted = false;
</span><del>- if (function) {
</del><ins>+ if (JSFunction* function = callee->dynamicCastConstant<JSFunction*>()) {
</ins><span class="cx"> if (FunctionRareData* rareData = function->rareData()) {
</span><span class="cx"> if (Structure* structure = rareData->allocationStructure()) {
</span><span class="cx"> m_graph.freeze(rareData);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp (184151 => 184152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp 2015-05-12 05:38:11 UTC (rev 184151)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp 2015-05-12 05:48:57 UTC (rev 184152)
</span><span class="lines">@@ -705,13 +705,11 @@
</span><span class="cx"> void JIT::emit_op_create_this(Instruction* currentInstruction)
</span><span class="cx"> {
</span><span class="cx"> int callee = currentInstruction[2].u.operand;
</span><del>- WriteBarrierBase<JSCell>* cachedFunction = &currentInstruction[4].u.jsCell;
</del><span class="cx"> RegisterID calleeReg = regT0;
</span><del>- RegisterID rareDataReg = regT4;
</del><ins>+ RegisterID rareDataReg = regT0;
</ins><span class="cx"> RegisterID resultReg = regT0;
</span><span class="cx"> RegisterID allocatorReg = regT1;
</span><span class="cx"> RegisterID structureReg = regT2;
</span><del>- RegisterID cachedFunctionReg = regT4;
</del><span class="cx"> RegisterID scratchReg = regT3;
</span><span class="cx">
</span><span class="cx"> emitGetVirtualRegister(callee, calleeReg);
</span><span class="lines">@@ -721,11 +719,6 @@
</span><span class="cx"> loadPtr(Address(rareDataReg, FunctionRareData::offsetOfAllocationProfile() + ObjectAllocationProfile::offsetOfStructure()), structureReg);
</span><span class="cx"> addSlowCase(branchTestPtr(Zero, allocatorReg));
</span><span class="cx">
</span><del>- loadPtr(cachedFunction, cachedFunctionReg);
- Jump hasSeenMultipleCallees = branchPtr(Equal, cachedFunctionReg, TrustedImmPtr(JSCell::seenMultipleCalleeObjects()));
- addSlowCase(branchPtr(NotEqual, calleeReg, cachedFunctionReg));
- hasSeenMultipleCallees.link(this);
-
</del><span class="cx"> emitAllocateJSObject(allocatorReg, structureReg, resultReg, scratchReg);
</span><span class="cx"> emitPutVirtualRegister(currentInstruction[1].u.operand);
</span><span class="cx"> }
</span><span class="lines">@@ -735,7 +728,6 @@
</span><span class="cx"> linkSlowCase(iter); // doesn't have rare data
</span><span class="cx"> linkSlowCase(iter); // doesn't have an allocation profile
</span><span class="cx"> linkSlowCase(iter); // allocation failed
</span><del>- linkSlowCase(iter); // cached function didn't match
</del><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_create_this);
</span><span class="cx"> slowPathCall.call();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodes32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp (184151 => 184152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2015-05-12 05:38:11 UTC (rev 184151)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2015-05-12 05:48:57 UTC (rev 184152)
</span><span class="lines">@@ -936,13 +936,11 @@
</span><span class="cx"> void JIT::emit_op_create_this(Instruction* currentInstruction)
</span><span class="cx"> {
</span><span class="cx"> int callee = currentInstruction[2].u.operand;
</span><del>- WriteBarrierBase<JSCell>* cachedFunction = &currentInstruction[4].u.jsCell;
</del><span class="cx"> RegisterID calleeReg = regT0;
</span><del>- RegisterID rareDataReg = regT4;
</del><ins>+ RegisterID rareDataReg = regT0;
</ins><span class="cx"> RegisterID resultReg = regT0;
</span><span class="cx"> RegisterID allocatorReg = regT1;
</span><span class="cx"> RegisterID structureReg = regT2;
</span><del>- RegisterID cachedFunctionReg = regT4;
</del><span class="cx"> RegisterID scratchReg = regT3;
</span><span class="cx">
</span><span class="cx"> emitLoadPayload(callee, calleeReg);
</span><span class="lines">@@ -952,11 +950,6 @@
</span><span class="cx"> loadPtr(Address(rareDataReg, FunctionRareData::offsetOfAllocationProfile() + ObjectAllocationProfile::offsetOfStructure()), structureReg);
</span><span class="cx"> addSlowCase(branchTestPtr(Zero, allocatorReg));
</span><span class="cx">
</span><del>- loadPtr(cachedFunction, cachedFunctionReg);
- Jump hasSeenMultipleCallees = branchPtr(Equal, cachedFunctionReg, TrustedImmPtr(JSCell::seenMultipleCalleeObjects()));
- addSlowCase(branchPtr(NotEqual, calleeReg, cachedFunctionReg));
- hasSeenMultipleCallees.link(this);
-
</del><span class="cx"> emitAllocateJSObject(allocatorReg, structureReg, resultReg, scratchReg);
</span><span class="cx"> emitStoreCell(currentInstruction[1].u.operand, resultReg);
</span><span class="cx"> }
</span><span class="lines">@@ -966,7 +959,6 @@
</span><span class="cx"> linkSlowCase(iter); // doesn't have rare data
</span><span class="cx"> linkSlowCase(iter); // doesn't have an allocation profile
</span><span class="cx"> linkSlowCase(iter); // allocation failed
</span><del>- linkSlowCase(iter); // cached function didn't match
</del><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_create_this);
</span><span class="cx"> slowPathCall.call();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (184151 => 184152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2015-05-12 05:38:11 UTC (rev 184151)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2015-05-12 05:48:57 UTC (rev 184152)
</span><span class="lines">@@ -745,19 +745,15 @@
</span><span class="cx"> loadp FunctionRareData::m_allocationProfile + ObjectAllocationProfile::m_allocator[t4], t1
</span><span class="cx"> loadp FunctionRareData::m_allocationProfile + ObjectAllocationProfile::m_structure[t4], t2
</span><span class="cx"> btpz t1, .opCreateThisSlow
</span><del>- loadpFromInstruction(4, t4)
- bpeq t4, 1, .hasSeenMultipleCallee
- bpneq t4, t0, .opCreateThisSlow
-.hasSeenMultipleCallee:
</del><span class="cx"> allocateJSObject(t1, t2, t0, t3, .opCreateThisSlow)
</span><span class="cx"> loadi 4[PC], t1
</span><span class="cx"> storei CellTag, TagOffset[cfr, t1, 8]
</span><span class="cx"> storei t0, PayloadOffset[cfr, t1, 8]
</span><del>- dispatch(5)
</del><ins>+ dispatch(4)
</ins><span class="cx">
</span><span class="cx"> .opCreateThisSlow:
</span><span class="cx"> callSlowPath(_slow_path_create_this)
</span><del>- dispatch(5)
</del><ins>+ dispatch(4)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> _llint_op_to_this:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (184151 => 184152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2015-05-12 05:38:11 UTC (rev 184151)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2015-05-12 05:48:57 UTC (rev 184152)
</span><span class="lines">@@ -631,18 +631,14 @@
</span><span class="cx"> loadp FunctionRareData::m_allocationProfile + ObjectAllocationProfile::m_allocator[t4], t1
</span><span class="cx"> loadp FunctionRareData::m_allocationProfile + ObjectAllocationProfile::m_structure[t4], t2
</span><span class="cx"> btpz t1, .opCreateThisSlow
</span><del>- loadpFromInstruction(4, t4)
- bpeq t4, 1, .hasSeenMultipleCallee
- bpneq t4, t0, .opCreateThisSlow
-.hasSeenMultipleCallee:
</del><span class="cx"> allocateJSObject(t1, t2, t0, t3, .opCreateThisSlow)
</span><span class="cx"> loadisFromInstruction(1, t1)
</span><span class="cx"> storeq t0, [cfr, t1, 8]
</span><del>- dispatch(5)
</del><ins>+ dispatch(4)
</ins><span class="cx">
</span><span class="cx"> .opCreateThisSlow:
</span><span class="cx"> callSlowPath(_slow_path_create_this)
</span><del>- dispatch(5)
</del><ins>+ dispatch(4)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> _llint_op_to_this:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCommonSlowPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp (184151 => 184152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp 2015-05-12 05:38:11 UTC (rev 184151)
+++ trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp 2015-05-12 05:48:57 UTC (rev 184152)
</span><span class="lines">@@ -235,12 +235,6 @@
</span><span class="cx"> ASSERT(constructor->methodTable()->getConstructData(constructor, constructData) == ConstructTypeJS);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- auto& cacheWriteBarrier = pc[4].u.jsCell;
- if (!cacheWriteBarrier)
- cacheWriteBarrier.set(exec->vm(), exec->codeBlock()->ownerExecutable(), constructor);
- else if (cacheWriteBarrier.unvalidatedGet() != JSCell::seenMultipleCalleeObjects() && cacheWriteBarrier.get() != constructor)
- cacheWriteBarrier.setWithoutWriteBarrier(JSCell::seenMultipleCalleeObjects());
-
</del><span class="cx"> size_t inlineCapacity = pc[3].u.operand;
</span><span class="cx"> Structure* structure = constructor->rareData(exec, inlineCapacity)->allocationProfile()->structure();
</span><span class="cx"> RETURN(constructEmptyObject(exec, structure));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCellh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSCell.h (184151 => 184152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCell.h 2015-05-12 05:38:11 UTC (rev 184151)
+++ trunk/Source/JavaScriptCore/runtime/JSCell.h 2015-05-12 05:48:57 UTC (rev 184152)
</span><span class="lines">@@ -74,8 +74,6 @@
</span><span class="cx">
</span><span class="cx"> static const bool needsDestruction = false;
</span><span class="cx">
</span><del>- static JSCell* seenMultipleCalleeObjects() { return bitwise_cast<JSCell*>(static_cast<uintptr_t>(1)); }
-
</del><span class="cx"> enum CreatingEarlyCellTag { CreatingEarlyCell };
</span><span class="cx"> JSCell(CreatingEarlyCellTag);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeWriteBarrierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/WriteBarrier.h (184151 => 184152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/WriteBarrier.h 2015-05-12 05:38:11 UTC (rev 184151)
+++ trunk/Source/JavaScriptCore/runtime/WriteBarrier.h 2015-05-12 05:48:57 UTC (rev 184152)
</span><span class="lines">@@ -126,7 +126,9 @@
</span><span class="cx"> this->m_cell = reinterpret_cast<JSCell*>(value);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(GC_VALIDATION)
</ins><span class="cx"> T* unvalidatedGet() const { return reinterpret_cast<T*>(static_cast<void*>(m_cell)); }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> JSCell* m_cell;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresscreatethiswithcalleevariantsjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/tests/stress/create-this-with-callee-variants.js (184151 => 184152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/create-this-with-callee-variants.js 2015-05-12 05:38:11 UTC (rev 184151)
+++ trunk/Source/JavaScriptCore/tests/stress/create-this-with-callee-variants.js 2015-05-12 05:48:57 UTC (rev 184152)
</span><span class="lines">@@ -1,18 +0,0 @@
</span><del>-function createInLoop(x, count) {
- noInline(x)
- for (var i = 0; i < 5000; i++) {
- var obj = new x;
- if (!(obj instanceof x))
- throw "Failed to instantiate the right object";
- }
-}
-
-function y() { return function () {} }
-
-createInLoop(y());
-
-function z() { return function () {} }
-
-createInLoop(z());
-createInLoop(z());
-createInLoop(z());
</del></span></pre>
</div>
</div>
</body>
</html>