<!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>[164092] 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/164092">164092</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-02-13 21:37:38 -0800 (Thu, 13 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Kill some of the last vestiges of the C++ interpreter's PICs
https://bugs.webkit.org/show_bug.cgi?id=128796
Reviewed by Michael Saboff.
* bytecode/BytecodeUseDef.h:
(JSC::computeUsesForBytecodeOffset):
(JSC::computeDefsForBytecodeOffset):
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::printGetByIdOp):
(JSC::CodeBlock::printGetByIdCacheStatus):
(JSC::CodeBlock::dumpBytecode):
(JSC::CodeBlock::CodeBlock):
* bytecode/GetByIdStatus.cpp:
(JSC::GetByIdStatus::computeForStubInfo):
* bytecode/Opcode.h:
(JSC::padOpcodeName):
* bytecode/PolymorphicAccessStructureList.h:
(JSC::PolymorphicAccessStructureList::PolymorphicStubInfo::PolymorphicStubInfo):
(JSC::PolymorphicAccessStructureList::PolymorphicStubInfo::set):
(JSC::PolymorphicAccessStructureList::PolymorphicAccessStructureList):
(JSC::PolymorphicAccessStructureList::visitWeak):
* bytecode/StructureStubInfo.cpp:
(JSC::StructureStubInfo::deref):
(JSC::StructureStubInfo::visitWeakReferences):
* bytecode/StructureStubInfo.h:
(JSC::isGetByIdAccess):
* jit/JIT.cpp:
(JSC::JIT::privateCompileMainPass):
* jit/Repatch.cpp:
(JSC::getPolymorphicStructureList):
(JSC::tryBuildGetByIDList):
* llint/LowLevelInterpreter.asm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</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="#trunkSourceJavaScriptCorebytecodeOpcodeh">trunk/Source/JavaScriptCore/bytecode/Opcode.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodePolymorphicAccessStructureListh">trunk/Source/JavaScriptCore/bytecode/PolymorphicAccessStructureList.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeStructureStubInfocpp">trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeStructureStubInfoh">trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITcpp">trunk/Source/JavaScriptCore/jit/JIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitRepatchcpp">trunk/Source/JavaScriptCore/jit/Repatch.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreterasm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (164091 => 164092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-14 04:03:59 UTC (rev 164091)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-14 05:37:38 UTC (rev 164092)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2014-02-13 Filip Pizlo <fpizlo@apple.com>
+
+ Kill some of the last vestiges of the C++ interpreter's PICs
+ https://bugs.webkit.org/show_bug.cgi?id=128796
+
+ Reviewed by Michael Saboff.
+
+ * bytecode/BytecodeUseDef.h:
+ (JSC::computeUsesForBytecodeOffset):
+ (JSC::computeDefsForBytecodeOffset):
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::printGetByIdOp):
+ (JSC::CodeBlock::printGetByIdCacheStatus):
+ (JSC::CodeBlock::dumpBytecode):
+ (JSC::CodeBlock::CodeBlock):
+ * bytecode/GetByIdStatus.cpp:
+ (JSC::GetByIdStatus::computeForStubInfo):
+ * bytecode/Opcode.h:
+ (JSC::padOpcodeName):
+ * bytecode/PolymorphicAccessStructureList.h:
+ (JSC::PolymorphicAccessStructureList::PolymorphicStubInfo::PolymorphicStubInfo):
+ (JSC::PolymorphicAccessStructureList::PolymorphicStubInfo::set):
+ (JSC::PolymorphicAccessStructureList::PolymorphicAccessStructureList):
+ (JSC::PolymorphicAccessStructureList::visitWeak):
+ * bytecode/StructureStubInfo.cpp:
+ (JSC::StructureStubInfo::deref):
+ (JSC::StructureStubInfo::visitWeakReferences):
+ * bytecode/StructureStubInfo.h:
+ (JSC::isGetByIdAccess):
+ * jit/JIT.cpp:
+ (JSC::JIT::privateCompileMainPass):
+ * jit/Repatch.cpp:
+ (JSC::getPolymorphicStructureList):
+ (JSC::tryBuildGetByIDList):
+ * llint/LowLevelInterpreter.asm:
+
</ins><span class="cx"> 2014-02-13 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> The JSContainerConvertor and ObjcContainerConvertor need to protect JSValueRefs. Part 2.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeBytecodeUseDefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h (164091 => 164092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h 2014-02-14 04:03:59 UTC (rev 164091)
+++ trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h 2014-02-14 05:37:38 UTC (rev 164092)
</span><span class="lines">@@ -99,13 +99,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> case op_put_by_index:
</span><del>- case op_put_by_id_replace:
- case op_put_by_id_transition:
</del><span class="cx"> case op_put_by_id_transition_direct:
</span><span class="cx"> case op_put_by_id_transition_direct_out_of_line:
</span><span class="cx"> case op_put_by_id_transition_normal:
</span><span class="cx"> case op_put_by_id_transition_normal_out_of_line:
</span><del>- case op_put_by_id_generic:
</del><span class="cx"> case op_put_by_id_out_of_line:
</span><span class="cx"> case op_put_by_id:
</span><span class="cx"> case op_put_to_scope: {
</span><span class="lines">@@ -126,18 +123,7 @@
</span><span class="cx"> case op_to_primitive:
</span><span class="cx"> case op_get_by_id:
</span><span class="cx"> case op_get_by_id_out_of_line:
</span><del>- case op_get_by_id_self:
- case op_get_by_id_proto:
- case op_get_by_id_chain:
- case op_get_by_id_getter_self:
- case op_get_by_id_getter_proto:
- case op_get_by_id_getter_chain:
- case op_get_by_id_custom_self:
- case op_get_by_id_custom_proto:
- case op_get_by_id_custom_chain:
- case op_get_by_id_generic:
</del><span class="cx"> case op_get_array_length:
</span><del>- case op_get_string_length:
</del><span class="cx"> case op_get_arguments_length:
</span><span class="cx"> case op_typeof:
</span><span class="cx"> case op_is_undefined:
</span><span class="lines">@@ -291,13 +277,10 @@
</span><span class="cx"> case op_switch_string:
</span><span class="cx"> case op_put_by_id:
</span><span class="cx"> case op_put_by_id_out_of_line:
</span><del>- case op_put_by_id_replace:
- case op_put_by_id_transition:
</del><span class="cx"> case op_put_by_id_transition_direct:
</span><span class="cx"> case op_put_by_id_transition_direct_out_of_line:
</span><span class="cx"> case op_put_by_id_transition_normal:
</span><span class="cx"> case op_put_by_id_transition_normal_out_of_line:
</span><del>- case op_put_by_id_generic:
</del><span class="cx"> case op_put_getter_setter:
</span><span class="cx"> case op_put_by_val:
</span><span class="cx"> case op_put_by_val_direct:
</span><span class="lines">@@ -330,18 +313,7 @@
</span><span class="cx"> case op_construct:
</span><span class="cx"> case op_get_by_id:
</span><span class="cx"> case op_get_by_id_out_of_line:
</span><del>- case op_get_by_id_self:
- case op_get_by_id_proto:
- case op_get_by_id_chain:
- case op_get_by_id_getter_self:
- case op_get_by_id_getter_proto:
- case op_get_by_id_getter_chain:
- case op_get_by_id_custom_self:
- case op_get_by_id_custom_proto:
- case op_get_by_id_custom_chain:
- case op_get_by_id_generic:
</del><span class="cx"> case op_get_array_length:
</span><del>- case op_get_string_length:
</del><span class="cx"> case op_check_has_instance:
</span><span class="cx"> case op_instanceof:
</span><span class="cx"> case op_get_by_val:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (164091 => 164092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-02-14 04:03:59 UTC (rev 164091)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-02-14 05:37:38 UTC (rev 164092)
</span><span class="lines">@@ -264,42 +264,9 @@
</span><span class="cx"> case op_get_by_id_out_of_line:
</span><span class="cx"> op = "get_by_id_out_of_line";
</span><span class="cx"> break;
</span><del>- case op_get_by_id_self:
- op = "get_by_id_self";
- break;
- case op_get_by_id_proto:
- op = "get_by_id_proto";
- break;
- case op_get_by_id_chain:
- op = "get_by_id_chain";
- break;
- case op_get_by_id_getter_self:
- op = "get_by_id_getter_self";
- break;
- case op_get_by_id_getter_proto:
- op = "get_by_id_getter_proto";
- break;
- case op_get_by_id_getter_chain:
- op = "get_by_id_getter_chain";
- break;
- case op_get_by_id_custom_self:
- op = "get_by_id_custom_self";
- break;
- case op_get_by_id_custom_proto:
- op = "get_by_id_custom_proto";
- break;
- case op_get_by_id_custom_chain:
- op = "get_by_id_custom_chain";
- break;
- case op_get_by_id_generic:
- op = "get_by_id_generic";
- break;
</del><span class="cx"> case op_get_array_length:
</span><span class="cx"> op = "array_length";
</span><span class="cx"> break;
</span><del>- case op_get_string_length:
- op = "string_length";
- break;
</del><span class="cx"> default:
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> op = 0;
</span><span class="lines">@@ -382,11 +349,6 @@
</span><span class="cx"> out.printf("self");
</span><span class="cx"> baseStructure = stubInfo.u.getByIdSelf.baseObjectStructure.get();
</span><span class="cx"> break;
</span><del>- case access_get_by_id_proto:
- out.printf("proto");
- baseStructure = stubInfo.u.getByIdProto.baseObjectStructure.get();
- prototypeStructure = stubInfo.u.getByIdProto.prototypeStructure.get();
- break;
</del><span class="cx"> case access_get_by_id_chain:
</span><span class="cx"> out.printf("chain");
</span><span class="cx"> baseStructure = stubInfo.u.getByIdChain.baseObjectStructure.get();
</span><span class="lines">@@ -397,11 +359,6 @@
</span><span class="cx"> structureList = stubInfo.u.getByIdSelfList.structureList;
</span><span class="cx"> listSize = stubInfo.u.getByIdSelfList.listSize;
</span><span class="cx"> break;
</span><del>- case access_get_by_id_proto_list:
- out.printf("proto_list");
- structureList = stubInfo.u.getByIdProtoList.structureList;
- listSize = stubInfo.u.getByIdProtoList.listSize;
- break;
</del><span class="cx"> case access_unset:
</span><span class="cx"> out.printf("unset");
</span><span class="cx"> break;
</span><span class="lines">@@ -441,16 +398,9 @@
</span><span class="cx"> out.printf(", ");
</span><span class="cx"> out.printf("(");
</span><span class="cx"> dumpStructure(out, "base", exec, structureList->list[i].base.get(), ident);
</span><del>- if (structureList->list[i].isChain) {
- if (structureList->list[i].u.chain.get()) {
- out.printf(", ");
- dumpChain(out, exec, structureList->list[i].u.chain.get(), ident);
- }
- } else {
- if (structureList->list[i].u.proto.get()) {
- out.printf(", ");
- dumpStructure(out, "proto", exec, structureList->list[i].u.proto.get(), ident);
- }
</del><ins>+ if (structureList->list[i].chain.get()) {
+ out.printf(", ");
+ dumpChain(out, exec, structureList->list[i].chain.get(), ident);
</ins><span class="cx"> }
</span><span class="cx"> out.printf(")");
</span><span class="cx"> }
</span><span class="lines">@@ -967,18 +917,7 @@
</span><span class="cx"> }
</span><span class="cx"> case op_get_by_id:
</span><span class="cx"> case op_get_by_id_out_of_line:
</span><del>- case op_get_by_id_self:
- case op_get_by_id_proto:
- case op_get_by_id_chain:
- case op_get_by_id_getter_self:
- case op_get_by_id_getter_proto:
- case op_get_by_id_getter_chain:
- case op_get_by_id_custom_self:
- case op_get_by_id_custom_proto:
- case op_get_by_id_custom_chain:
- case op_get_by_id_generic:
- case op_get_array_length:
- case op_get_string_length: {
</del><ins>+ case op_get_array_length: {
</ins><span class="cx"> printGetByIdOp(out, exec, location, it);
</span><span class="cx"> printGetByIdCacheStatus(out, exec, location, map);
</span><span class="cx"> dumpValueProfiling(out, it, hasPrintedProfiling);
</span><span class="lines">@@ -997,14 +936,6 @@
</span><span class="cx"> printPutByIdOp(out, exec, location, it, "put_by_id_out_of_line");
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- case op_put_by_id_replace: {
- printPutByIdOp(out, exec, location, it, "put_by_id_replace");
- break;
- }
- case op_put_by_id_transition: {
- printPutByIdOp(out, exec, location, it, "put_by_id_transition");
- break;
- }
</del><span class="cx"> case op_put_by_id_transition_direct: {
</span><span class="cx"> printPutByIdOp(out, exec, location, it, "put_by_id_transition_direct");
</span><span class="cx"> break;
</span><span class="lines">@@ -1021,10 +952,6 @@
</span><span class="cx"> printPutByIdOp(out, exec, location, it, "put_by_id_transition_normal_out_of_line");
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- case op_put_by_id_generic: {
- printPutByIdOp(out, exec, location, it, "put_by_id_generic");
- break;
- }
</del><span class="cx"> case op_put_getter_setter: {
</span><span class="cx"> int r0 = (++it)->u.operand;
</span><span class="cx"> int id0 = (++it)->u.operand;
</span><span class="lines">@@ -1778,18 +1705,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case op_get_by_id_out_of_line:
</span><del>- case op_get_by_id_self:
- case op_get_by_id_proto:
- case op_get_by_id_chain:
- case op_get_by_id_getter_self:
- case op_get_by_id_getter_proto:
- case op_get_by_id_getter_chain:
- case op_get_by_id_custom_self:
- case op_get_by_id_custom_proto:
- case op_get_by_id_custom_chain:
- case op_get_by_id_generic:
</del><span class="cx"> case op_get_array_length:
</span><del>- case op_get_string_length:
</del><span class="cx"> CRASH();
</span><span class="cx">
</span><span class="cx"> case op_init_global_const_nop: {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeGetByIdStatuscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp (164091 => 164092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp 2014-02-14 04:03:59 UTC (rev 164091)
+++ trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp 2014-02-14 05:37:38 UTC (rev 164092)
</span><span class="lines">@@ -161,26 +161,16 @@
</span><span class="cx"> if (stubInfo->resetByGC)
</span><span class="cx"> return GetByIdStatus(TakesSlowPath, true);
</span><span class="cx">
</span><del>- PolymorphicAccessStructureList* list;
- int listSize;
- switch (stubInfo->accessType) {
- case access_get_by_id_self_list:
</del><ins>+ PolymorphicAccessStructureList* list = 0;
+ int listSize = 0;
+ if (stubInfo->accessType == access_get_by_id_self_list) {
</ins><span class="cx"> list = stubInfo->u.getByIdSelfList.structureList;
</span><span class="cx"> listSize = stubInfo->u.getByIdSelfList.listSize;
</span><del>- break;
- case access_get_by_id_proto_list:
- list = stubInfo->u.getByIdProtoList.structureList;
- listSize = stubInfo->u.getByIdProtoList.listSize;
- break;
- default:
- list = 0;
- listSize = 0;
- break;
</del><ins>+ for (int i = 0; i < listSize; ++i) {
+ if (!list->list[i].isDirect)
+ return GetByIdStatus(MakesCalls, true);
+ }
</ins><span class="cx"> }
</span><del>- for (int i = 0; i < listSize; ++i) {
- if (!list->list[i].isDirect)
- return GetByIdStatus(MakesCalls, true);
- }
</del><span class="cx">
</span><span class="cx"> // Finally figure out if we can derive an access strategy.
</span><span class="cx"> GetByIdStatus result;
</span><span class="lines">@@ -250,17 +240,6 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case access_get_by_id_proto: {
- if (!stubInfo->u.getByIdProto.isDirect)
- return GetByIdStatus(MakesCalls, true);
- result.m_chain = adoptRef(new IntendedStructureChain(
- profiledBlock,
- stubInfo->u.getByIdProto.baseObjectStructure.get(),
- stubInfo->u.getByIdProto.prototypeStructure.get()));
- computeForChain(result, profiledBlock, uid);
- break;
- }
-
</del><span class="cx"> case access_get_by_id_chain: {
</span><span class="cx"> if (!stubInfo->u.getByIdChain.isDirect)
</span><span class="cx"> return GetByIdStatus(MakesCalls, true);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeOpcodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/Opcode.h (164091 => 164092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/Opcode.h 2014-02-14 04:03:59 UTC (rev 164091)
+++ trunk/Source/JavaScriptCore/bytecode/Opcode.h 2014-02-14 05:37:38 UTC (rev 164092)
</span><span class="lines">@@ -102,28 +102,14 @@
</span><span class="cx"> macro(op_init_global_const, 5) \
</span><span class="cx"> macro(op_get_by_id, 9) /* has value profiling */ \
</span><span class="cx"> macro(op_get_by_id_out_of_line, 9) /* has value profiling */ \
</span><del>- macro(op_get_by_id_self, 9) /* has value profiling */ \
- macro(op_get_by_id_proto, 9) /* has value profiling */ \
- macro(op_get_by_id_chain, 9) /* has value profiling */ \
- macro(op_get_by_id_getter_self, 9) /* has value profiling */ \
- macro(op_get_by_id_getter_proto, 9) /* has value profiling */ \
- macro(op_get_by_id_getter_chain, 9) /* has value profiling */ \
- macro(op_get_by_id_custom_self, 9) /* has value profiling */ \
- macro(op_get_by_id_custom_proto, 9) /* has value profiling */ \
- macro(op_get_by_id_custom_chain, 9) /* has value profiling */ \
- macro(op_get_by_id_generic, 9) /* has value profiling */ \
</del><span class="cx"> macro(op_get_array_length, 9) /* has value profiling */ \
</span><del>- macro(op_get_string_length, 9) /* has value profiling */ \
</del><span class="cx"> macro(op_get_arguments_length, 4) \
</span><span class="cx"> macro(op_put_by_id, 9) \
</span><span class="cx"> macro(op_put_by_id_out_of_line, 9) \
</span><del>- macro(op_put_by_id_transition, 9) \
</del><span class="cx"> macro(op_put_by_id_transition_direct, 9) \
</span><span class="cx"> macro(op_put_by_id_transition_direct_out_of_line, 9) \
</span><span class="cx"> macro(op_put_by_id_transition_normal, 9) \
</span><span class="cx"> macro(op_put_by_id_transition_normal_out_of_line, 9) \
</span><del>- macro(op_put_by_id_replace, 9) \
- macro(op_put_by_id_generic, 9) \
</del><span class="cx"> macro(op_del_by_id, 4) \
</span><span class="cx"> macro(op_get_by_val, 6) /* has value profiling */ \
</span><span class="cx"> macro(op_get_argument_by_val, 6) /* must be the same size as op_get_by_val */ \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodePolymorphicAccessStructureListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/PolymorphicAccessStructureList.h (164091 => 164092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/PolymorphicAccessStructureList.h 2014-02-14 04:03:59 UTC (rev 164091)
+++ trunk/Source/JavaScriptCore/bytecode/PolymorphicAccessStructureList.h 2014-02-14 05:37:38 UTC (rev 164092)
</span><span class="lines">@@ -46,46 +46,32 @@
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> struct PolymorphicStubInfo {
</span><del>- bool isChain;
- bool isDirect;
</del><ins>+ bool isDirect : 1;
+ unsigned count : 31;
</ins><span class="cx"> RefPtr<JITStubRoutine> stubRoutine;
</span><span class="cx"> WriteBarrier<Structure> base;
</span><del>- union {
- WriteBarrierBase<Structure> proto;
- WriteBarrierBase<StructureChain> chain;
- } u;
</del><ins>+ WriteBarrier<StructureChain> chain;
</ins><span class="cx">
</span><span class="cx"> PolymorphicStubInfo()
</span><span class="cx"> {
</span><del>- u.proto.clear();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void set(VM& vm, JSCell* owner, PassRefPtr<JITStubRoutine> _stubRoutine, Structure* _base, bool _isDirect)
</span><span class="cx"> {
</span><span class="cx"> stubRoutine = _stubRoutine;
</span><span class="cx"> base.set(vm, owner, _base);
</span><del>- u.proto.clear();
- isChain = false;
</del><span class="cx"> isDirect = _isDirect;
</span><ins>+ count = 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- void set(VM& vm, JSCell* owner, PassRefPtr<JITStubRoutine> _stubRoutine, Structure* _base, Structure* _proto, bool _isDirect)
</del><ins>+ void set(VM& vm, JSCell* owner, PassRefPtr<JITStubRoutine> _stubRoutine, Structure* _base, StructureChain* _chain, bool _isDirect, unsigned _count)
</ins><span class="cx"> {
</span><span class="cx"> stubRoutine = _stubRoutine;
</span><span class="cx"> base.set(vm, owner, _base);
</span><del>- u.proto.set(vm, owner, _proto);
- isChain = false;
</del><ins>+ chain.set(vm, owner, _chain);
</ins><span class="cx"> isDirect = _isDirect;
</span><ins>+ count = _count;
</ins><span class="cx"> }
</span><del>-
- void set(VM& vm, JSCell* owner, PassRefPtr<JITStubRoutine> _stubRoutine, Structure* _base, StructureChain* _chain, bool _isDirect)
- {
- stubRoutine = _stubRoutine;
- base.set(vm, owner, _base);
- u.chain.set(vm, owner, _chain);
- isChain = true;
- isDirect = _isDirect;
- }
</del><span class="cx"> } list[POLYMORPHIC_LIST_CACHE_SIZE];
</span><span class="cx">
</span><span class="cx"> PolymorphicAccessStructureList()
</span><span class="lines">@@ -97,34 +83,22 @@
</span><span class="cx"> list[0].set(vm, owner, stubRoutine, firstBase, isDirect);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- PolymorphicAccessStructureList(VM& vm, JSCell* owner, PassRefPtr<JITStubRoutine> stubRoutine, Structure* firstBase, Structure* firstProto, bool isDirect)
</del><ins>+ PolymorphicAccessStructureList(VM& vm, JSCell* owner, PassRefPtr<JITStubRoutine> stubRoutine, Structure* firstBase, StructureChain* firstChain, bool isDirect, unsigned count)
</ins><span class="cx"> {
</span><del>- list[0].set(vm, owner, stubRoutine, firstBase, firstProto, isDirect);
</del><ins>+ list[0].set(vm, owner, stubRoutine, firstBase, firstChain, isDirect, count);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- PolymorphicAccessStructureList(VM& vm, JSCell* owner, PassRefPtr<JITStubRoutine> stubRoutine, Structure* firstBase, StructureChain* firstChain, bool isDirect)
- {
- list[0].set(vm, owner, stubRoutine, firstBase, firstChain, isDirect);
- }
-
</del><span class="cx"> bool visitWeak(int count)
</span><span class="cx"> {
</span><span class="cx"> for (int i = 0; i < count; ++i) {
</span><span class="cx"> PolymorphicStubInfo& info = list[i];
</span><del>- if (!info.base) {
- // We're being marked during initialisation of an entry
- ASSERT(!info.u.proto);
</del><ins>+ if (!info.base)
</ins><span class="cx"> continue;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> if (!Heap::isMarked(info.base.get()))
</span><span class="cx"> return false;
</span><del>- if (info.u.proto && !info.isChain
- && !Heap::isMarked(info.u.proto.get()))
</del><ins>+ if (info.chain && !Heap::isMarked(info.chain.get()))
</ins><span class="cx"> return false;
</span><del>- if (info.u.chain && info.isChain
- && !Heap::isMarked(info.u.chain.get()))
- return false;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeStructureStubInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp (164091 => 164092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp 2014-02-14 04:03:59 UTC (rev 164091)
+++ trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp 2014-02-14 05:37:38 UTC (rev 164092)
</span><span class="lines">@@ -41,11 +41,6 @@
</span><span class="cx"> delete polymorphicStructures;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- case access_get_by_id_proto_list: {
- PolymorphicAccessStructureList* polymorphicStructures = u.getByIdProtoList.structureList;
- delete polymorphicStructures;
- return;
- }
</del><span class="cx"> case access_put_by_id_list:
</span><span class="cx"> delete u.putByIdList.list;
</span><span class="cx"> return;
</span><span class="lines">@@ -55,7 +50,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> case access_get_by_id_self:
</span><del>- case access_get_by_id_proto:
</del><span class="cx"> case access_get_by_id_chain:
</span><span class="cx"> case access_put_by_id_transition_normal:
</span><span class="cx"> case access_put_by_id_transition_direct:
</span><span class="lines">@@ -79,11 +73,6 @@
</span><span class="cx"> if (!Heap::isMarked(u.getByIdSelf.baseObjectStructure.get()))
</span><span class="cx"> return false;
</span><span class="cx"> break;
</span><del>- case access_get_by_id_proto:
- if (!Heap::isMarked(u.getByIdProto.baseObjectStructure.get())
- || !Heap::isMarked(u.getByIdProto.prototypeStructure.get()))
- return false;
- break;
</del><span class="cx"> case access_get_by_id_chain:
</span><span class="cx"> if (!Heap::isMarked(u.getByIdChain.baseObjectStructure.get())
</span><span class="cx"> || !Heap::isMarked(u.getByIdChain.chain.get()))
</span><span class="lines">@@ -95,12 +84,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- case access_get_by_id_proto_list: {
- PolymorphicAccessStructureList* polymorphicStructures = u.getByIdProtoList.structureList;
- if (!polymorphicStructures->visitWeak(u.getByIdProtoList.listSize))
- return false;
- break;
- }
</del><span class="cx"> case access_put_by_id_transition_normal:
</span><span class="cx"> case access_put_by_id_transition_direct:
</span><span class="cx"> if (!Heap::isMarked(u.putByIdTransition.previousStructure.get())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeStructureStubInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.h (164091 => 164092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.h 2014-02-14 04:03:59 UTC (rev 164091)
+++ trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.h 2014-02-14 05:37:38 UTC (rev 164092)
</span><span class="lines">@@ -47,10 +47,8 @@
</span><span class="cx">
</span><span class="cx"> enum AccessType {
</span><span class="cx"> access_get_by_id_self,
</span><del>- access_get_by_id_proto,
</del><span class="cx"> access_get_by_id_chain,
</span><span class="cx"> access_get_by_id_self_list,
</span><del>- access_get_by_id_proto_list,
</del><span class="cx"> access_put_by_id_transition_normal,
</span><span class="cx"> access_put_by_id_transition_direct,
</span><span class="cx"> access_put_by_id_replace,
</span><span class="lines">@@ -67,10 +65,8 @@
</span><span class="cx"> {
</span><span class="cx"> switch (accessType) {
</span><span class="cx"> case access_get_by_id_self:
</span><del>- case access_get_by_id_proto:
</del><span class="cx"> case access_get_by_id_chain:
</span><span class="cx"> case access_get_by_id_self_list:
</span><del>- case access_get_by_id_proto_list:
</del><span class="cx"> case access_get_by_id_generic:
</span><span class="cx"> case access_get_array_length:
</span><span class="cx"> case access_get_string_length:
</span><span class="lines">@@ -138,14 +134,6 @@
</span><span class="cx"> u.getByIdSelfList.didSelfPatching = didSelfPatching;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void initGetByIdProtoList(PolymorphicAccessStructureList* structureList, int listSize)
- {
- accessType = access_get_by_id_proto_list;
-
- u.getByIdProtoList.structureList = structureList;
- u.getByIdProtoList.listSize = listSize;
- }
-
</del><span class="cx"> // PutById*
</span><span class="cx">
</span><span class="cx"> void initPutByIdTransition(VM& vm, JSCell* owner, Structure* previousStructure, Structure* structure, StructureChain* chain, bool isDirect)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JIT.cpp (164091 => 164092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JIT.cpp 2014-02-14 04:03:59 UTC (rev 164091)
+++ trunk/Source/JavaScriptCore/jit/JIT.cpp 2014-02-14 05:37:38 UTC (rev 164092)
</span><span class="lines">@@ -290,22 +290,6 @@
</span><span class="cx"> DEFINE_OP(op_resolve_scope)
</span><span class="cx"> DEFINE_OP(op_get_from_scope)
</span><span class="cx"> DEFINE_OP(op_put_to_scope)
</span><del>-
- case op_get_by_id_chain:
- case op_get_by_id_generic:
- case op_get_by_id_proto:
- case op_get_by_id_self:
- case op_get_by_id_getter_chain:
- case op_get_by_id_getter_proto:
- case op_get_by_id_getter_self:
- case op_get_by_id_custom_chain:
- case op_get_by_id_custom_proto:
- case op_get_by_id_custom_self:
- case op_get_string_length:
- case op_put_by_id_generic:
- case op_put_by_id_replace:
- case op_put_by_id_transition:
- RELEASE_ASSERT_NOT_REACHED();
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitRepatchcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/Repatch.cpp (164091 => 164092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/Repatch.cpp 2014-02-14 04:03:59 UTC (rev 164091)
+++ trunk/Source/JavaScriptCore/jit/Repatch.cpp 2014-02-14 05:37:38 UTC (rev 164092)
</span><span class="lines">@@ -501,7 +501,7 @@
</span><span class="cx"> } else if (stubInfo.accessType == access_get_by_id_chain) {
</span><span class="cx"> RELEASE_ASSERT(!!stubInfo.stubRoutine);
</span><span class="cx"> slowCase = CodeLocationLabel(stubInfo.stubRoutine->code().code());
</span><del>- polymorphicStructureList = new PolymorphicAccessStructureList(*vm, codeBlock->ownerExecutable(), stubInfo.stubRoutine, stubInfo.u.getByIdChain.baseObjectStructure.get(), stubInfo.u.getByIdChain.chain.get(), true);
</del><ins>+ polymorphicStructureList = new PolymorphicAccessStructureList(*vm, codeBlock->ownerExecutable(), stubInfo.stubRoutine, stubInfo.u.getByIdChain.baseObjectStructure.get(), stubInfo.u.getByIdChain.chain.get(), stubInfo.u.getByIdChain.isDirect, stubInfo.u.getByIdChain.count);
</ins><span class="cx"> stubInfo.stubRoutine.clear();
</span><span class="cx"> stubInfo.initGetByIdSelfList(polymorphicStructureList, 1, false);
</span><span class="cx"> listIndex = 1;
</span><span class="lines">@@ -726,7 +726,7 @@
</span><span class="cx"> slowCase, stubRoutine) == ProtoChainGenerationFailed)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- polymorphicStructureList->list[listIndex].set(*vm, codeBlock->ownerExecutable(), stubRoutine, structure, slot.isCacheableValue());
</del><ins>+ polymorphicStructureList->list[listIndex].set(*vm, codeBlock->ownerExecutable(), stubRoutine, structure, prototypeChain, slot.isCacheableValue(), count);
</ins><span class="cx">
</span><span class="cx"> patchJumpToGetByIdStub(codeBlock, stubInfo, stubRoutine.get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreterasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm (164091 => 164092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2014-02-14 04:03:59 UTC (rev 164091)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2014-02-14 05:37:38 UTC (rev 164092)
</span><span class="lines">@@ -1125,48 +1125,6 @@
</span><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><del>-_llint_op_get_by_id_chain:
- notSupported()
-
-_llint_op_get_by_id_custom_chain:
- notSupported()
-
-_llint_op_get_by_id_custom_proto:
- notSupported()
-
-_llint_op_get_by_id_custom_self:
- notSupported()
-
-_llint_op_get_by_id_generic:
- notSupported()
-
-_llint_op_get_by_id_getter_chain:
- notSupported()
-
-_llint_op_get_by_id_getter_proto:
- notSupported()
-
-_llint_op_get_by_id_getter_self:
- notSupported()
-
-_llint_op_get_by_id_proto:
- notSupported()
-
-_llint_op_get_by_id_self:
- notSupported()
-
-_llint_op_get_string_length:
- notSupported()
-
-_llint_op_put_by_id_generic:
- notSupported()
-
-_llint_op_put_by_id_replace:
- notSupported()
-
-_llint_op_put_by_id_transition:
- notSupported()
-
</del><span class="cx"> _llint_op_init_global_const_nop:
</span><span class="cx"> dispatch(5)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>