<!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>[173541] trunk/Source</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/173541">173541</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2014-09-11 14:52:33 -0700 (Thu, 11 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move JSScope out of JSFunction into separate JSCallee class
https://bugs.webkit.org/show_bug.cgi?id=136725
Reviewed by Oliver Hunt.
Created new JSCallee class that contains a JSScope*. Changed JSFunction to inherit from
JSCallee.
Source/JavaScriptCore:
* CMakeLists.txt:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
* JavaScriptCore.xcodeproj/project.pbxproj:
Build changes. Added JSCallee.cpp and JSCallee.h.
* runtime/JSCallee.cpp: Added.
(JSC::JSCallee::create):
(JSC::JSCallee::destroy):
(JSC::JSCallee::JSCallee):
(JSC::JSCallee::finishCreation):
(JSC::JSCallee::visitChildren):
(JSC::JSCallee::getOwnPropertySlot): Pass through wrapper function.
(JSC::JSCallee::getOwnNonIndexPropertyNames): Pass through wrapper function.
(JSC::JSCallee::put): Pass through wrapper function.
(JSC::JSCallee::deleteProperty): Pass through wrapper function.
(JSC::JSCallee::defineOwnProperty): Pass through wrapper function.
* runtime/JSCallee.h: Added.
(JSC::JSCallee::scope):
(JSC::JSCallee::scopeUnchecked):
(JSC::JSCallee::setScope):
(JSC::JSCallee::createStructure):
(JSC::JSCallee::offsetOfScopeChain):
* runtime/JSFunction.cpp:
(JSC::JSFunction::JSFunction):
(JSC::JSFunction::addNameScopeIfNeeded):
(JSC::JSFunction::visitChildren):
* runtime/JSFunction.h:
(JSC::JSFunction::scope): Deleted.
(JSC::JSFunction::scopeUnchecked): Deleted.
(JSC::JSFunction::setScope): Deleted.
(JSC::JSFunction::offsetOfScopeChain): Deleted.
* runtime/JSFunctionInlines.h:
(JSC::JSFunction::JSFunction):
Changed to reference JSCallee and its methods.
* runtime/JSType.h: Added JSCallee as a TypeEnum.
Source/WebCore:
* ForwardingHeaders/runtime/JSCallee.h: New forwarding header.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSFunctioncpp">trunk/Source/JavaScriptCore/runtime/JSFunction.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSFunctionh">trunk/Source/JavaScriptCore/runtime/JSFunction.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSFunctionInlinesh">trunk/Source/JavaScriptCore/runtime/JSFunctionInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSTypeh">trunk/Source/JavaScriptCore/runtime/JSType.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCalleecpp">trunk/Source/JavaScriptCore/runtime/JSCallee.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCalleeh">trunk/Source/JavaScriptCore/runtime/JSCallee.h</a></li>
<li><a href="#trunkSourceWebCoreForwardingHeadersruntimeJSCalleeh">trunk/Source/WebCore/ForwardingHeaders/runtime/JSCallee.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (173540 => 173541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2014-09-11 21:45:45 UTC (rev 173540)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2014-09-11 21:52:33 UTC (rev 173541)
</span><span class="lines">@@ -438,11 +438,13 @@
</span><span class="cx"> runtime/JSBoundFunction.cpp
</span><span class="cx"> runtime/JSGlobalObjectDebuggable.cpp
</span><span class="cx"> runtime/JSCJSValue.cpp
</span><ins>+ runtime/JSCallee.cpp
</ins><span class="cx"> runtime/JSCell.cpp
</span><span class="cx"> runtime/JSConsole.cpp
</span><span class="cx"> runtime/JSDataView.cpp
</span><span class="cx"> runtime/JSDataViewPrototype.cpp
</span><span class="cx"> runtime/JSDateMath.cpp
</span><ins>+ runtime/JSEnvironmentRecord.cpp
</ins><span class="cx"> runtime/JSFunction.cpp
</span><span class="cx"> runtime/JSGlobalObject.cpp
</span><span class="cx"> runtime/JSGlobalObjectFunctions.cpp
</span><span class="lines">@@ -471,7 +473,6 @@
</span><span class="cx"> runtime/JSTypedArrayConstructors.cpp
</span><span class="cx"> runtime/JSTypedArrayPrototypes.cpp
</span><span class="cx"> runtime/JSTypedArrays.cpp
</span><del>- runtime/JSEnvironmentRecord.cpp
</del><span class="cx"> runtime/JSWeakMap.cpp
</span><span class="cx"> runtime/JSWithScope.cpp
</span><span class="cx"> runtime/JSWrapperObject.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (173540 => 173541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-09-11 21:45:45 UTC (rev 173540)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-09-11 21:52:33 UTC (rev 173541)
</span><span class="lines">@@ -1,3 +1,53 @@
</span><ins>+2014-09-10 Michael Saboff <msaboff@apple.com>
+
+ Move JSScope out of JSFunction into separate JSCallee class
+ https://bugs.webkit.org/show_bug.cgi?id=136725
+
+ Reviewed by Oliver Hunt.
+
+ Created new JSCallee class that contains a JSScope*. Changed JSFunction to inherit from
+ JSCallee.
+
+ * CMakeLists.txt:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ Build changes. Added JSCallee.cpp and JSCallee.h.
+
+ * runtime/JSCallee.cpp: Added.
+ (JSC::JSCallee::create):
+ (JSC::JSCallee::destroy):
+ (JSC::JSCallee::JSCallee):
+ (JSC::JSCallee::finishCreation):
+ (JSC::JSCallee::visitChildren):
+ (JSC::JSCallee::getOwnPropertySlot): Pass through wrapper function.
+ (JSC::JSCallee::getOwnNonIndexPropertyNames): Pass through wrapper function.
+ (JSC::JSCallee::put): Pass through wrapper function.
+ (JSC::JSCallee::deleteProperty): Pass through wrapper function.
+ (JSC::JSCallee::defineOwnProperty): Pass through wrapper function.
+
+ * runtime/JSCallee.h: Added.
+ (JSC::JSCallee::scope):
+ (JSC::JSCallee::scopeUnchecked):
+ (JSC::JSCallee::setScope):
+ (JSC::JSCallee::createStructure):
+ (JSC::JSCallee::offsetOfScopeChain):
+
+ * runtime/JSFunction.cpp:
+ (JSC::JSFunction::JSFunction):
+ (JSC::JSFunction::addNameScopeIfNeeded):
+ (JSC::JSFunction::visitChildren):
+ * runtime/JSFunction.h:
+ (JSC::JSFunction::scope): Deleted.
+ (JSC::JSFunction::scopeUnchecked): Deleted.
+ (JSC::JSFunction::setScope): Deleted.
+ (JSC::JSFunction::offsetOfScopeChain): Deleted.
+ * runtime/JSFunctionInlines.h:
+ (JSC::JSFunction::JSFunction):
+ Changed to reference JSCallee and its methods.
+
+ * runtime/JSType.h: Added JSCallee as a TypeEnum.
+
</ins><span class="cx"> 2014-09-11 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r172129): Vine pages load as blank
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (173540 => 173541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-09-11 21:45:45 UTC (rev 173540)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-09-11 21:52:33 UTC (rev 173541)
</span><span class="lines">@@ -711,6 +711,7 @@
</span><span class="cx"> <ClCompile Include="..\runtime\JSArrayBufferView.cpp" />
</span><span class="cx"> <ClCompile Include="..\runtime\JSBoundFunction.cpp" />
</span><span class="cx"> <ClCompile Include="..\runtime\JSCJSValue.cpp" />
</span><ins>+ <ClCompile Include="..\runtime\JSCallee.cpp" />
</ins><span class="cx"> <ClCompile Include="..\runtime\JSCell.cpp" />
</span><span class="cx"> <ClCompile Include="..\runtime\JSConsole.cpp" />
</span><span class="cx"> <ClCompile Include="..\runtime\JSDataView.cpp" />
</span><span class="lines">@@ -1467,6 +1468,7 @@
</span><span class="cx"> <ClInclude Include="..\runtime\JSCInlines.h" />
</span><span class="cx"> <ClInclude Include="..\runtime\JSCJSValue.h" />
</span><span class="cx"> <ClInclude Include="..\runtime\JSCJSValueInlines.h" />
</span><ins>+ <ClInclude Include="..\runtime\JSCallee.h" />
</ins><span class="cx"> <ClInclude Include="..\runtime\JSCell.h" />
</span><span class="cx"> <ClInclude Include="..\runtime\JSConsole.h" />
</span><span class="cx"> <ClInclude Include="..\runtime\JSDataView.h" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (173540 => 173541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2014-09-11 21:45:45 UTC (rev 173540)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2014-09-11 21:52:33 UTC (rev 173541)
</span><span class="lines">@@ -633,6 +633,9 @@
</span><span class="cx"> <ClCompile Include="..\runtime\JSBoundFunction.cpp">
</span><span class="cx"> <Filter>runtime</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\runtime\JSCallee.cpp">
+ <Filter>runtime</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\runtime\JSCell.cpp">
</span><span class="cx"> <Filter>runtime</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -2588,6 +2591,9 @@
</span><span class="cx"> <ClInclude Include="..\runtime\JSBoundFunction.h">
</span><span class="cx"> <Filter>runtime</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\runtime\JSCallee.h">
+ <Filter>runtime</Filter>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="..\runtime\JSCell.h">
</span><span class="cx"> <Filter>runtime</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (173540 => 173541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-09-11 21:45:45 UTC (rev 173540)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-09-11 21:52:33 UTC (rev 173541)
</span><span class="lines">@@ -1169,6 +1169,9 @@
</span><span class="cx"> 6553A33117A1F1EE008CF6F3 /* CommonSlowPathsExceptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6553A32F17A1F1EE008CF6F3 /* CommonSlowPathsExceptions.cpp */; };
</span><span class="cx"> 6553A33217A1F1EE008CF6F3 /* CommonSlowPathsExceptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6553A33017A1F1EE008CF6F3 /* CommonSlowPathsExceptions.h */; };
</span><span class="cx"> 655EB29B10CE2581001A990E /* NodesCodegen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 655EB29A10CE2581001A990E /* NodesCodegen.cpp */; };
</span><ins>+ 657CF45819BF6662004ACBF2 /* JSCallee.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 657CF45619BF6662004ACBF2 /* JSCallee.cpp */; };
+ 657CF45919BF6662004ACBF2 /* JSCallee.h in Headers */ = {isa = PBXBuildFile; fileRef = 657CF45719BF6662004ACBF2 /* JSCallee.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 657CF45A19C11390004ACBF2 /* JSCallee.h in Headers */ = {isa = PBXBuildFile; fileRef = 657CF45719BF6662004ACBF2 /* JSCallee.h */; };
</ins><span class="cx"> 658D3A5619638268003C45D6 /* VMEntryRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = 658D3A5519638268003C45D6 /* VMEntryRecord.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 65C02850171795E200351E35 /* ARMv7Disassembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65C0284F171795E200351E35 /* ARMv7Disassembler.cpp */; };
</span><span class="cx"> 65C0285C1717966800351E35 /* ARMv7DOpcode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65C0285A1717966800351E35 /* ARMv7DOpcode.cpp */; };
</span><span class="lines">@@ -2798,6 +2801,8 @@
</span><span class="cx"> 6560A4CF04B3B3E7008AE952 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
</span><span class="cx"> 65621E6B089E859700760F35 /* PropertySlot.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PropertySlot.cpp; sourceTree = "<group>"; tabWidth = 8; };
</span><span class="cx"> 65621E6C089E859700760F35 /* PropertySlot.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = PropertySlot.h; sourceTree = "<group>"; tabWidth = 8; };
</span><ins>+ 657CF45619BF6662004ACBF2 /* JSCallee.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCallee.cpp; sourceTree = "<group>"; };
+ 657CF45719BF6662004ACBF2 /* JSCallee.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCallee.h; sourceTree = "<group>"; };
</ins><span class="cx"> 65860177185A8F5E00030EEE /* MaxFrameExtentForSlowPathCall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MaxFrameExtentForSlowPathCall.h; sourceTree = "<group>"; };
</span><span class="cx"> 658D3A5519638268003C45D6 /* VMEntryRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = VMEntryRecord.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
</span><span class="cx"> 65987F2C167FE84B003C2F8D /* DFGOSRExitCompilationInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGOSRExitCompilationInfo.h; path = dfg/DFGOSRExitCompilationInfo.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4498,6 +4503,8 @@
</span><span class="cx"> A7BDAEC517F4EA1400F6140C /* JSArrayIterator.h */,
</span><span class="cx"> 86FA9E8F142BBB2D001773B7 /* JSBoundFunction.cpp */,
</span><span class="cx"> 86FA9E90142BBB2E001773B7 /* JSBoundFunction.h */,
</span><ins>+ 657CF45619BF6662004ACBF2 /* JSCallee.cpp */,
+ 657CF45719BF6662004ACBF2 /* JSCallee.h */,
</ins><span class="cx"> BC7F8FBA0E19D1EF008632C0 /* JSCell.cpp */,
</span><span class="cx"> BC1167D80E19BCC9008066DD /* JSCell.h */,
</span><span class="cx"> 0F97496F1687ADE200A4FF6A /* JSCellInlines.h */,
</span><span class="lines">@@ -5528,6 +5535,7 @@
</span><span class="cx"> 5540771818DA58AD00EFF7F2 /* JSLexicalEnvironment.h in Headers */,
</span><span class="cx"> 5540771B18DA58AD00EFF7F2 /* JSArgumentsIterator.h in Headers */,
</span><span class="cx"> 5540772218DA58AD00EFF7F2 /* JSArrayIterator.h in Headers */,
</span><ins>+ 657CF45A19C11390004ACBF2 /* JSCallee.h in Headers */,
</ins><span class="cx"> 5540774818DA58AD00EFF7F2 /* JSGlobalObjectDebuggable.h in Headers */,
</span><span class="cx"> 5540774A18DA58AD00EFF7F2 /* JSGlobalObjectFunctions.h in Headers */,
</span><span class="cx"> 5540775918DA58AD00EFF7F2 /* JSMapIterator.h in Headers */,
</span><span class="lines">@@ -6221,6 +6229,7 @@
</span><span class="cx"> 0F2D4DE919832DAC007D4B19 /* ToThisStatus.h in Headers */,
</span><span class="cx"> 140D17D70E8AD4A9000CD17D /* JSBasePrivate.h in Headers */,
</span><span class="cx"> 86FA9E92142BBB2E001773B7 /* JSBoundFunction.h in Headers */,
</span><ins>+ 657CF45919BF6662004ACBF2 /* JSCallee.h in Headers */,
</ins><span class="cx"> BC18C4190E16F5CD00B34460 /* JSCallbackConstructor.h in Headers */,
</span><span class="cx"> BC18C41A0E16F5CD00B34460 /* JSCallbackFunction.h in Headers */,
</span><span class="cx"> BC18C41B0E16F5CD00B34460 /* JSCallbackObject.h in Headers */,
</span><span class="lines">@@ -7490,6 +7499,7 @@
</span><span class="cx"> 1440F8920A508B100005F061 /* JSCallbackFunction.cpp in Sources */,
</span><span class="cx"> 14ABDF600A437FEF00ECCA01 /* JSCallbackObject.cpp in Sources */,
</span><span class="cx"> A7D801A81880D6A80026C39B /* JSCBuiltins.cpp in Sources */,
</span><ins>+ 657CF45819BF6662004ACBF2 /* JSCallee.cpp in Sources */,
</ins><span class="cx"> 147F39D1107EC37600427A48 /* JSCell.cpp in Sources */,
</span><span class="cx"> 147F39D6107EC37600427A48 /* JSCJSValue.cpp in Sources */,
</span><span class="cx"> 1440FCE40A51E46B0005F061 /* JSClassRef.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCalleecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/runtime/JSCallee.cpp (0 => 173541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCallee.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/runtime/JSCallee.cpp 2014-09-11 21:52:33 UTC (rev 173541)
</span><span class="lines">@@ -0,0 +1,106 @@
</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 "JSCallee.h"
+
+#include "GetterSetter.h"
+#include "JSCJSValueInlines.h"
+#include "JSCell.h"
+#include "JSCellInlines.h"
+#include "JSGlobalObject.h"
+#include "SlotVisitorInlines.h"
+#include "StackVisitor.h"
+#include "StructureInlines.h"
+
+namespace JSC {
+
+const ClassInfo JSCallee::s_info = { "Callee", &Base::s_info, 0, CREATE_METHOD_TABLE(JSCallee) };
+
+JSCallee* JSCallee::create(VM& vm, JSGlobalObject* globalObject)
+{
+ JSCallee* function = new (NotNull, allocateCell<JSCallee>(vm.heap)) JSCallee(vm, globalObject, globalObject->functionStructure());
+ function->finishCreation(vm);
+ return function;
+}
+
+void JSCallee::destroy(JSCell* cell)
+{
+ static_cast<JSCallee*>(cell)->JSCallee::~JSCallee();
+}
+
+JSCallee::JSCallee(VM& vm, JSGlobalObject* globalObject, Structure* structure)
+ : Base(vm, structure)
+ , m_scope(vm, this, globalObject)
+{
+}
+
+JSCallee::JSCallee(VM& vm, JSScope* scope, Structure* structure)
+ : Base(vm, structure)
+{
+ setScope(vm, scope);
+}
+
+void JSCallee::finishCreation(VM& vm)
+{
+ Base::finishCreation(vm);
+ ASSERT(inherits(info()));
+}
+
+void JSCallee::visitChildren(JSCell* cell, SlotVisitor& visitor)
+{
+ JSCallee* thisObject = jsCast<JSCallee*>(cell);
+ ASSERT_GC_OBJECT_INHERITS(thisObject, info());
+ Base::visitChildren(thisObject, visitor);
+
+ visitor.append(&thisObject->m_scope);
+}
+
+bool JSCallee::getOwnPropertySlot(JSObject* object, ExecState* exec, PropertyName propertyName, PropertySlot& slot)
+{
+ return Base::getOwnPropertySlot(object, exec, propertyName, slot);
+}
+
+void JSCallee::getOwnNonIndexPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
+{
+ Base::getOwnNonIndexPropertyNames(object, exec, propertyNames, mode);
+}
+
+void JSCallee::put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
+{
+ Base::put(cell, exec, propertyName, value, slot);
+}
+
+bool JSCallee::deleteProperty(JSCell* cell, ExecState* exec, PropertyName propertyName)
+{
+ return Base::deleteProperty(cell, exec, propertyName);
+}
+
+bool JSCallee::defineOwnProperty(JSObject* object, ExecState* exec, PropertyName propertyName, const PropertyDescriptor& descriptor, bool throwException)
+{
+ return Base::defineOwnProperty(object, exec, propertyName, descriptor, throwException);
+}
+
+} // namespace JSC
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCalleeh"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/runtime/JSCallee.h (0 => 173541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCallee.h (rev 0)
+++ trunk/Source/JavaScriptCore/runtime/JSCallee.h 2014-09-11 21:52:33 UTC (rev 173541)
</span><span class="lines">@@ -0,0 +1,113 @@
</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 JSCallee_h
+#define JSCallee_h
+
+#include "JSDestructibleObject.h"
+#include "JSScope.h"
+
+namespace JSC {
+
+class JSGlobalObject;
+class LLIntOffsetsExtractor;
+
+
+class JSCallee : public JSDestructibleObject {
+ friend class JIT;
+ friend class DFG::SpeculativeJIT;
+ friend class DFG::JITCompiler;
+ friend class VM;
+
+public:
+ typedef JSDestructibleObject Base;
+
+ JS_EXPORT_PRIVATE static JSCallee* create(VM&, JSGlobalObject*);
+
+ static void destroy(JSCell*);
+
+ JS_EXPORT_PRIVATE String name(ExecState*);
+ JS_EXPORT_PRIVATE String displayName(ExecState*);
+ const String calculatedDisplayName(ExecState*);
+
+ JSScope* scope()
+ {
+ return m_scope.get();
+ }
+
+ // This method may be called for host functions, in which case it
+ // will return an arbitrary value. This should only be used for
+ // optimized paths in which the return value does not matter for
+ // host functions, and checking whether the function is a host
+ // function is deemed too expensive.
+ JSScope* scopeUnchecked()
+ {
+ return m_scope.get();
+ }
+
+ void setScope(VM& vm, JSScope* scope)
+ {
+ m_scope.set(vm, this, scope);
+ }
+
+ DECLARE_EXPORT_INFO;
+
+ static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
+ {
+ ASSERT(globalObject);
+ return Structure::create(vm, globalObject, prototype, TypeInfo(JSCalleeType, StructureFlags), info());
+ }
+
+ static inline ptrdiff_t offsetOfScopeChain()
+ {
+ return OBJECT_OFFSETOF(JSCallee, m_scope);
+ }
+
+protected:
+ const static unsigned StructureFlags = OverridesGetOwnPropertySlot | ImplementsHasInstance | OverridesGetPropertyNames | JSObject::StructureFlags;
+
+ JS_EXPORT_PRIVATE JSCallee(VM&, JSGlobalObject*, Structure*);
+ JSCallee(VM&, JSScope*, Structure*);
+
+ void finishCreation(VM&);
+ using Base::finishCreation;
+
+ static void visitChildren(JSCell*, SlotVisitor&);
+
+ static bool getOwnPropertySlot(JSObject*, ExecState*, PropertyName, PropertySlot&);
+ static void getOwnNonIndexPropertyNames(JSObject*, ExecState*, PropertyNameArray&, EnumerationMode = ExcludeDontEnumProperties);
+ static bool defineOwnProperty(JSObject*, ExecState*, PropertyName, const PropertyDescriptor&, bool shouldThrow);
+ static void put(JSCell*, ExecState*, PropertyName, JSValue, PutPropertySlot&);
+ static bool deleteProperty(JSCell*, ExecState*, PropertyName);
+
+private:
+ friend class LLIntOffsetsExtractor;
+
+ WriteBarrier<JSScope> m_scope;
+};
+
+} // namespace JSC
+
+#endif // JSCallee_h
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSFunction.cpp (173540 => 173541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2014-09-11 21:45:45 UTC (rev 173540)
+++ trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2014-09-11 21:52:33 UTC (rev 173541)
</span><span class="lines">@@ -85,9 +85,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSFunction::JSFunction(VM& vm, JSGlobalObject* globalObject, Structure* structure)
</span><del>- : Base(vm, structure)
</del><ins>+ : Base(vm, globalObject, structure)
</ins><span class="cx"> , m_executable()
</span><del>- , m_scope(vm, this, globalObject)
</del><span class="cx"> // We initialize blind so that changes to the prototype after function creation but before
</span><span class="cx"> // the optimizer kicks in don't disable optimizations. Once the optimizer kicks in, the
</span><span class="cx"> // watchpoint will start watching and any changes will both force deoptimization and disable
</span><span class="lines">@@ -117,7 +116,7 @@
</span><span class="cx"> return;
</span><span class="cx"> if (!functionNameScopeIsDynamic(executable->usesEval(), executable->isStrictMode()))
</span><span class="cx"> return;
</span><del>- m_scope.set(vm, this, JSNameScope::create(vm, m_scope->globalObject(), executable->name(), this, ReadOnly | DontDelete, m_scope.get()));
</del><ins>+ setScope(vm, JSNameScope::create(vm, scope()->globalObject(), executable->name(), this, ReadOnly | DontDelete, scope()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSFunction* JSFunction::createBuiltinFunction(VM& vm, FunctionExecutable* executable, JSGlobalObject* globalObject)
</span><span class="lines">@@ -180,7 +179,6 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(thisObject, info());
</span><span class="cx"> Base::visitChildren(thisObject, visitor);
</span><span class="cx">
</span><del>- visitor.append(&thisObject->m_scope);
</del><span class="cx"> visitor.append(&thisObject->m_executable);
</span><span class="cx"> thisObject->m_allocationProfile.visitAggregate(visitor);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSFunctionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSFunction.h (173540 => 173541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSFunction.h 2014-09-11 21:45:45 UTC (rev 173540)
+++ trunk/Source/JavaScriptCore/runtime/JSFunction.h 2014-09-11 21:52:33 UTC (rev 173541)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> #define JSFunction_h
</span><span class="cx">
</span><span class="cx"> #include "InternalFunction.h"
</span><del>-#include "JSDestructibleObject.h"
</del><ins>+#include "JSCallee.h"
</ins><span class="cx"> #include "JSScope.h"
</span><span class="cx"> #include "ObjectAllocationProfile.h"
</span><span class="cx"> #include "Watchpoint.h"
</span><span class="lines">@@ -49,14 +49,14 @@
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE String getCalculatedDisplayName(CallFrame*, JSObject*);
</span><span class="cx">
</span><del>-class JSFunction : public JSDestructibleObject {
</del><ins>+class JSFunction : public JSCallee {
</ins><span class="cx"> friend class JIT;
</span><span class="cx"> friend class DFG::SpeculativeJIT;
</span><span class="cx"> friend class DFG::JITCompiler;
</span><span class="cx"> friend class VM;
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- typedef JSDestructibleObject Base;
</del><ins>+ typedef JSCallee Base;
</ins><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE static JSFunction* create(VM&, JSGlobalObject*, int length, const String& name, NativeFunction, Intrinsic = NoIntrinsic, NativeFunction nativeConstructor = callHostFunctionAsConstructor);
</span><span class="cx">
</span><span class="lines">@@ -76,25 +76,6 @@
</span><span class="cx"> JS_EXPORT_PRIVATE String displayName(ExecState*);
</span><span class="cx"> const String calculatedDisplayName(ExecState*);
</span><span class="cx">
</span><del>- JSScope* scope()
- {
- ASSERT(!isHostFunctionNonInline());
- return m_scope.get();
- }
- // This method may be called for host functins, in which case it
- // will return an arbitrary value. This should only be used for
- // optimized paths in which the return value does not matter for
- // host functions, and checking whether the function is a host
- // function is deemed too expensive.
- JSScope* scopeUnchecked()
- {
- return m_scope.get();
- }
- void setScope(VM& vm, JSScope* scope)
- {
- ASSERT(!isHostFunctionNonInline());
- m_scope.set(vm, this, scope);
- }
</del><span class="cx"> void addNameScopeIfNeeded(VM&);
</span><span class="cx">
</span><span class="cx"> ExecutableBase* executable() const { return m_executable.get(); }
</span><span class="lines">@@ -119,11 +100,6 @@
</span><span class="cx"> static ConstructType getConstructData(JSCell*, ConstructData&);
</span><span class="cx"> static CallType getCallData(JSCell*, CallData&);
</span><span class="cx">
</span><del>- static inline ptrdiff_t offsetOfScopeChain()
- {
- return OBJECT_OFFSETOF(JSFunction, m_scope);
- }
-
</del><span class="cx"> static inline ptrdiff_t offsetOfExecutable()
</span><span class="cx"> {
</span><span class="cx"> return OBJECT_OFFSETOF(JSFunction, m_executable);
</span><span class="lines">@@ -182,7 +158,6 @@
</span><span class="cx"> static EncodedJSValue nameGetter(ExecState*, JSObject*, EncodedJSValue, PropertyName);
</span><span class="cx">
</span><span class="cx"> WriteBarrier<ExecutableBase> m_executable;
</span><del>- WriteBarrier<JSScope> m_scope;
</del><span class="cx"> ObjectAllocationProfile m_allocationProfile;
</span><span class="cx"> InlineWatchpointSet m_allocationProfileWatchpoint;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSFunctionInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSFunctionInlines.h (173540 => 173541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSFunctionInlines.h 2014-09-11 21:45:45 UTC (rev 173540)
+++ trunk/Source/JavaScriptCore/runtime/JSFunctionInlines.h 2014-09-11 21:52:33 UTC (rev 173541)
</span><span class="lines">@@ -32,9 +32,8 @@
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> inline JSFunction::JSFunction(VM& vm, FunctionExecutable* executable, JSScope* scope)
</span><del>- : Base(vm, scope->globalObject()->functionStructure())
</del><ins>+ : Base(vm, scope, scope->globalObject()->functionStructure())
</ins><span class="cx"> , m_executable(vm, this, executable)
</span><del>- , m_scope(vm, this, scope)
</del><span class="cx"> , m_allocationProfileWatchpoint(ClearWatchpoint) // See comment in JSFunction.cpp concerning the reason for using ClearWatchpoint as opposed to IsWatched.
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSType.h (173540 => 173541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSType.h 2014-09-11 21:45:45 UTC (rev 173540)
+++ trunk/Source/JavaScriptCore/runtime/JSType.h 2014-09-11 21:52:33 UTC (rev 173541)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> // The ObjectType value must come before any JSType that is a subclass of JSObject.
</span><span class="cx"> ObjectType,
</span><span class="cx"> FinalObjectType,
</span><ins>+ JSCalleeType,
</ins><span class="cx"> JSFunctionType,
</span><span class="cx"> NameInstanceType,
</span><span class="cx"> NumberObjectType,
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173540 => 173541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-11 21:45:45 UTC (rev 173540)
+++ trunk/Source/WebCore/ChangeLog 2014-09-11 21:52:33 UTC (rev 173541)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-09-10 Michael Saboff <msaboff@apple.com>
+
+ Move JSScope out of JSFunction into separate JSCallee class
+ https://bugs.webkit.org/show_bug.cgi?id=136725
+
+ Reviewed by Oliver Hunt.
+
+ Created new JSCallee class that contains a JSScope*. Changed JSFunction to inherit from
+ JSCallee.
+
+ * ForwardingHeaders/runtime/JSCallee.h: New forwarding header.
+
</ins><span class="cx"> 2014-09-11 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix iOS.
</span></span></pre></div>
<a id="trunkSourceWebCoreForwardingHeadersruntimeJSCalleeh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/ForwardingHeaders/runtime/JSCallee.h (0 => 173541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ForwardingHeaders/runtime/JSCallee.h (rev 0)
+++ trunk/Source/WebCore/ForwardingHeaders/runtime/JSCallee.h 2014-09-11 21:52:33 UTC (rev 173541)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+#ifndef WebCore_FWD_JSCallee_h
+#define WebCore_FWD_JSCallee_h
+#include <JavaScriptCore/JSCallee.h>
+#endif
</ins></span></pre>
</div>
</div>
</body>
</html>