<!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>[190555] 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/190555">190555</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-10-04 16:25:44 -0700 (Sun, 04 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>CodeBlock.h shouldn't be included from everywhere
https://bugs.webkit.org/show_bug.cgi?id=149785
Reviewed by Andreas Kling.
* JavaScriptCore.xcodeproj/project.pbxproj:
* dfg/DFGAdaptiveInferredPropertyValueWatchpoint.cpp:
* dfg/DFGAdaptiveStructureWatchpoint.cpp:
* interpreter/CallFrame.cpp:
(JSC::CallFrame::callSiteBitsAreBytecodeOffset):
(JSC::CallFrame::callSiteBitsAreCodeOriginIndex):
(JSC::CallFrame::callSiteAsRawBits):
(JSC::CallFrame::callSiteIndex):
(JSC::CallFrame::hasActivation):
(JSC::CallFrame::uncheckedActivation):
(JSC::CallFrame::stack):
* interpreter/CallFrameInlines.h: Removed.
* interpreter/Interpreter.cpp:
* interpreter/StackVisitor.cpp:
* runtime/DirectArguments.cpp:
* runtime/ErrorInstance.cpp:
* runtime/JSArray.cpp:
* runtime/JSCInlines.h:
* runtime/LiteralParser.cpp:
* runtime/NullSetterFunction.cpp:
* tools/JSDollarVMPrototype.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGAdaptiveInferredPropertyValueWatchpointcpp">trunk/Source/JavaScriptCore/dfg/DFGAdaptiveInferredPropertyValueWatchpoint.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGAdaptiveStructureWatchpointcpp">trunk/Source/JavaScriptCore/dfg/DFGAdaptiveStructureWatchpoint.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterCallFramecpp">trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterInterpretercpp">trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterStackVisitorcpp">trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeDirectArgumentscpp">trunk/Source/JavaScriptCore/runtime/DirectArguments.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeErrorInstancecpp">trunk/Source/JavaScriptCore/runtime/ErrorInstance.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSArraycpp">trunk/Source/JavaScriptCore/runtime/JSArray.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCInlinesh">trunk/Source/JavaScriptCore/runtime/JSCInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeLiteralParsercpp">trunk/Source/JavaScriptCore/runtime/LiteralParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeNullSetterFunctioncpp">trunk/Source/JavaScriptCore/runtime/NullSetterFunction.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretoolsJSDollarVMPrototypecpp">trunk/Source/JavaScriptCore/tools/JSDollarVMPrototype.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreinterpreterCallFrameInlinesh">trunk/Source/JavaScriptCore/interpreter/CallFrameInlines.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (190554 => 190555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-10-04 22:30:17 UTC (rev 190554)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-10-04 23:25:44 UTC (rev 190555)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-10-04 Filip Pizlo <fpizlo@apple.com>
+
+ CodeBlock.h shouldn't be included from everywhere
+ https://bugs.webkit.org/show_bug.cgi?id=149785
+
+ Reviewed by Andreas Kling.
+
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * dfg/DFGAdaptiveInferredPropertyValueWatchpoint.cpp:
+ * dfg/DFGAdaptiveStructureWatchpoint.cpp:
+ * interpreter/CallFrame.cpp:
+ (JSC::CallFrame::callSiteBitsAreBytecodeOffset):
+ (JSC::CallFrame::callSiteBitsAreCodeOriginIndex):
+ (JSC::CallFrame::callSiteAsRawBits):
+ (JSC::CallFrame::callSiteIndex):
+ (JSC::CallFrame::hasActivation):
+ (JSC::CallFrame::uncheckedActivation):
+ (JSC::CallFrame::stack):
+ * interpreter/CallFrameInlines.h: Removed.
+ * interpreter/Interpreter.cpp:
+ * interpreter/StackVisitor.cpp:
+ * runtime/DirectArguments.cpp:
+ * runtime/ErrorInstance.cpp:
+ * runtime/JSArray.cpp:
+ * runtime/JSCInlines.h:
+ * runtime/LiteralParser.cpp:
+ * runtime/NullSetterFunction.cpp:
+ * tools/JSDollarVMPrototype.cpp:
+
</ins><span class="cx"> 2015-10-03 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r190522.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (190554 => 190555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-10-04 22:30:17 UTC (rev 190554)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-10-04 23:25:44 UTC (rev 190555)
</span><span class="lines">@@ -1502,7 +1502,6 @@
</span><span class="cx"> A7C0C4AC168103020017011D /* JSScriptRefPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = A7C0C4AB167C08CD0017011D /* JSScriptRefPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A7C0C4AD1681067E0017011D /* JSScriptRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7C0C4AA167C08CD0017011D /* JSScriptRef.cpp */; };
</span><span class="cx"> A7C1E8E4112E72EF00A37F98 /* JITPropertyAccess32_64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7C1E8C8112E701C00A37F98 /* JITPropertyAccess32_64.cpp */; };
</span><del>- A7C1EAEF17987AB600299DB2 /* CallFrameInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = A7C1EAEA17987AB600299DB2 /* CallFrameInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> A7C1EAF017987AB600299DB2 /* JSStackInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = A7C1EAEB17987AB600299DB2 /* JSStackInlines.h */; };
</span><span class="cx"> A7C1EAF117987AB600299DB2 /* StackVisitor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7C1EAEC17987AB600299DB2 /* StackVisitor.cpp */; };
</span><span class="cx"> A7C1EAF217987AB600299DB2 /* StackVisitor.h in Headers */ = {isa = PBXBuildFile; fileRef = A7C1EAED17987AB600299DB2 /* StackVisitor.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -3392,7 +3391,6 @@
</span><span class="cx"> A7C0C4AA167C08CD0017011D /* JSScriptRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSScriptRef.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A7C0C4AB167C08CD0017011D /* JSScriptRefPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSScriptRefPrivate.h; sourceTree = "<group>"; };
</span><span class="cx"> A7C1E8C8112E701C00A37F98 /* JITPropertyAccess32_64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JITPropertyAccess32_64.cpp; sourceTree = "<group>"; };
</span><del>- A7C1EAEA17987AB600299DB2 /* CallFrameInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallFrameInlines.h; sourceTree = "<group>"; };
</del><span class="cx"> A7C1EAEB17987AB600299DB2 /* JSStackInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSStackInlines.h; sourceTree = "<group>"; };
</span><span class="cx"> A7C1EAEC17987AB600299DB2 /* StackVisitor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = StackVisitor.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A7C1EAED17987AB600299DB2 /* StackVisitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StackVisitor.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4115,7 +4113,6 @@
</span><span class="cx"> 1429D8DB0ED2205B00B89619 /* CallFrame.cpp */,
</span><span class="cx"> 1429D8DC0ED2205B00B89619 /* CallFrame.h */,
</span><span class="cx"> A7F869EC0F95C2EC00558697 /* CallFrameClosure.h */,
</span><del>- A7C1EAEA17987AB600299DB2 /* CallFrameInlines.h */,
</del><span class="cx"> 1429D7D30ED2128200B89619 /* Interpreter.cpp */,
</span><span class="cx"> 1429D77B0ED20D7300B89619 /* Interpreter.h */,
</span><span class="cx"> 1429D85B0ED218E900B89619 /* JSStack.cpp */,
</span><span class="lines">@@ -6025,7 +6022,6 @@
</span><span class="cx"> BC18C3ED0E16F5CD00B34460 /* CallData.h in Headers */,
</span><span class="cx"> 0F64B27A1A7957B2006E4E66 /* CallEdge.h in Headers */,
</span><span class="cx"> 1429D8DE0ED2205B00B89619 /* CallFrame.h in Headers */,
</span><del>- A7C1EAEF17987AB600299DB2 /* CallFrameInlines.h in Headers */,
</del><span class="cx"> 62EC9BB71B7EB07C00303AD1 /* CallFrameShuffleData.h in Headers */,
</span><span class="cx"> 62D755D71B84FB4A001801FA /* CallFrameShuffler.h in Headers */,
</span><span class="cx"> 95E3BC050E1AE68200B2D1C1 /* CallIdentifier.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAdaptiveInferredPropertyValueWatchpointcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAdaptiveInferredPropertyValueWatchpoint.cpp (190554 => 190555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAdaptiveInferredPropertyValueWatchpoint.cpp 2015-10-04 22:30:17 UTC (rev 190554)
+++ trunk/Source/JavaScriptCore/dfg/DFGAdaptiveInferredPropertyValueWatchpoint.cpp 2015-10-04 23:25:44 UTC (rev 190555)
</span><span class="lines">@@ -28,6 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx">
</span><ins>+#include "CodeBlock.h"
+#include "DFGCommon.h"
</ins><span class="cx"> #include "JSCInlines.h"
</span><span class="cx">
</span><span class="cx"> namespace JSC { namespace DFG {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAdaptiveStructureWatchpointcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAdaptiveStructureWatchpoint.cpp (190554 => 190555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAdaptiveStructureWatchpoint.cpp 2015-10-04 22:30:17 UTC (rev 190554)
+++ trunk/Source/JavaScriptCore/dfg/DFGAdaptiveStructureWatchpoint.cpp 2015-10-04 23:25:44 UTC (rev 190555)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx">
</span><ins>+#include "CodeBlock.h"
</ins><span class="cx"> #include "JSCInlines.h"
</span><span class="cx">
</span><span class="cx"> namespace JSC { namespace DFG {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp (190554 => 190555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp 2015-10-04 22:30:17 UTC (rev 190554)
+++ trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp 2015-10-04 23:25:44 UTC (rev 190555)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CallFrame.h"
</span><span class="cx">
</span><del>-#include "CallFrameInlines.h"
</del><span class="cx"> #include "CodeBlock.h"
</span><span class="cx"> #include "InlineCallFrame.h"
</span><span class="cx"> #include "Interpreter.h"
</span><span class="lines">@@ -37,6 +36,68 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><ins>+bool CallFrame::callSiteBitsAreBytecodeOffset() const
+{
+ ASSERT(codeBlock());
+ switch (codeBlock()->jitType()) {
+ case JITCode::InterpreterThunk:
+ case JITCode::BaselineJIT:
+ return true;
+ case JITCode::None:
+ case JITCode::HostCallThunk:
+ RELEASE_ASSERT_NOT_REACHED();
+ return false;
+ default:
+ return false;
+ }
+
+ RELEASE_ASSERT_NOT_REACHED();
+ return false;
+}
+
+bool CallFrame::callSiteBitsAreCodeOriginIndex() const
+{
+ ASSERT(codeBlock());
+ switch (codeBlock()->jitType()) {
+ case JITCode::DFGJIT:
+ case JITCode::FTLJIT:
+ return true;
+ case JITCode::None:
+ case JITCode::HostCallThunk:
+ RELEASE_ASSERT_NOT_REACHED();
+ return false;
+ default:
+ return false;
+ }
+
+ RELEASE_ASSERT_NOT_REACHED();
+ return false;
+}
+
+unsigned CallFrame::callSiteAsRawBits() const
+{
+ return this[JSStack::ArgumentCount].tag();
+}
+
+CallSiteIndex CallFrame::callSiteIndex() const
+{
+ return CallSiteIndex(callSiteAsRawBits());
+}
+
+bool CallFrame::hasActivation() const
+{
+ JSValue activation = uncheckedActivation();
+ return !!activation && activation.isCell();
+}
+
+JSValue CallFrame::uncheckedActivation() const
+{
+ CodeBlock* codeBlock = this->codeBlock();
+ RELEASE_ASSERT(codeBlock->needsActivation());
+ VirtualRegister activationRegister = codeBlock->activationRegister();
+ return registers()[activationRegister.offset()].jsValue();
+}
+
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> JSStack* CallFrame::stack()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterCallFrameInlinesh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/interpreter/CallFrameInlines.h (190554 => 190555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/CallFrameInlines.h 2015-10-04 22:30:17 UTC (rev 190554)
+++ trunk/Source/JavaScriptCore/interpreter/CallFrameInlines.h 2015-10-04 23:25:44 UTC (rev 190555)
</span><span class="lines">@@ -1,98 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 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 CallFrameInlines_h
-#define CallFrameInlines_h
-
-#include "CallFrame.h"
-#include "CodeBlock.h"
-
-namespace JSC {
-
-inline bool CallFrame::callSiteBitsAreBytecodeOffset() const
-{
- ASSERT(codeBlock());
- switch (codeBlock()->jitType()) {
- case JITCode::InterpreterThunk:
- case JITCode::BaselineJIT:
- return true;
- case JITCode::None:
- case JITCode::HostCallThunk:
- RELEASE_ASSERT_NOT_REACHED();
- return false;
- default:
- return false;
- }
-
- RELEASE_ASSERT_NOT_REACHED();
- return false;
-}
-
-inline bool CallFrame::callSiteBitsAreCodeOriginIndex() const
-{
- ASSERT(codeBlock());
- switch (codeBlock()->jitType()) {
- case JITCode::DFGJIT:
- case JITCode::FTLJIT:
- return true;
- case JITCode::None:
- case JITCode::HostCallThunk:
- RELEASE_ASSERT_NOT_REACHED();
- return false;
- default:
- return false;
- }
-
- RELEASE_ASSERT_NOT_REACHED();
- return false;
-}
-
-inline unsigned CallFrame::callSiteAsRawBits() const
-{
- return this[JSStack::ArgumentCount].tag();
-}
-
-inline CallSiteIndex CallFrame::callSiteIndex() const
-{
- return CallSiteIndex(callSiteAsRawBits());
-}
-
-inline bool CallFrame::hasActivation() const
-{
- JSValue activation = uncheckedActivation();
- return !!activation && activation.isCell();
-}
-
-inline JSValue CallFrame::uncheckedActivation() const
-{
- CodeBlock* codeBlock = this->codeBlock();
- RELEASE_ASSERT(codeBlock->needsActivation());
- VirtualRegister activationRegister = codeBlock->activationRegister();
- return registers()[activationRegister.offset()].jsValue();
-}
-
-} // namespace JSC
-
-#endif // CallFrameInlines_h
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp (190554 => 190555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2015-10-04 22:30:17 UTC (rev 190554)
+++ trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2015-10-04 23:25:44 UTC (rev 190555)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx">
</span><span class="cx"> #include "BatchedTransitionOptimizer.h"
</span><span class="cx"> #include "CallFrameClosure.h"
</span><del>-#include "CallFrameInlines.h"
</del><span class="cx"> #include "ClonedArguments.h"
</span><span class="cx"> #include "CodeBlock.h"
</span><span class="cx"> #include "DirectArguments.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterStackVisitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp (190554 => 190555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp 2015-10-04 22:30:17 UTC (rev 190554)
+++ trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp 2015-10-04 23:25:44 UTC (rev 190555)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "StackVisitor.h"
</span><span class="cx">
</span><del>-#include "CallFrameInlines.h"
</del><span class="cx"> #include "ClonedArguments.h"
</span><span class="cx"> #include "Executable.h"
</span><span class="cx"> #include "InlineCallFrame.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeDirectArgumentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/DirectArguments.cpp (190554 => 190555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/DirectArguments.cpp 2015-10-04 22:30:17 UTC (rev 190554)
+++ trunk/Source/JavaScriptCore/runtime/DirectArguments.cpp 2015-10-04 23:25:44 UTC (rev 190555)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "DirectArguments.h"
</span><span class="cx">
</span><ins>+#include "CodeBlock.h"
</ins><span class="cx"> #include "CopyVisitorInlines.h"
</span><span class="cx"> #include "GenericArgumentsInlines.h"
</span><span class="cx"> #include "JSCInlines.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeErrorInstancecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ErrorInstance.cpp (190554 => 190555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ErrorInstance.cpp 2015-10-04 22:30:17 UTC (rev 190554)
+++ trunk/Source/JavaScriptCore/runtime/ErrorInstance.cpp 2015-10-04 23:25:44 UTC (rev 190555)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ErrorInstance.h"
</span><span class="cx">
</span><ins>+#include "CodeBlock.h"
</ins><span class="cx"> #include "JSScope.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "JSGlobalObjectFunctions.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSArraycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSArray.cpp (190554 => 190555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSArray.cpp 2015-10-04 22:30:17 UTC (rev 190554)
+++ trunk/Source/JavaScriptCore/runtime/JSArray.cpp 2015-10-04 23:25:44 UTC (rev 190555)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "ArrayPrototype.h"
</span><span class="cx"> #include "ButterflyInlines.h"
</span><span class="cx"> #include "CachedCall.h"
</span><ins>+#include "CodeBlock.h"
</ins><span class="cx"> #include "CopiedSpace.h"
</span><span class="cx"> #include "Error.h"
</span><span class="cx"> #include "Executable.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSCInlines.h (190554 => 190555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCInlines.h 2015-10-04 22:30:17 UTC (rev 190554)
+++ trunk/Source/JavaScriptCore/runtime/JSCInlines.h 2015-10-04 23:25:44 UTC (rev 190555)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> // In fact, it can make a lot of sense: outside of JSC, this file becomes a kind of umbrella
</span><span class="cx"> // header that pulls in most (all?) of the interesting things in JSC.
</span><span class="cx">
</span><del>-#include "CallFrameInlines.h"
</del><span class="cx"> #include "ExceptionHelpers.h"
</span><span class="cx"> #include "GCIncomingRefCountedInlines.h"
</span><span class="cx"> #include "HeapInlines.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeLiteralParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/LiteralParser.cpp (190554 => 190555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/LiteralParser.cpp 2015-10-04 22:30:17 UTC (rev 190554)
+++ trunk/Source/JavaScriptCore/runtime/LiteralParser.cpp 2015-10-04 23:25:44 UTC (rev 190555)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "LiteralParser.h"
</span><span class="cx">
</span><span class="cx"> #include "ButterflyInlines.h"
</span><ins>+#include "CodeBlock.h"
</ins><span class="cx"> #include "CopiedSpaceInlines.h"
</span><span class="cx"> #include "JSArray.h"
</span><span class="cx"> #include "JSString.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeNullSetterFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/NullSetterFunction.cpp (190554 => 190555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/NullSetterFunction.cpp 2015-10-04 22:30:17 UTC (rev 190554)
+++ trunk/Source/JavaScriptCore/runtime/NullSetterFunction.cpp 2015-10-04 23:25:44 UTC (rev 190555)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "NullSetterFunction.h"
</span><span class="cx">
</span><ins>+#include "CodeBlock.h"
</ins><span class="cx"> #include "Error.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "JSCJSValueInlines.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretoolsJSDollarVMPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tools/JSDollarVMPrototype.cpp (190554 => 190555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tools/JSDollarVMPrototype.cpp 2015-10-04 22:30:17 UTC (rev 190554)
+++ trunk/Source/JavaScriptCore/tools/JSDollarVMPrototype.cpp 2015-10-04 23:25:44 UTC (rev 190555)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "JSDollarVMPrototype.h"
</span><span class="cx">
</span><ins>+#include "CodeBlock.h"
</ins><span class="cx"> #include "Heap.h"
</span><span class="cx"> #include "HeapIterationScope.h"
</span><span class="cx"> #include "JSCInlines.h"
</span></span></pre>
</div>
</div>
</body>
</html>