<!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>[166263] trunk</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/166263">166263</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-03-25 15:38:52 -0700 (Tue, 25 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Repatch should plant calls to getters directly rather than through a C helper
https://bugs.webkit.org/show_bug.cgi?id=129589
Source/JavaScriptCore:
Reviewed by Mark Hahnenberg.
As the title says. All of the superstructure for this was already in place, so now it
was just a matter of actually emitting the call.
8x speed-up for getter microbenchmarks.
* CMakeLists.txt:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
* bytecode/PolymorphicGetByIdList.h:
(JSC::GetByIdAccess::doesCalls):
* jit/AccessorCallJITStubRoutine.cpp: Added.
(JSC::AccessorCallJITStubRoutine::AccessorCallJITStubRoutine):
(JSC::AccessorCallJITStubRoutine::~AccessorCallJITStubRoutine):
(JSC::AccessorCallJITStubRoutine::visitWeak):
* jit/AccessorCallJITStubRoutine.h: Added.
* jit/AssemblyHelpers.h:
(JSC::AssemblyHelpers::storeCell):
* jit/GCAwareJITStubRoutine.h:
* jit/Repatch.cpp:
(JSC::generateGetByIdStub):
* runtime/GetterSetter.h:
(JSC::GetterSetter::offsetOfGetter):
(JSC::GetterSetter::offsetOfSetter):
LayoutTests:
Reviewed by Mark Hahnenberg.
* js/regress/getter-expected.txt: Added.
* js/regress/getter.html: Added.
* js/regress/script-tests/getter.js: Added.
* js/regress/script-tests/string-char-code-at.js: Added.
(foo):
* js/regress/string-char-code-at-expected.txt: Added.
* js/regress/string-char-code-at.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodePolymorphicGetByIdListh">trunk/Source/JavaScriptCore/bytecode/PolymorphicGetByIdList.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitAssemblyHelpersh">trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitGCAwareJITStubRoutineh">trunk/Source/JavaScriptCore/jit/GCAwareJITStubRoutine.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitRepatchcpp">trunk/Source/JavaScriptCore/jit/Repatch.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeGetterSetterh">trunk/Source/JavaScriptCore/runtime/GetterSetter.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsregressgetterexpectedtxt">trunk/LayoutTests/js/regress/getter-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregressgetterhtml">trunk/LayoutTests/js/regress/getter.html</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestsgetterjs">trunk/LayoutTests/js/regress/script-tests/getter.js</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestsstringcharcodeatjs">trunk/LayoutTests/js/regress/script-tests/string-char-code-at.js</a></li>
<li><a href="#trunkLayoutTestsjsregressstringcharcodeatexpectedtxt">trunk/LayoutTests/js/regress/string-char-code-at-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregressstringcharcodeathtml">trunk/LayoutTests/js/regress/string-char-code-at.html</a></li>
<li><a href="#trunkSourceJavaScriptCorejitAccessorCallJITStubRoutinecpp">trunk/Source/JavaScriptCore/jit/AccessorCallJITStubRoutine.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitAccessorCallJITStubRoutineh">trunk/Source/JavaScriptCore/jit/AccessorCallJITStubRoutine.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166262 => 166263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-25 22:34:47 UTC (rev 166262)
+++ trunk/LayoutTests/ChangeLog 2014-03-25 22:38:52 UTC (rev 166263)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-03-25 Filip Pizlo <fpizlo@apple.com>
+
+ Repatch should plant calls to getters directly rather than through a C helper
+ https://bugs.webkit.org/show_bug.cgi?id=129589
+
+ Reviewed by Mark Hahnenberg.
+
+ * js/regress/getter-expected.txt: Added.
+ * js/regress/getter.html: Added.
+ * js/regress/script-tests/getter.js: Added.
+ * js/regress/script-tests/string-char-code-at.js: Added.
+ (foo):
+ * js/regress/string-char-code-at-expected.txt: Added.
+ * js/regress/string-char-code-at.html: Added.
+
</ins><span class="cx"> 2014-03-25 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Pause the media element during system sleep.
</span></span></pre></div>
<a id="trunkLayoutTestsjsregressgetterexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/getter-expected.txt (0 => 166263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/getter-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress/getter-expected.txt 2014-03-25 22:38:52 UTC (rev 166263)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/getter
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS no exception thrown
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressgetterhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/getter.html (0 => 166263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/getter.html (rev 0)
+++ trunk/LayoutTests/js/regress/getter.html 2014-03-25 22:38:52 UTC (rev 166263)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="resources/regress-pre.js"></script>
+<script src="script-tests/getter.js"></script>
+<script src="resources/regress-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressscripttestsgetterjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/script-tests/getter.js (0 => 166263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/getter.js (rev 0)
+++ trunk/LayoutTests/js/regress/script-tests/getter.js 2014-03-25 22:38:52 UTC (rev 166263)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+(function() {
+ var o = {_f:42};
+ o.__defineGetter__("f", function() { return this._f; });
+ var result = 0;
+ var n = 2000000;
+ for (var i = 0; i < n; ++i)
+ result += o.f;
+ if (result != n * 42)
+ throw "Error: bad result: " + result;
+})();
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressscripttestsstringcharcodeatjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/script-tests/string-char-code-at.js (0 => 166263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/string-char-code-at.js (rev 0)
+++ trunk/LayoutTests/js/regress/script-tests/string-char-code-at.js 2014-03-25 22:38:52 UTC (rev 166263)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+function foo(s) {
+ var result = 0;
+ for (var i = 0; i < s.length; ++i)
+ result += s.charCodeAt(i);
+ return result;
+}
+
+for (var i = 0; i < 1000000; ++i) {
+ var result = foo("hello");
+ if (result != 532)
+ throw "Error: bad result: " + result;
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressstringcharcodeatexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/string-char-code-at-expected.txt (0 => 166263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/string-char-code-at-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress/string-char-code-at-expected.txt 2014-03-25 22:38:52 UTC (rev 166263)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/string-char-code-at
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS no exception thrown
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressstringcharcodeathtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/string-char-code-at.html (0 => 166263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/string-char-code-at.html (rev 0)
+++ trunk/LayoutTests/js/regress/string-char-code-at.html 2014-03-25 22:38:52 UTC (rev 166263)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="resources/regress-pre.js"></script>
+<script src="script-tests/string-char-code-at.js"></script>
+<script src="resources/regress-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (166262 => 166263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2014-03-25 22:34:47 UTC (rev 166262)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2014-03-25 22:38:52 UTC (rev 166263)
</span><span class="lines">@@ -275,6 +275,7 @@
</span><span class="cx"> interpreter/StackVisitor.cpp
</span><span class="cx"> interpreter/VMInspector.cpp
</span><span class="cx">
</span><ins>+ jit/AccessorCallJITStubRoutine.cpp
</ins><span class="cx"> jit/AssemblyHelpers.cpp
</span><span class="cx"> jit/ArityCheckFailReturnThunks.cpp
</span><span class="cx"> jit/ClosureCallStubRoutine.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (166262 => 166263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-25 22:34:47 UTC (rev 166262)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-25 22:38:52 UTC (rev 166263)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-03-25 Filip Pizlo <fpizlo@apple.com>
+
+ Repatch should plant calls to getters directly rather than through a C helper
+ https://bugs.webkit.org/show_bug.cgi?id=129589
+
+ Reviewed by Mark Hahnenberg.
+
+ As the title says. All of the superstructure for this was already in place, so now it
+ was just a matter of actually emitting the call.
+
+ 8x speed-up for getter microbenchmarks.
+
+ * CMakeLists.txt:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * bytecode/PolymorphicGetByIdList.h:
+ (JSC::GetByIdAccess::doesCalls):
+ * jit/AccessorCallJITStubRoutine.cpp: Added.
+ (JSC::AccessorCallJITStubRoutine::AccessorCallJITStubRoutine):
+ (JSC::AccessorCallJITStubRoutine::~AccessorCallJITStubRoutine):
+ (JSC::AccessorCallJITStubRoutine::visitWeak):
+ * jit/AccessorCallJITStubRoutine.h: Added.
+ * jit/AssemblyHelpers.h:
+ (JSC::AssemblyHelpers::storeCell):
+ * jit/GCAwareJITStubRoutine.h:
+ * jit/Repatch.cpp:
+ (JSC::generateGetByIdStub):
+ * runtime/GetterSetter.h:
+ (JSC::GetterSetter::offsetOfGetter):
+ (JSC::GetterSetter::offsetOfSetter):
+
</ins><span class="cx"> 2014-03-25 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r166126.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (166262 => 166263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-03-25 22:34:47 UTC (rev 166262)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-03-25 22:38:52 UTC (rev 166263)
</span><span class="lines">@@ -520,6 +520,7 @@
</span><span class="cx"> <ClCompile Include="..\interpreter\ProtoCallFrame.cpp" />
</span><span class="cx"> <ClCompile Include="..\interpreter\StackVisitor.cpp" />
</span><span class="cx"> <ClCompile Include="..\interpreter\VMInspector.cpp" />
</span><ins>+ <ClCompile Include="..\jit\AccessorCallJITStubRoutine.cpp" />
</ins><span class="cx"> <ClCompile Include="..\jit\ArityCheckFailReturnThunks.cpp" />
</span><span class="cx"> <ClCompile Include="..\jit\AssemblyHelpers.cpp" />
</span><span class="cx"> <ClCompile Include="..\jit\ClosureCallStubRoutine.cpp" />
</span><span class="lines">@@ -1138,6 +1139,7 @@
</span><span class="cx"> <ClInclude Include="..\interpreter\Register.h" />
</span><span class="cx"> <ClInclude Include="..\interpreter\StackVisitor.h" />
</span><span class="cx"> <ClInclude Include="..\interpreter\VMInspector.h" />
</span><ins>+ <ClInclude Include="..\jit\AccessorCallJITStubRoutine.h" />
</ins><span class="cx"> <ClInclude Include="..\jit\ArityCheckFailReturnThunks.h" />
</span><span class="cx"> <ClInclude Include="..\jit\AssemblyHelpers.h" />
</span><span class="cx"> <ClInclude Include="..\jit\CCallHelpers.h" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (166262 => 166263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-03-25 22:34:47 UTC (rev 166262)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-03-25 22:38:52 UTC (rev 166263)
</span><span class="lines">@@ -329,6 +329,8 @@
</span><span class="cx"> 0F73D7AE165A142D00ACAB71 /* ClosureCallStubRoutine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F73D7AB165A142A00ACAB71 /* ClosureCallStubRoutine.cpp */; };
</span><span class="cx"> 0F73D7AF165A143000ACAB71 /* ClosureCallStubRoutine.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F73D7AC165A142A00ACAB71 /* ClosureCallStubRoutine.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F743BAA16B88249009F9277 /* ARM64Disassembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 652A3A201651C66100A80AFE /* ARM64Disassembler.cpp */; };
</span><ins>+ 0F7576D218E1FEE9002EF4CD /* AccessorCallJITStubRoutine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F7576D018E1FEE9002EF4CD /* AccessorCallJITStubRoutine.cpp */; };
+ 0F7576D318E1FEE9002EF4CD /* AccessorCallJITStubRoutine.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F7576D118E1FEE9002EF4CD /* AccessorCallJITStubRoutine.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 0F766D2815A8CC1E008F363E /* JITStubRoutine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F766D2615A8CC1B008F363E /* JITStubRoutine.cpp */; };
</span><span class="cx"> 0F766D2B15A8CC38008F363E /* JITStubRoutineSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F766D2915A8CC34008F363E /* JITStubRoutineSet.cpp */; };
</span><span class="cx"> 0F766D2C15A8CC3A008F363E /* JITStubRoutineSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F766D2A15A8CC34008F363E /* JITStubRoutineSet.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -786,10 +788,10 @@
</span><span class="cx"> 2A68295B1875F80500B6C3E2 /* CopyWriteBarrier.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A68295A1875F80500B6C3E2 /* CopyWriteBarrier.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 2A6F462617E959CE00C45C98 /* HeapOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A6F462517E959CE00C45C98 /* HeapOperation.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 2A7A58EF1808A4C40020BDF7 /* DeferGC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A7A58EE1808A4C40020BDF7 /* DeferGC.cpp */; };
</span><del>- 2A83638518D7D0EE0000EBCC /* EdenGCActivityCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A83638318D7D0EE0000EBCC /* EdenGCActivityCallback.cpp */; };
- 2A83638618D7D0EE0000EBCC /* EdenGCActivityCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A83638418D7D0EE0000EBCC /* EdenGCActivityCallback.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 2A83638918D7D0FE0000EBCC /* FullGCActivityCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A83638718D7D0FE0000EBCC /* FullGCActivityCallback.cpp */; };
- 2A83638A18D7D0FE0000EBCC /* FullGCActivityCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A83638818D7D0FE0000EBCC /* FullGCActivityCallback.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><ins>+ 2A83638518D7D0EE0000EBCC /* EdenGCActivityCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A83638318D7D0EE0000EBCC /* EdenGCActivityCallback.cpp */; };
+ 2A83638618D7D0EE0000EBCC /* EdenGCActivityCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A83638418D7D0EE0000EBCC /* EdenGCActivityCallback.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 2A83638918D7D0FE0000EBCC /* FullGCActivityCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A83638718D7D0FE0000EBCC /* FullGCActivityCallback.cpp */; };
+ 2A83638A18D7D0FE0000EBCC /* FullGCActivityCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A83638818D7D0FE0000EBCC /* FullGCActivityCallback.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 2AAAA31218BD49D100394CC8 /* StructureIDBlob.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AAAA31018BD49D100394CC8 /* StructureIDBlob.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 2AACE63C18CA5A0300ED0191 /* GCActivityCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AACE63A18CA5A0300ED0191 /* GCActivityCallback.cpp */; };
</span><span class="cx"> 2AACE63D18CA5A0300ED0191 /* GCActivityCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AACE63B18CA5A0300ED0191 /* GCActivityCallback.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -1850,6 +1852,8 @@
</span><span class="cx"> 0F714CA216EA92ED00F3EBEB /* DFGBackwardsPropagationPhase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGBackwardsPropagationPhase.h; path = dfg/DFGBackwardsPropagationPhase.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F73D7AB165A142A00ACAB71 /* ClosureCallStubRoutine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ClosureCallStubRoutine.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F73D7AC165A142A00ACAB71 /* ClosureCallStubRoutine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClosureCallStubRoutine.h; sourceTree = "<group>"; };
</span><ins>+ 0F7576D018E1FEE9002EF4CD /* AccessorCallJITStubRoutine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessorCallJITStubRoutine.cpp; sourceTree = "<group>"; };
+ 0F7576D118E1FEE9002EF4CD /* AccessorCallJITStubRoutine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessorCallJITStubRoutine.h; sourceTree = "<group>"; };
</ins><span class="cx"> 0F766D1C15A5028D008F363E /* JITStubRoutine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JITStubRoutine.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F766D2615A8CC1B008F363E /* JITStubRoutine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JITStubRoutine.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F766D2915A8CC34008F363E /* JITStubRoutineSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JITStubRoutineSet.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -2273,10 +2277,10 @@
</span><span class="cx"> 2A68295A1875F80500B6C3E2 /* CopyWriteBarrier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CopyWriteBarrier.h; sourceTree = "<group>"; };
</span><span class="cx"> 2A6F462517E959CE00C45C98 /* HeapOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HeapOperation.h; sourceTree = "<group>"; };
</span><span class="cx"> 2A7A58EE1808A4C40020BDF7 /* DeferGC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeferGC.cpp; sourceTree = "<group>"; };
</span><del>- 2A83638318D7D0EE0000EBCC /* EdenGCActivityCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EdenGCActivityCallback.cpp; sourceTree = "<group>"; };
- 2A83638418D7D0EE0000EBCC /* EdenGCActivityCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EdenGCActivityCallback.h; sourceTree = "<group>"; };
- 2A83638718D7D0FE0000EBCC /* FullGCActivityCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FullGCActivityCallback.cpp; sourceTree = "<group>"; };
- 2A83638818D7D0FE0000EBCC /* FullGCActivityCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FullGCActivityCallback.h; sourceTree = "<group>"; };
</del><ins>+ 2A83638318D7D0EE0000EBCC /* EdenGCActivityCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EdenGCActivityCallback.cpp; sourceTree = "<group>"; };
+ 2A83638418D7D0EE0000EBCC /* EdenGCActivityCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EdenGCActivityCallback.h; sourceTree = "<group>"; };
+ 2A83638718D7D0FE0000EBCC /* FullGCActivityCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FullGCActivityCallback.cpp; sourceTree = "<group>"; };
+ 2A83638818D7D0FE0000EBCC /* FullGCActivityCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FullGCActivityCallback.h; sourceTree = "<group>"; };
</ins><span class="cx"> 2AAAA31018BD49D100394CC8 /* StructureIDBlob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StructureIDBlob.h; sourceTree = "<group>"; };
</span><span class="cx"> 2AACE63A18CA5A0300ED0191 /* GCActivityCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GCActivityCallback.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2AACE63B18CA5A0300ED0191 /* GCActivityCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCActivityCallback.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3432,6 +3436,8 @@
</span><span class="cx"> 1429D92C0ED22D7000B89619 /* jit */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 0F7576D018E1FEE9002EF4CD /* AccessorCallJITStubRoutine.cpp */,
+ 0F7576D118E1FEE9002EF4CD /* AccessorCallJITStubRoutine.h */,
</ins><span class="cx"> 0F6B1CC718641DF800845D97 /* ArityCheckFailReturnThunks.cpp */,
</span><span class="cx"> 0F6B1CC818641DF800845D97 /* ArityCheckFailReturnThunks.h */,
</span><span class="cx"> 0F24E53B17EA9F5900ABB217 /* AssemblyHelpers.cpp */,
</span><span class="lines">@@ -3611,10 +3617,10 @@
</span><span class="cx"> 2A4EC90A1860D6C20094F782 /* WriteBarrierBuffer.h */,
</span><span class="cx"> 0FC8150814043BCA00CFA603 /* WriteBarrierSupport.cpp */,
</span><span class="cx"> 0FC8150914043BD200CFA603 /* WriteBarrierSupport.h */,
</span><del>- 2A83638318D7D0EE0000EBCC /* EdenGCActivityCallback.cpp */,
- 2A83638418D7D0EE0000EBCC /* EdenGCActivityCallback.h */,
- 2A83638718D7D0FE0000EBCC /* FullGCActivityCallback.cpp */,
- 2A83638818D7D0FE0000EBCC /* FullGCActivityCallback.h */,
</del><ins>+ 2A83638318D7D0EE0000EBCC /* EdenGCActivityCallback.cpp */,
+ 2A83638418D7D0EE0000EBCC /* EdenGCActivityCallback.h */,
+ 2A83638718D7D0FE0000EBCC /* FullGCActivityCallback.cpp */,
+ 2A83638818D7D0FE0000EBCC /* FullGCActivityCallback.h */,
</ins><span class="cx"> );
</span><span class="cx"> path = heap;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -4935,8 +4941,8 @@
</span><span class="cx"> 86D3B2C410156BDE002865E7 /* ARMAssembler.h in Headers */,
</span><span class="cx"> A584032018BFFBE1005A0811 /* InspectorAgent.h in Headers */,
</span><span class="cx"> 2AACE63D18CA5A0300ED0191 /* GCActivityCallback.h in Headers */,
</span><del>- 2A83638618D7D0EE0000EBCC /* EdenGCActivityCallback.h in Headers */,
- 2A83638A18D7D0FE0000EBCC /* FullGCActivityCallback.h in Headers */,
</del><ins>+ 2A83638618D7D0EE0000EBCC /* EdenGCActivityCallback.h in Headers */,
+ 2A83638A18D7D0FE0000EBCC /* FullGCActivityCallback.h in Headers */,
</ins><span class="cx"> 2AAAA31218BD49D100394CC8 /* StructureIDBlob.h in Headers */,
</span><span class="cx"> A54E8EB118BFFBBE00556D28 /* GCSegmentedArrayInlines.h in Headers */,
</span><span class="cx"> 86ADD1450FDDEA980006EEC2 /* ARMv7Assembler.h in Headers */,
</span><span class="lines">@@ -5380,6 +5386,7 @@
</span><span class="cx"> BC18C41E0E16F5CD00B34460 /* JSContextRef.h in Headers */,
</span><span class="cx"> 148CD1D8108CF902008163C6 /* JSContextRefPrivate.h in Headers */,
</span><span class="cx"> A72028B81797601E0098028C /* JSCTestRunnerUtils.h in Headers */,
</span><ins>+ 0F7576D318E1FEE9002EF4CD /* AccessorCallJITStubRoutine.h in Headers */,
</ins><span class="cx"> 0F2B66EC17B6B5AB00A7AE3F /* JSDataView.h in Headers */,
</span><span class="cx"> 0F2B66EE17B6B5AB00A7AE3F /* JSDataViewPrototype.h in Headers */,
</span><span class="cx"> 978801411471AD920041B016 /* JSDateMath.h in Headers */,
</span><span class="lines">@@ -6241,7 +6248,7 @@
</span><span class="cx"> 147F39C2107EC37600427A48 /* Completion.cpp in Sources */,
</span><span class="cx"> 146B16D812EB5B59001BEC1B /* ConservativeRoots.cpp in Sources */,
</span><span class="cx"> A5FD0079189B051000633231 /* ConsoleMessage.cpp in Sources */,
</span><del>- 2A83638518D7D0EE0000EBCC /* EdenGCActivityCallback.cpp in Sources */,
</del><ins>+ 2A83638518D7D0EE0000EBCC /* EdenGCActivityCallback.cpp in Sources */,
</ins><span class="cx"> 1428082E107EC0570013E7B2 /* ConstructData.cpp in Sources */,
</span><span class="cx"> A57D23F11891B5B40031C7FA /* ContentSearchUtilities.cpp in Sources */,
</span><span class="cx"> C240305514B404E60079EB64 /* CopiedSpace.cpp in Sources */,
</span><span class="lines">@@ -6542,7 +6549,7 @@
</span><span class="cx"> 0F919D10157F3329004A4E7D /* JSSegmentedVariableObject.cpp in Sources */,
</span><span class="cx"> A7299D9D17D12837005F5FF9 /* JSSet.cpp in Sources */,
</span><span class="cx"> A790DD6F182F499700588807 /* JSSetIterator.cpp in Sources */,
</span><del>- 2A83638918D7D0FE0000EBCC /* FullGCActivityCallback.cpp in Sources */,
</del><ins>+ 2A83638918D7D0FE0000EBCC /* FullGCActivityCallback.cpp in Sources */,
</ins><span class="cx"> 1428083A107EC0750013E7B2 /* JSStack.cpp in Sources */,
</span><span class="cx"> 147F39D5107EC37600427A48 /* JSString.cpp in Sources */,
</span><span class="cx"> 2600B5A6152BAAA70091EE5F /* JSStringJoiner.cpp in Sources */,
</span><span class="lines">@@ -6710,6 +6717,7 @@
</span><span class="cx"> 0FF42732158EBD58004CB9FF /* UDis86Disassembler.cpp in Sources */,
</span><span class="cx"> A76F279415F13C9600517D67 /* UnlinkedCodeBlock.cpp in Sources */,
</span><span class="cx"> B59F89391891F29F00D5CCDC /* UnlinkedInstructionStream.cpp in Sources */,
</span><ins>+ 0F7576D218E1FEE9002EF4CD /* AccessorCallJITStubRoutine.cpp in Sources */,
</ins><span class="cx"> 0F24E55817F74EDB00ABB217 /* ValueRecovery.cpp in Sources */,
</span><span class="cx"> E18E3A590DF9278C00D90B34 /* VM.cpp in Sources */,
</span><span class="cx"> FE5932A7183C5A2600A1ECCC /* VMEntryScope.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodePolymorphicGetByIdListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/PolymorphicGetByIdList.h (166262 => 166263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/PolymorphicGetByIdList.h 2014-03-25 22:34:47 UTC (rev 166262)
+++ trunk/Source/JavaScriptCore/bytecode/PolymorphicGetByIdList.h 2014-03-25 22:38:52 UTC (rev 166263)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> return m_stubRoutine.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool doesCalls() const { return type() == Getter; }
</del><ins>+ bool doesCalls() const { return type() == Getter || type() == CustomGetter; }
</ins><span class="cx">
</span><span class="cx"> bool visitWeak(RepatchBuffer&) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitAccessorCallJITStubRoutinecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/jit/AccessorCallJITStubRoutine.cpp (0 => 166263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/AccessorCallJITStubRoutine.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/jit/AccessorCallJITStubRoutine.cpp 2014-03-25 22:38:52 UTC (rev 166263)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "AccessorCallJITStubRoutine.h"
+
+#if ENABLE(JIT)
+
+#include "CallLinkInfo.h"
+
+namespace JSC {
+
+AccessorCallJITStubRoutine::AccessorCallJITStubRoutine(
+ const MacroAssemblerCodeRef& code, VM& vm, std::unique_ptr<CallLinkInfo> info)
+ : GCAwareJITStubRoutine(code, vm)
+ , m_callLinkInfo(std::move(info))
+{
+}
+
+AccessorCallJITStubRoutine::~AccessorCallJITStubRoutine()
+{
+}
+
+bool AccessorCallJITStubRoutine::visitWeak(RepatchBuffer& repatchBuffer)
+{
+ m_callLinkInfo->visitWeak(repatchBuffer);
+ return true;
+}
+
+} // namespace JSC
+
+#endif // ENABLE(JIT)
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCorejitAccessorCallJITStubRoutineh"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/jit/AccessorCallJITStubRoutine.h (0 => 166263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/AccessorCallJITStubRoutine.h (rev 0)
+++ trunk/Source/JavaScriptCore/jit/AccessorCallJITStubRoutine.h 2014-03-25 22:38:52 UTC (rev 166263)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef AccessorCallJITStubRoutine_h
+#define AccessorCallJITStubRoutine_h
+
+#if ENABLE(JIT)
+
+#include "GCAwareJITStubRoutine.h"
+
+namespace JSC {
+
+struct CallLinkInfo;
+
+// JIT stub routine for use by JavaScript accessors. These will be making a JS
+// call that requires inline caching.
+
+class AccessorCallJITStubRoutine : public GCAwareJITStubRoutine {
+public:
+ AccessorCallJITStubRoutine(
+ const MacroAssemblerCodeRef&, VM&, std::unique_ptr<CallLinkInfo>);
+
+ virtual ~AccessorCallJITStubRoutine();
+
+ virtual bool visitWeak(RepatchBuffer&) override;
+
+private:
+ std::unique_ptr<CallLinkInfo> m_callLinkInfo;
+};
+
+} // namespace JSC
+
+#endif // ENABLE(JIT)
+
+#endif // AccessorCallJITStubRoutine_h
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCorejitAssemblyHelpersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h (166262 => 166263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h 2014-03-25 22:34:47 UTC (rev 166262)
+++ trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h 2014-03-25 22:38:52 UTC (rev 166263)
</span><span class="lines">@@ -66,6 +66,17 @@
</span><span class="cx"> stackPointerAligned.link(this);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><ins>+
+ template<typename T>
+ void storeCell(T cell, Address address)
+ {
+#if USE(JSVALUE64)
+ store64(cell, address);
+#else
+ store32(cell, address.withOffset(PayloadOffset));
+ store32(TrustedImm32(JSValue::CellTag), address.withOffset(TagOffset));
+#endif
+ }
</ins><span class="cx">
</span><span class="cx"> #if CPU(X86_64) || CPU(X86)
</span><span class="cx"> static size_t prologueStackPointerDelta()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitGCAwareJITStubRoutineh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/GCAwareJITStubRoutine.h (166262 => 166263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/GCAwareJITStubRoutine.h 2014-03-25 22:34:47 UTC (rev 166262)
+++ trunk/Source/JavaScriptCore/jit/GCAwareJITStubRoutine.h 2014-03-25 22:38:52 UTC (rev 166263)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<JITStubRoutine> createJITStubRoutine(
</span><span class="cx"> const MacroAssemblerCodeRef&, VM&, const JSCell* owner, bool makesCalls,
</span><del>- JSCell* = 0);
</del><ins>+ JSCell* = nullptr);
</ins><span class="cx">
</span><span class="cx"> // Helper for the creation of simple stub routines that need no help from the GC. Note
</span><span class="cx"> // that codeBlock gets "executed" more than once.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitRepatchcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/Repatch.cpp (166262 => 166263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/Repatch.cpp 2014-03-25 22:34:47 UTC (rev 166262)
+++ trunk/Source/JavaScriptCore/jit/Repatch.cpp 2014-03-25 22:38:52 UTC (rev 166263)
</span><span class="lines">@@ -28,11 +28,13 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(JIT)
</span><span class="cx">
</span><ins>+#include "AccessorCallJITStubRoutine.h"
</ins><span class="cx"> #include "CCallHelpers.h"
</span><span class="cx"> #include "DFGOperations.h"
</span><span class="cx"> #include "DFGSpeculativeJIT.h"
</span><span class="cx"> #include "FTLThunks.h"
</span><span class="cx"> #include "GCAwareJITStubRoutine.h"
</span><ins>+#include "GetterSetter.h"
</ins><span class="cx"> #include "JIT.h"
</span><span class="cx"> #include "JITInlines.h"
</span><span class="cx"> #include "LinkBuffer.h"
</span><span class="lines">@@ -301,19 +303,138 @@
</span><span class="cx"> #if USE(JSVALUE64)
</span><span class="cx"> stubJit.load64(MacroAssembler::Address(storageGPR, offsetRelativeToBase(offset)), loadedValueGPR);
</span><span class="cx"> #else
</span><del>- stubJit.load32(MacroAssembler::Address(storageGPR, offsetRelativeToBase(offset) + TagOffset), resultTagGPR);
</del><ins>+ if (slot.isCacheableValue())
+ stubJit.load32(MacroAssembler::Address(storageGPR, offsetRelativeToBase(offset) + TagOffset), resultTagGPR);
</ins><span class="cx"> stubJit.load32(MacroAssembler::Address(storageGPR, offsetRelativeToBase(offset) + PayloadOffset), loadedValueGPR);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Stuff for custom getters.
</ins><span class="cx"> MacroAssembler::Call operationCall;
</span><span class="cx"> MacroAssembler::Call handlerCall;
</span><span class="cx"> FunctionPtr operationFunction;
</span><ins>+
+ // Stuff for JS getters.
+ MacroAssembler::DataLabelPtr addressOfLinkFunctionCheck;
+ MacroAssembler::Call fastPathCall;
+ MacroAssembler::Call slowPathCall;
+ std::unique_ptr<CallLinkInfo> callLinkInfo;
+
</ins><span class="cx"> MacroAssembler::Jump success, fail;
</span><span class="cx"> if (isAccessor) {
</span><ins>+ // Need to make sure that whenever this call is made in the future, we remember the
+ // place that we made it from. It just so happens to be the place that we are at
+ // right now!
+ stubJit.store32(MacroAssembler::TrustedImm32(exec->locationAsRawBits()),
+ CCallHelpers::tagFor(static_cast<VirtualRegister>(JSStack::ArgumentCount)));
+
</ins><span class="cx"> if (slot.isCacheableGetter()) {
</span><del>- stubJit.setupArgumentsWithExecState(baseGPR, loadedValueGPR);
- operationFunction = operationCallGetter;
</del><ins>+ // Create a JS call using a JS call inline cache. Assume that:
+ //
+ // - SP is aligned and represents the extent of the calling compiler's stack usage.
+ //
+ // - FP is set correctly (i.e. it points to the caller's call frame header).
+ //
+ // - SP - FP is an aligned difference.
+ //
+ // - Any byte between FP (exclusive) and SP (inclusive) could be live in the calling
+ // code.
+ //
+ // Therefore, we temporary grow the stack for the purpose of the call and then
+ // degrow it after.
+
+ callLinkInfo = std::make_unique<CallLinkInfo>();
+ callLinkInfo->callType = CallLinkInfo::Call;
+ callLinkInfo->codeOrigin = stubInfo.codeOrigin;
+ callLinkInfo->calleeGPR = loadedValueGPR;
+
+ MacroAssembler::JumpList done;
+
+ // There is a 'this' argument but nothing else.
+ unsigned numberOfParameters = 1;
+
+ // Get the getter; if there ain't one then the result is jsUndefined().
+ stubJit.loadPtr(
+ MacroAssembler::Address(loadedValueGPR, GetterSetter::offsetOfGetter()),
+ loadedValueGPR);
+ MacroAssembler::Jump returnUndefined = stubJit.branchTestPtr(
+ MacroAssembler::Zero, loadedValueGPR);
+
+ unsigned numberOfRegsForCall =
+ JSStack::CallFrameHeaderSize + numberOfParameters;
+
+ unsigned alignedNumberOfNeededRegs =
+ WTF::roundUpToMultipleOf(stackAlignmentRegisters(), numberOfRegsForCall);
+
+ unsigned alignedNumberOfNeededBytes =
+ alignedNumberOfNeededRegs * sizeof(Register);
+
+ stubJit.subPtr(
+ MacroAssembler::TrustedImm32(
+ alignedNumberOfNeededBytes - sizeof(CallerFrameAndPC)),
+ MacroAssembler::stackPointerRegister);
+
+ MacroAssembler::Address calleeFrame = MacroAssembler::Address(
+ MacroAssembler::stackPointerRegister,
+ -static_cast<ptrdiff_t>(sizeof(CallerFrameAndPC)));
+
+ stubJit.store32(
+ MacroAssembler::TrustedImm32(numberOfParameters),
+ calleeFrame.withOffset(
+ JSStack::ArgumentCount * sizeof(Register) + PayloadOffset));
+
+ stubJit.storeCell(
+ loadedValueGPR, calleeFrame.withOffset(JSStack::Callee * sizeof(Register)));
+ stubJit.storeCell(
+ baseGPR,
+ calleeFrame.withOffset(
+ virtualRegisterForArgument(0).offset() * sizeof(Register)));
+
+ MacroAssembler::Jump slowCase = stubJit.branchPtrWithPatch(
+ MacroAssembler::NotEqual, loadedValueGPR, addressOfLinkFunctionCheck,
+ MacroAssembler::TrustedImmPtr(0));
+
+ // loadedValueGPR is already burned. We can reuse it. From here on we assume that
+ // any volatile register will be clobbered anyway.
+ stubJit.loadPtr(
+ MacroAssembler::Address(loadedValueGPR, JSFunction::offsetOfScopeChain()),
+ loadedValueGPR);
+ stubJit.storeCell(
+ loadedValueGPR, calleeFrame.withOffset(JSStack::ScopeChain * sizeof(Register)));
+ fastPathCall = stubJit.nearCall();
+
+ stubJit.addPtr(
+ MacroAssembler::TrustedImm32(
+ alignedNumberOfNeededBytes - sizeof(CallerFrameAndPC)),
+ MacroAssembler::stackPointerRegister);
+
+ done.append(stubJit.jump());
+ slowCase.link(&stubJit);
+
+ stubJit.move(loadedValueGPR, GPRInfo::regT0);
+#if USE(JSVALUE32_64)
+ stubJit.move(MacroAssembler::TrustedImm32(JSValue::CellTag), GPRInfo::regT1);
+#endif
+ stubJit.move(MacroAssembler::TrustedImmPtr(callLinkInfo.get()), GPRInfo::regT2);
+ slowPathCall = stubJit.nearCall();
+
+ stubJit.addPtr(
+ MacroAssembler::TrustedImm32(
+ alignedNumberOfNeededBytes - sizeof(CallerFrameAndPC)),
+ MacroAssembler::stackPointerRegister);
+
+ done.append(stubJit.jump());
+ returnUndefined.link(&stubJit);
+
+#if USE(JSVALUE64)
+ stubJit.move(
+ MacroAssembler::TrustedImm64(JSValue::encode(jsUndefined())), resultGPR);
+#else
+ stubJit.move(MacroAssembler::TrustedImm32(JSValue::UndefinedTag), resultTagGPR);
+ stubJit.move(MacroAssembler::TrustedImm32(0), resultGPR);
+#endif
+
+ done.link(&stubJit);
</ins><span class="cx"> } else {
</span><span class="cx"> // EncodedJSValue (*GetValueFunc)(ExecState*, JSObject* slotBase, EncodedJSValue thisValue, PropertyName);
</span><span class="cx"> #if USE(JSVALUE64)
</span><span class="lines">@@ -321,44 +442,53 @@
</span><span class="cx"> #else
</span><span class="cx"> stubJit.setupArgumentsWithExecState(baseForAccessGPR, baseGPR, MacroAssembler::TrustedImm32(JSValue::CellTag), MacroAssembler::TrustedImmPtr(propertyName.impl()));
</span><span class="cx"> #endif
</span><ins>+ stubJit.storePtr(GPRInfo::callFrameRegister, &vm->topCallFrame);
+
</ins><span class="cx"> operationFunction = FunctionPtr(slot.customGetter());
</span><del>- }
</del><span class="cx">
</span><del>- // Need to make sure that whenever this call is made in the future, we remember the
- // place that we made it from. It just so happens to be the place that we are at
- // right now!
- stubJit.store32(MacroAssembler::TrustedImm32(exec->locationAsRawBits()),
- CCallHelpers::tagFor(static_cast<VirtualRegister>(JSStack::ArgumentCount)));
- stubJit.storePtr(GPRInfo::callFrameRegister, &vm->topCallFrame);
-
- operationCall = stubJit.call();
</del><ins>+ operationCall = stubJit.call();
</ins><span class="cx"> #if USE(JSVALUE64)
</span><del>- stubJit.move(GPRInfo::returnValueGPR, resultGPR);
</del><ins>+ stubJit.move(GPRInfo::returnValueGPR, resultGPR);
</ins><span class="cx"> #else
</span><del>- stubJit.setupResults(resultGPR, resultTagGPR);
</del><ins>+ stubJit.setupResults(resultGPR, resultTagGPR);
</ins><span class="cx"> #endif
</span><del>- MacroAssembler::Jump noException = stubJit.emitExceptionCheck(CCallHelpers::InvertedExceptionCheck);
-
- stubJit.setupArguments(CCallHelpers::TrustedImmPtr(vm), GPRInfo::callFrameRegister);
- handlerCall = stubJit.call();
- stubJit.jumpToExceptionHandler();
-
- noException.link(&stubJit);
</del><ins>+ MacroAssembler::Jump noException = stubJit.emitExceptionCheck(CCallHelpers::InvertedExceptionCheck);
+
+ stubJit.setupArguments(CCallHelpers::TrustedImmPtr(vm), GPRInfo::callFrameRegister);
+ handlerCall = stubJit.call();
+ stubJit.jumpToExceptionHandler();
+
+ noException.link(&stubJit);
+ }
</ins><span class="cx"> }
</span><span class="cx"> emitRestoreScratch(stubJit, needToRestoreScratch, scratchGPR, success, fail, failureCases);
</span><span class="cx">
</span><span class="cx"> LinkBuffer patchBuffer(*vm, &stubJit, exec->codeBlock());
</span><span class="cx">
</span><span class="cx"> linkRestoreScratch(patchBuffer, needToRestoreScratch, success, fail, failureCases, successLabel, slowCaseLabel);
</span><del>- if (isAccessor) {
</del><ins>+ if (slot.isCacheableCustom()) {
</ins><span class="cx"> patchBuffer.link(operationCall, operationFunction);
</span><span class="cx"> patchBuffer.link(handlerCall, lookupExceptionHandler);
</span><ins>+ } else if (slot.isCacheableGetter()) {
+ callLinkInfo->hotPathOther = patchBuffer.locationOfNearCall(fastPathCall);
+ callLinkInfo->hotPathBegin = patchBuffer.locationOf(addressOfLinkFunctionCheck);
+ callLinkInfo->callReturnLocation = patchBuffer.locationOfNearCall(slowPathCall);
+
+ ThunkGenerator generator = linkThunkGeneratorFor(
+ CodeForCall, RegisterPreservationNotRequired);
+ patchBuffer.link(
+ slowPathCall, CodeLocationLabel(vm->getCTIStub(generator).code()));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- stubRoutine = FINALIZE_CODE_FOR_GC_AWARE_STUB(
- exec->codeBlock(), patchBuffer, true, nullptr,
</del><ins>+ MacroAssemblerCodeRef code = FINALIZE_CODE_FOR(
+ exec->codeBlock(), patchBuffer,
</ins><span class="cx"> ("Get access stub for %s, return point %p",
</span><span class="cx"> toCString(*exec->codeBlock()).data(), successLabel.executableAddress()));
</span><ins>+
+ if (slot.isCacheableGetter())
+ stubRoutine = adoptRef(new AccessorCallJITStubRoutine(code, *vm, std::move(callLinkInfo)));
+ else
+ stubRoutine = createJITStubRoutine(code, *vm, codeBlock->ownerExecutable(), true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool tryCacheGetByID(ExecState* exec, JSValue baseValue, const Identifier& propertyName, const PropertySlot& slot, StructureStubInfo& stubInfo)
</span><span class="lines">@@ -587,10 +717,17 @@
</span><span class="cx"> stubInfo.callReturnLocation.labelAtOffset(stubInfo.patch.deltaCallToDone),
</span><span class="cx"> CodeLocationLabel(list->currentSlowPathTarget(stubInfo)), stubRoutine);
</span><span class="cx">
</span><ins>+ GetByIdAccess::AccessType accessType;
+ if (slot.isCacheableValue())
+ accessType = GetByIdAccess::SimpleStub;
+ else if (slot.isCacheableGetter())
+ accessType = GetByIdAccess::Getter;
+ else
+ accessType = GetByIdAccess::CustomGetter;
+
</ins><span class="cx"> list->addAccess(GetByIdAccess(
</span><del>- *vm, codeBlock->ownerExecutable(),
- slot.isCacheableValue() ? GetByIdAccess::SimpleStub : GetByIdAccess::Getter,
- stubRoutine, structure, prototypeChain, count));
</del><ins>+ *vm, codeBlock->ownerExecutable(), accessType, stubRoutine, structure,
+ prototypeChain, count));
</ins><span class="cx">
</span><span class="cx"> patchJumpToGetByIdStub(codeBlock, stubInfo, stubRoutine.get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeGetterSetterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/GetterSetter.h (166262 => 166263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/GetterSetter.h 2014-03-25 22:34:47 UTC (rev 166262)
+++ trunk/Source/JavaScriptCore/runtime/GetterSetter.h 2014-03-25 22:38:52 UTC (rev 166263)
</span><span class="lines">@@ -64,6 +64,16 @@
</span><span class="cx"> return Structure::create(vm, globalObject, prototype, TypeInfo(GetterSetterType, OverridesVisitChildren), info());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static ptrdiff_t offsetOfGetter()
+ {
+ return OBJECT_OFFSETOF(GetterSetter, m_getter);
+ }
+
+ static ptrdiff_t offsetOfSetter()
+ {
+ return OBJECT_OFFSETOF(GetterSetter, m_setter);
+ }
+
</ins><span class="cx"> DECLARE_INFO;
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre>
</div>
</div>
</body>
</html>