<!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>[202633] 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/202633">202633</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-29 11:25:40 -0700 (Wed, 29 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/202627">r202627</a>.
https://bugs.webkit.org/show_bug.cgi?id=159266
patch is broken on arm (Requested by keith_miller on #webkit).
Reverted changeset:
"LLInt should support other types of prototype GetById
caching."
https://bugs.webkit.org/show_bug.cgi?id=158083
http://trac.webkit.org/changeset/202627</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="#trunkSourceJavaScriptCorebytecodeGetByIdStatuscpp">trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh">trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp">trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGCapabilitiescpp">trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITcpp">trunk/Source/JavaScriptCore/jit/JIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntSlowPathscpp">trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntSlowPathsh">trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.h</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreterasm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm</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="#trunkSourceJavaScriptCoreruntimeIdentifierh">trunk/Source/JavaScriptCore/runtime/Identifier.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressllintgetbyidprotoaccessorjs">trunk/Source/JavaScriptCore/tests/stress/llint-get-by-id-proto-accessor.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressllintgetbyidprotocustomjs">trunk/Source/JavaScriptCore/tests/stress/llint-get-by-id-proto-custom.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (202632 => 202633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-06-29 18:25:40 UTC (rev 202633)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-06-29 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r202627.
+ https://bugs.webkit.org/show_bug.cgi?id=159266
+
+ patch is broken on arm (Requested by keith_miller on #webkit).
+
+ Reverted changeset:
+
+ "LLInt should support other types of prototype GetById
+ caching."
+ https://bugs.webkit.org/show_bug.cgi?id=158083
+ http://trac.webkit.org/changeset/202627
+
</ins><span class="cx"> 2016-06-29 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Fix small issues of TypedArray prototype
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeBytecodeListjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/BytecodeList.json (202632 => 202633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/BytecodeList.json 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/JavaScriptCore/bytecode/BytecodeList.json 2016-06-29 18:25:40 UTC (rev 202633)
</span><span class="lines">@@ -64,8 +64,6 @@
</span><span class="cx"> { "name" : "op_get_by_id", "length" : 9 },
</span><span class="cx"> { "name" : "op_get_by_id_proto_load", "length" : 9 },
</span><span class="cx"> { "name" : "op_get_by_id_unset", "length" : 9 },
</span><del>- { "name" : "op_get_by_id_proto_accessor", "length" : 9 },
- { "name" : "op_get_by_id_proto_custom", "length" : 9 },
</del><span class="cx"> { "name" : "op_get_by_id_with_this", "length" : 5 },
</span><span class="cx"> { "name" : "op_get_by_val_with_this", "length" : 5 },
</span><span class="cx"> { "name" : "op_try_get_by_id", "length" : 4 },
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeBytecodeUseDefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h (202632 => 202633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h 2016-06-29 18:25:40 UTC (rev 202633)
</span><span class="lines">@@ -164,8 +164,6 @@
</span><span class="cx"> case op_get_by_id:
</span><span class="cx"> case op_get_by_id_proto_load:
</span><span class="cx"> case op_get_by_id_unset:
</span><del>- case op_get_by_id_proto_accessor:
- case op_get_by_id_proto_custom:
</del><span class="cx"> case op_get_array_length:
</span><span class="cx"> case op_typeof:
</span><span class="cx"> case op_is_empty:
</span><span class="lines">@@ -405,8 +403,6 @@
</span><span class="cx"> case op_get_by_id:
</span><span class="cx"> case op_get_by_id_proto_load:
</span><span class="cx"> case op_get_by_id_unset:
</span><del>- case op_get_by_id_proto_accessor:
- case op_get_by_id_proto_custom:
</del><span class="cx"> case op_get_by_id_with_this:
</span><span class="cx"> case op_get_by_val_with_this:
</span><span class="cx"> case op_get_array_length:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (202632 => 202633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2016-06-29 18:25:40 UTC (rev 202633)
</span><span class="lines">@@ -354,12 +354,6 @@
</span><span class="cx"> case op_get_by_id_unset:
</span><span class="cx"> op = "get_by_id_unset";
</span><span class="cx"> break;
</span><del>- case op_get_by_id_proto_accessor:
- op = "op_get_by_id_proto_accessor";
- break;
- case op_get_by_id_proto_custom:
- op = "op_get_by_id_proto_custom";
- break;
</del><span class="cx"> case op_get_array_length:
</span><span class="cx"> op = "array_length";
</span><span class="cx"> break;
</span><span class="lines">@@ -1143,8 +1137,6 @@
</span><span class="cx"> case op_get_by_id:
</span><span class="cx"> case op_get_by_id_proto_load:
</span><span class="cx"> case op_get_by_id_unset:
</span><del>- case op_get_by_id_proto_accessor:
- case op_get_by_id_proto_custom:
</del><span class="cx"> case op_get_array_length: {
</span><span class="cx"> printGetByIdOp(out, exec, location, it);
</span><span class="cx"> printGetByIdCacheStatus(out, exec, location, stubInfos);
</span><span class="lines">@@ -2804,9 +2796,7 @@
</span><span class="cx"> switch (interpreter->getOpcodeID(curInstruction[0].u.opcode)) {
</span><span class="cx"> case op_get_by_id:
</span><span class="cx"> case op_get_by_id_proto_load:
</span><del>- case op_get_by_id_unset:
- case op_get_by_id_proto_accessor:
- case op_get_by_id_proto_custom: {
</del><ins>+ case op_get_by_id_unset: {
</ins><span class="cx"> StructureID oldStructureID = curInstruction[4].u.structureID;
</span><span class="cx"> if (!oldStructureID || Heap::isMarked(m_vm->heap.structureIDTable().get(oldStructureID)))
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeGetByIdStatuscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp (202632 => 202633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp 2016-06-29 18:25:40 UTC (rev 202633)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> Opcode opcode = instruction[0].u.opcode;
</span><span class="cx">
</span><del>- ASSERT(opcode == LLInt::getOpcode(op_get_array_length) || opcode == LLInt::getOpcode(op_try_get_by_id) || opcode == LLInt::getOpcode(op_get_by_id_proto_load) || opcode == LLInt::getOpcode(op_get_by_id) || opcode == LLInt::getOpcode(op_get_by_id_unset) || opcode == LLInt::getOpcode(op_get_by_id_proto_accessor) || opcode == LLInt::getOpcode(op_get_by_id_proto_custom));
</del><ins>+ ASSERT(opcode == LLInt::getOpcode(op_get_array_length) || opcode == LLInt::getOpcode(op_try_get_by_id) || opcode == LLInt::getOpcode(op_get_by_id_proto_load) || opcode == LLInt::getOpcode(op_get_by_id) || opcode == LLInt::getOpcode(op_get_by_id_unset));
</ins><span class="cx">
</span><span class="cx"> // FIXME: We should not just bail if we see a try_get_by_id or a get_by_id_proto_load.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=158039
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h (202632 => 202633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2016-06-29 18:25:40 UTC (rev 202633)
</span><span class="lines">@@ -107,7 +107,6 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class UnlinkedCodeBlock : public JSCell {
</span><del>- friend class LLIntOffsetsExtractor;
</del><span class="cx"> public:
</span><span class="cx"> typedef JSCell Base;
</span><span class="cx"> static const unsigned StructureFlags = Base::StructureFlags;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (202632 => 202633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2016-06-29 18:25:40 UTC (rev 202633)
</span><span class="lines">@@ -4145,8 +4145,6 @@
</span><span class="cx"> case op_get_by_id:
</span><span class="cx"> case op_get_by_id_proto_load:
</span><span class="cx"> case op_get_by_id_unset:
</span><del>- case op_get_by_id_proto_accessor:
- case op_get_by_id_proto_custom:
</del><span class="cx"> case op_get_array_length: {
</span><span class="cx"> SpeculatedType prediction = getPrediction();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp (202632 => 202633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp 2016-06-29 18:25:40 UTC (rev 202633)
</span><span class="lines">@@ -158,8 +158,6 @@
</span><span class="cx"> case op_get_by_id:
</span><span class="cx"> case op_get_by_id_proto_load:
</span><span class="cx"> case op_get_by_id_unset:
</span><del>- case op_get_by_id_proto_accessor:
- case op_get_by_id_proto_custom:
</del><span class="cx"> case op_get_by_id_with_this:
</span><span class="cx"> case op_get_by_val_with_this:
</span><span class="cx"> case op_get_array_length:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JIT.cpp (202632 => 202633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JIT.cpp 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/JavaScriptCore/jit/JIT.cpp 2016-06-29 18:25:40 UTC (rev 202633)
</span><span class="lines">@@ -250,8 +250,6 @@
</span><span class="cx"> case op_get_array_length:
</span><span class="cx"> case op_get_by_id_proto_load:
</span><span class="cx"> case op_get_by_id_unset:
</span><del>- case op_get_by_id_proto_accessor:
- case op_get_by_id_proto_custom:
</del><span class="cx"> DEFINE_OP(op_get_by_id)
</span><span class="cx"> DEFINE_OP(op_get_by_id_with_this)
</span><span class="cx"> DEFINE_OP(op_get_by_val)
</span><span class="lines">@@ -437,8 +435,6 @@
</span><span class="cx"> case op_get_array_length:
</span><span class="cx"> case op_get_by_id_proto_load:
</span><span class="cx"> case op_get_by_id_unset:
</span><del>- case op_get_by_id_proto_accessor:
- case op_get_by_id_proto_custom:
</del><span class="cx"> DEFINE_SLOWCASE_OP(op_get_by_id)
</span><span class="cx"> DEFINE_SLOWCASE_OP(op_get_by_val)
</span><span class="cx"> DEFINE_SLOWCASE_OP(op_instanceof)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntSlowPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp (202632 => 202633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2016-06-29 18:25:40 UTC (rev 202633)
</span><span class="lines">@@ -598,8 +598,6 @@
</span><span class="cx"> ObjectPropertyConditionSet conditions;
</span><span class="cx"> if (slot.isUnset())
</span><span class="cx"> conditions = generateConditionsForPropertyMiss(vm, codeBlock, exec, structure, ident.impl());
</span><del>- else if (slot.isCustom())
- conditions = generateConditionsForPrototypePropertyHitCustom(vm, codeBlock, exec, structure, slot.slotBase(), ident.impl());
</del><span class="cx"> else
</span><span class="cx"> conditions = generateConditionsForPrototypePropertyHit(vm, codeBlock, exec, structure, slot.slotBase(), ident.impl());
</span><span class="cx">
</span><span class="lines">@@ -616,7 +614,7 @@
</span><span class="cx"> offset = condition.condition().offset();
</span><span class="cx"> result.iterator->value.add(condition, pc)->install();
</span><span class="cx"> }
</span><del>- ASSERT((offset == invalidOffset) == (slot.isUnset() || slot.isCustom()));
</del><ins>+ ASSERT((offset == invalidOffset) == slot.isUnset());
</ins><span class="cx">
</span><span class="cx"> ConcurrentJITLocker locker(codeBlock->m_lock);
</span><span class="cx">
</span><span class="lines">@@ -624,20 +622,10 @@
</span><span class="cx"> pc[0].u.opcode = LLInt::getOpcode(op_get_by_id_unset);
</span><span class="cx"> pc[4].u.structureID = structure->id();
</span><span class="cx"> return;
</span><del>- } else if (slot.isCustom()) {
- pc[0].u.opcode = LLInt::getOpcode(op_get_by_id_proto_custom);
- pc[4].u.structureID = structure->id();
- pc[5].u.getterFunc = slot.customGetter();
- pc[6].u.pointer = slot.attributes() & CustomAccessor ? 0 : slot.slotBase();
- return;
</del><span class="cx"> }
</span><del>- ASSERT(slot.isValue() || slot.isAccessor());
</del><ins>+ ASSERT(slot.isValue());
</ins><span class="cx">
</span><del>- if (slot.isAccessor())
- pc[0].u.opcode = LLInt::getOpcode(op_get_by_id_proto_accessor);
- else
- pc[0].u.opcode = LLInt::getOpcode(op_get_by_id_proto_load);
-
</del><ins>+ pc[0].u.opcode = LLInt::getOpcode(op_get_by_id_proto_load);
</ins><span class="cx"> pc[4].u.structureID = structure->id();
</span><span class="cx"> pc[5].u.operand = offset;
</span><span class="cx"> // We know that this pointer will remain valid because it will be cleared by either a watchpoint fire or
</span><span class="lines">@@ -678,12 +666,10 @@
</span><span class="cx">
</span><span class="cx"> ConcurrentJITLocker locker(codeBlock->m_lock);
</span><span class="cx">
</span><del>- if (slot.isValue()) {
- pc[4].u.structureID = structure->id();
- pc[5].u.operand = slot.cachedOffset();
- }
</del><ins>+ pc[4].u.structureID = structure->id();
+ pc[5].u.operand = slot.cachedOffset();
</ins><span class="cx"> }
</span><del>- } else if (UNLIKELY(pc[7].u.operand && (slot.isValue() || slot.isUnset() || ((slot.isAccessor() || slot.isCustom()) && (slot.slotBase() != baseValue))))) {
</del><ins>+ } else if (UNLIKELY(pc[7].u.operand && (slot.isValue() || slot.isUnset()))) {
</ins><span class="cx"> ASSERT(slot.slotBase() != baseValue);
</span><span class="cx">
</span><span class="cx"> if (!(--pc[7].u.operand))
</span><span class="lines">@@ -705,19 +691,6 @@
</span><span class="cx"> LLINT_END();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LLINT_SLOW_PATH_DECL(slow_path_get_proto_accessor)
-{
- LLINT_BEGIN();
- JSValue baseValue = LLINT_OP_C(2).jsValue();
- PropertyOffset offset = pc[5].u.operand;
- JSObject* slotBase = jsCast<JSObject*>(pc[6].u.jsCell.get());
- JSValue getterSetter = slotBase->getDirect(offset);
-
- JSValue result = callGetter(exec, baseValue, getterSetter);
-
- LLINT_RETURN_PROFILED(op_get_by_id, result);
-}
-
</del><span class="cx"> LLINT_SLOW_PATH_DECL(slow_path_get_arguments_length)
</span><span class="cx"> {
</span><span class="cx"> LLINT_BEGIN();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntSlowPathsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.h (202632 => 202633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.h 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.h 2016-06-29 18:25:40 UTC (rev 202633)
</span><span class="lines">@@ -73,7 +73,6 @@
</span><span class="cx"> LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_instanceof_custom);
</span><span class="cx"> LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_try_get_by_id);
</span><span class="cx"> LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_get_by_id);
</span><del>-LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_get_proto_accessor);
</del><span class="cx"> LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_get_arguments_length);
</span><span class="cx"> LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_put_by_id);
</span><span class="cx"> LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_del_by_id);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreterasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm (202632 => 202633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2016-06-29 18:25:40 UTC (rev 202633)
</span><span class="lines">@@ -423,16 +423,6 @@
</span><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><del>-macro loadIdentifier(index, dest)
- loadp CodeBlock[cfr], t1
- loadp CodeBlock::m_unlinkedCode[t1], t2
- loadp UnlinkedCodeBlock::m_identifiers[t2], t1
- move index, t2
- mulp sizeof Identifier, t2
- addp t2, t1
- loadp Identifier::m_string[t1], dest
-end
-
</del><span class="cx"> macro checkStackPointerAlignment(tempReg, location)
</span><span class="cx"> if ARM64 or C_LOOP or SH4
</span><span class="cx"> # ARM64 will check for us!
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (202632 => 202633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2016-06-29 18:25:40 UTC (rev 202633)
</span><span class="lines">@@ -1423,66 +1423,6 @@
</span><span class="cx"> dispatch(9)
</span><span class="cx">
</span><span class="cx">
</span><del>-_llint_op_get_by_id_proto_accessor:
- traceExecution()
- loadi 8[PC], t0
- loadi 16[PC], t1
- loadConstantOrVariablePayload(t0, CellTag, t3, .opGetByIdProtoAcessorSlow)
- bineq JSCell::m_structureID[t3], t1, .opGetByIdProtoAcessorSlow
- callSlowPath(_llint_slow_path_get_proto_accessor)
- dispatch(9)
-
-.opGetByIdProtoAcessorSlow:
- callSlowPath(_llint_slow_path_get_by_id)
- dispatch(9)
-
-macro loadEncodedThisValue(baseValue, dest)
- loadp 24[PC], dest
- bineq 0, dest, .loadEncodedThisValueDone
- move baseValue, dest
- .loadEncodedThisValueDone:
-end
-
-_llint_op_get_by_id_proto_custom:
- traceExecution()
- loadi 8[PC], t0
- loadi 16[PC], t1
- loadConstantOrVariablePayload(t0, CellTag, t3, .opGetByIdProtoCustomSlow)
- bineq JSCell::m_structureID[t3], t1, .opGetByIdProtoCustomSlow
- # Setting the topCallFrame
- loadp Callee[cfr], t0
- andp MarkedBlockMask, t0, t1
- loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t1], t1
- storep cfr, VM::topCallFrame[t1]
- loadi 12[PC], t0
- loadIdentifier(t0, t2)
- loadEncodedThisValue(t3, t1)
- loadp 20[PC], t0
- # Inlining the GetValueFunc call
- push t1 # Load arg3 JSObject *
- push t2 # Load arg2 PropertyName
- move CellTag, t3
- if BIG_ENDIAN
- push t1 # Load arg1 Payload of EncodedJSValue
- push t3 # Load arg1 Tag of EncodedJSValue
- else
- push t3 # Load arg1 Tag of EncodedJSValue
- push t1 # Load arg1 Payload of EncodedJSValue
- end
- push cfr # Loading exec
- call t0
- addp 20, sp
- loadi 4[PC], t2
- storei r1, TagOffset[cfr, t2, 8]
- storei r0, PayloadOffset[cfr, t2, 8]
- valueProfile(r0, r1, 32, t2)
- dispatch(9)
-
-.opGetByIdProtoCustomSlow:
- callSlowPath(_llint_slow_path_get_by_id)
- dispatch(9)
-
-
</del><span class="cx"> _llint_op_get_array_length:
</span><span class="cx"> traceExecution()
</span><span class="cx"> loadi 8[PC], t0
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (202632 => 202633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2016-06-29 18:25:40 UTC (rev 202633)
</span><span class="lines">@@ -1294,63 +1294,6 @@
</span><span class="cx"> dispatch(9)
</span><span class="cx">
</span><span class="cx">
</span><del>-_llint_op_get_by_id_proto_accessor:
- traceExecution()
- loadisFromInstruction(2, t0)
- loadConstantOrVariableCell(t0, t3, .opGetByIdProtoAcessorSlow)
- loadi JSCell::m_structureID[t3], t1
- loadisFromInstruction(4, t2)
- bineq t2, t1, .opGetByIdProtoAcessorSlow
- callSlowPath(_llint_slow_path_get_proto_accessor)
- dispatch(9)
-
-.opGetByIdProtoAcessorSlow:
- callSlowPath(_llint_slow_path_get_by_id)
- dispatch(9)
-
-
-macro loadEncodedThisValue(baseValue, dest)
- loadpFromInstruction(6, dest)
- bineq 0, dest, .loadEncodedThisValueDone
- move baseValue, dest
- .loadEncodedThisValueDone:
-end
-
-_llint_op_get_by_id_proto_custom:
- traceExecution()
- loadisFromInstruction(2, t0)
- loadConstantOrVariableCell(t0, t3, .opGetByIdProtoCustomSlow)
- loadi JSCell::m_structureID[t3], t1
- loadisFromInstruction(4, t2)
- bineq t2, t1, .opGetByIdProtoCustomSlow
- # Setting the topCallFrame
- loadp Callee[cfr], t0
- andp MarkedBlockMask, t0, t1
- loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t1], t1
- storep cfr, VM::topCallFrame[t1]
- push PC
- push PB
- loadpFromInstruction(3, t0)
- loadIdentifier(t0, a2)
- loadEncodedThisValue(t3, a1)
- loadpFromInstruction(5, t0)
- prepareStateForCCall()
- move cfr, a0
- move a1, a3
- cCall4(t0)
- restoreStateAfterCCall()
- pop PB
- pop PC
- loadisFromInstruction(1, t2)
- storeq r0, [cfr, t2, 8]
- valueProfile(r0, 8, t1)
- dispatch(9)
-
-.opGetByIdProtoCustomSlow:
- callSlowPath(_llint_slow_path_get_by_id)
- dispatch(9)
-
-
</del><span class="cx"> _llint_op_get_array_length:
</span><span class="cx"> traceExecution()
</span><span class="cx"> loadisFromInstruction(2, t0)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIdentifierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Identifier.h (202632 => 202633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Identifier.h 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/JavaScriptCore/runtime/Identifier.h 2016-06-29 18:25:40 UTC (rev 202633)
</span><span class="lines">@@ -87,7 +87,6 @@
</span><span class="cx">
</span><span class="cx"> class Identifier {
</span><span class="cx"> friend class Structure;
</span><del>- friend class LLIntOffsetsExtractor;
</del><span class="cx"> public:
</span><span class="cx"> Identifier() { }
</span><span class="cx"> enum EmptyIdentifierFlag { EmptyIdentifier };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressllintgetbyidprotoaccessorjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/tests/stress/llint-get-by-id-proto-accessor.js (202632 => 202633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/llint-get-by-id-proto-accessor.js 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/JavaScriptCore/tests/stress/llint-get-by-id-proto-accessor.js 2016-06-29 18:25:40 UTC (rev 202633)
</span><span class="lines">@@ -1,18 +0,0 @@
</span><del>-foo = {};
-var expected = 6;
-Object.defineProperty(Object.prototype, "bar", { get: () => { return 2 * 3; } });
-
-function test() {
- if (foo.bar != expected) {
- throw new Error();
- }
-}
-
-for (var i = 0; i < 10; i++) {
- if (i == 9) {
- foo = {bar: 7};
- expected = 7;
- }
- test();
-}
-
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressllintgetbyidprotocustomjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/tests/stress/llint-get-by-id-proto-custom.js (202632 => 202633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/llint-get-by-id-proto-custom.js 2016-06-29 18:17:26 UTC (rev 202632)
+++ trunk/Source/JavaScriptCore/tests/stress/llint-get-by-id-proto-custom.js 2016-06-29 18:25:40 UTC (rev 202633)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-var v = Object.create(createCustomGetterObject());
-var expected = v.customGetter;
-
-for (var i = 0; i < 10; i++) {
- if (i == 9) {
- v = {customGetter: 10};
- expected = 10;
- }
- if (v.customGetter != expected) {
- throw Error("");
- }
-}
-
</del></span></pre>
</div>
</div>
</body>
</html>