<!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>[166178] 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/166178">166178</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-03-24 10:29:51 -0700 (Mon, 24 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, fix CLOOP build.
* bytecode/CallLinkStatus.cpp:
(JSC::CallLinkStatus::computeFor):
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::printCallOp):
(JSC::CodeBlock::getCallLinkInfoForBytecodeIndex):
(JSC::CodeBlock::resetStubDuringGCInternal): Deleted.
* bytecode/CodeBlock.h:
(JSC::CodeBlock::callLinkInfosEnd): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCallLinkStatuscpp">trunk/Source/JavaScriptCore/bytecode/CallLinkStatus.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockh">trunk/Source/JavaScriptCore/bytecode/CodeBlock.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (166177 => 166178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-24 17:21:46 UTC (rev 166177)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-24 17:29:51 UTC (rev 166178)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-03-24 Filip Pizlo <fpizlo@apple.com>
+
+ Unreviewed, fix CLOOP build.
+
+ * bytecode/CallLinkStatus.cpp:
+ (JSC::CallLinkStatus::computeFor):
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::printCallOp):
+ (JSC::CodeBlock::getCallLinkInfoForBytecodeIndex):
+ (JSC::CodeBlock::resetStubDuringGCInternal): Deleted.
+ * bytecode/CodeBlock.h:
+ (JSC::CodeBlock::callLinkInfosEnd): Deleted.
+
</ins><span class="cx"> 2014-03-24 Gabor Rapcsanyi <rgabor@webkit.org>
</span><span class="cx">
</span><span class="cx"> [ARM64] GNU assembler doesn't work with LLInt arm64 backend.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCallLinkStatuscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CallLinkStatus.cpp (166177 => 166178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CallLinkStatus.cpp 2014-03-24 17:21:46 UTC (rev 166177)
+++ trunk/Source/JavaScriptCore/bytecode/CallLinkStatus.cpp 2014-03-24 17:29:51 UTC (rev 166178)
</span><span class="lines">@@ -122,6 +122,7 @@
</span><span class="cx">
</span><span class="cx"> UNUSED_PARAM(profiledBlock);
</span><span class="cx"> UNUSED_PARAM(bytecodeIndex);
</span><ins>+ UNUSED_PARAM(map);
</ins><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx"> if (profiledBlock->hasExitSite(locker, DFG::FrequentExitSite(bytecodeIndex, BadCache))
</span><span class="cx"> || profiledBlock->hasExitSite(locker, DFG::FrequentExitSite(bytecodeIndex, BadCacheWatchpoint))
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (166177 => 166178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-03-24 17:21:46 UTC (rev 166177)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-03-24 17:29:51 UTC (rev 166178)
</span><span class="lines">@@ -433,6 +433,8 @@
</span><span class="cx"> out.printf(" jit(%p, exec %p)", target, target->executable());
</span><span class="cx"> }
</span><span class="cx"> out.print(" status(", CallLinkStatus::computeFor(this, location, map), ")");
</span><ins>+#else
+ UNUSED_PARAM(map);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> ++it;
</span><span class="lines">@@ -2310,20 +2312,7 @@
</span><span class="cx"> getCallLinkInfoMap(locker, result);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CallLinkInfo* CodeBlock::getCallLinkInfoForBytecodeIndex(unsigned index)
-{
</del><span class="cx"> #if ENABLE(JIT)
</span><del>- for (auto iter = m_callLinkInfos.begin(); !!iter; ++iter) {
- if ((*iter)->codeOrigin == CodeOrigin(index))
- return *iter;
- }
-#else
- UNUSED_PARAM(index);
-#endif
- return nullptr;
-}
-
-#if ENABLE(JIT)
</del><span class="cx"> StructureStubInfo* CodeBlock::addStubInfo()
</span><span class="cx"> {
</span><span class="cx"> ConcurrentJITLocker locker(m_lock);
</span><span class="lines">@@ -2376,6 +2365,15 @@
</span><span class="cx"> resetStubInternal(repatchBuffer, stubInfo);
</span><span class="cx"> stubInfo.resetByGC = true;
</span><span class="cx"> }
</span><ins>+
+CallLinkInfo* CodeBlock::getCallLinkInfoForBytecodeIndex(unsigned index)
+{
+ for (auto iter = m_callLinkInfos.begin(); !!iter; ++iter) {
+ if ((*iter)->codeOrigin == CodeOrigin(index))
+ return *iter;
+ }
+ return nullptr;
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void CodeBlock::stronglyVisitStrongReferences(SlotVisitor& visitor)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.h (166177 => 166178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2014-03-24 17:21:46 UTC (rev 166177)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2014-03-24 17:29:51 UTC (rev 166178)
</span><span class="lines">@@ -184,10 +184,6 @@
</span><span class="cx"> void getCallLinkInfoMap(const ConcurrentJITLocker&, CallLinkInfoMap& result);
</span><span class="cx"> void getCallLinkInfoMap(CallLinkInfoMap& result);
</span><span class="cx">
</span><del>- // This is a slow function call used primarily for compiling OSR exits in the case
- // that there had been inlining. Chances are if you want to use this, you're really
- // looking for a CallLinkInfoMap to amortize the cost of calling this.
- CallLinkInfo* getCallLinkInfoForBytecodeIndex(unsigned bytecodeIndex);
</del><span class="cx"> #if ENABLE(JIT)
</span><span class="cx"> StructureStubInfo* addStubInfo();
</span><span class="cx"> Bag<StructureStubInfo>::iterator stubInfoBegin() { return m_stubInfos.begin(); }
</span><span class="lines">@@ -203,6 +199,11 @@
</span><span class="cx"> CallLinkInfo* addCallLinkInfo();
</span><span class="cx"> Bag<CallLinkInfo>::iterator callLinkInfosBegin() { return m_callLinkInfos.begin(); }
</span><span class="cx"> Bag<CallLinkInfo>::iterator callLinkInfosEnd() { return m_callLinkInfos.end(); }
</span><ins>+
+ // This is a slow function call used primarily for compiling OSR exits in the case
+ // that there had been inlining. Chances are if you want to use this, you're really
+ // looking for a CallLinkInfoMap to amortize the cost of calling this.
+ CallLinkInfo* getCallLinkInfoForBytecodeIndex(unsigned bytecodeIndex);
</ins><span class="cx"> #endif // ENABLE(JIT)
</span><span class="cx">
</span><span class="cx"> void unlinkIncomingCalls();
</span></span></pre>
</div>
</div>
</body>
</html>