<!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>[202027] 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/202027">202027</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2016-06-13 23:04:32 -0700 (Mon, 13 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>JSBoundSlotBaseFunction no longer binds slot base
https://bugs.webkit.org/show_bug.cgi?id=157978
Reviewed by Geoff Garen.
This class is basically currently named after a bug. We should never have
been binding function to slot bases - this was not ever correct behavior.
This was fixed earlier in the year, but there is still some cruft including
the class name to clean up.
- renamed JSBoundSlotBaseFunction -> JSCustomGetterSetterFunction
- removed m_boundSlotBase - don't retain the original slot base
(we were not really using it anyway).
- ASSERT customGetterSetter->getter/setter are non-null, rather than checking.
- Store the PropertyName such that we can pass this to the getter
(we're currently reperforming the String->Identifier conversion every time).
- Removed JSFunction::lookUpOrCreateNativeExecutable - this is just overhead,
and not used consistently.
* CMakeLists.txt:
* JavaScriptCore.xcodeproj/project.pbxproj:
* runtime/JSBoundSlotBaseFunction.cpp: Removed.
* runtime/JSBoundSlotBaseFunction.h: Removed.
- JSBoundSlotBaseFunction -> JSCustomGetterSetterFunction
* runtime/JSCustomGetterSetterFunction.cpp: Copied from Source/JavaScriptCore/runtime/JSBoundSlotBaseFunction.cpp.
(JSC::JSCustomGetterSetterFunction::customGetterSetterFunctionCall):
- made a static function on JSCustomGetterSetterFunction such that accessor
to member properties could be made private. Call variant of callCustomSetter
that does not require slotBase, ASSERT getter/setter present, pass stored
PropertyName to getter.
(JSC::JSCustomGetterSetterFunction::JSCustomGetterSetterFunction):
- renamed, store propertyName.
(JSC::JSCustomGetterSetterFunction::create):
- use same function name to Executable as is being passed to Function::finishCreation.
(JSC::JSCustomGetterSetterFunction::visitChildren):
(JSC::JSCustomGetterSetterFunction::finishCreation):
- removed m_boundSlotBase.
* runtime/JSCustomGetterSetterFunction.h: Copied from Source/JavaScriptCore/runtime/JSBoundSlotBaseFunction.h.
(JSC::JSCustomGetterSetterFunction::customGetterSetter):
(JSC::JSCustomGetterSetterFunction::isSetter):
- made private.
(JSC::JSCustomGetterSetterFunction::propertyName):
- new accessor.
(JSC::JSBoundSlotBaseFunction::boundSlotBase): Deleted.
- removed.
* runtime/JSFunction.cpp:
(JSC::JSFunction::create):
(JSC::JSFunction::lookUpOrCreateNativeExecutable): Deleted.
- removed lookUpOrCreateNativeExecutable. This inconsistently used wrapper was providing no value, only bloat.
* runtime/JSFunction.h:
* runtime/JSGlobalObject.cpp:
(JSC::JSGlobalObject::init):
(JSC::JSGlobalObject::visitChildren):
- renamed JSBoundSlotBaseFunction -> JSCustomGetterSetterFunction, etc.
* runtime/JSGlobalObject.h:
(JSC::JSGlobalObject::customGetterSetterFunctionStructure):
(JSC::JSGlobalObject::boundSlotBaseFunctionStructure): Deleted.
- renamed JSBoundSlotBaseFunction -> JSCustomGetterSetterFunction, etc.
* runtime/JSNativeStdFunction.cpp:
(JSC::JSNativeStdFunction::create):
- removed lookUpOrCreateNativeExecutable.
* runtime/JSObject.cpp:
(JSC::getCustomGetterSetterFunctionForGetterSetter):
(JSC::JSObject::getOwnPropertyDescriptor):
(JSC::getBoundSlotBaseFunctionForGetterSetter): Deleted.
- renamed JSBoundSlotBaseFunction -> JSCustomGetterSetterFunction, etc.
* runtime/VM.h:
- renamed JSBoundSlotBaseFunction -> JSCustomGetterSetterFunction, etc.</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="#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="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjecth">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSNativeStdFunctioncpp">trunk/Source/JavaScriptCore/runtime/JSNativeStdFunction.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjectcpp">trunk/Source/JavaScriptCore/runtime/JSObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMh">trunk/Source/JavaScriptCore/runtime/VM.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCustomGetterSetterFunctioncpp">trunk/Source/JavaScriptCore/runtime/JSCustomGetterSetterFunction.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCustomGetterSetterFunctionh">trunk/Source/JavaScriptCore/runtime/JSCustomGetterSetterFunction.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSBoundSlotBaseFunctioncpp">trunk/Source/JavaScriptCore/runtime/JSBoundSlotBaseFunction.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSBoundSlotBaseFunctionh">trunk/Source/JavaScriptCore/runtime/JSBoundSlotBaseFunction.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 (202026 => 202027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2016-06-14 06:04:29 UTC (rev 202026)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2016-06-14 06:04:32 UTC (rev 202027)
</span><span class="lines">@@ -685,10 +685,10 @@
</span><span class="cx"> runtime/JSArrayBufferView.cpp
</span><span class="cx"> runtime/JSArrayIterator.cpp
</span><span class="cx"> runtime/JSBoundFunction.cpp
</span><del>- runtime/JSBoundSlotBaseFunction.cpp
</del><span class="cx"> runtime/JSCJSValue.cpp
</span><span class="cx"> runtime/JSCallee.cpp
</span><span class="cx"> runtime/JSCell.cpp
</span><ins>+ runtime/JSCustomGetterSetterFunction.cpp
</ins><span class="cx"> runtime/JSDataView.cpp
</span><span class="cx"> runtime/JSDataViewPrototype.cpp
</span><span class="cx"> runtime/JSDateMath.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (202026 => 202027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-06-14 06:04:29 UTC (rev 202026)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-06-14 06:04:32 UTC (rev 202027)
</span><span class="lines">@@ -1,3 +1,74 @@
</span><ins>+2016-06-13 Gavin & Ellie Barraclough <barraclough@apple.com>
+
+ JSBoundSlotBaseFunction no longer binds slot base
+ https://bugs.webkit.org/show_bug.cgi?id=157978
+
+ Reviewed by Geoff Garen.
+
+ This class is basically currently named after a bug. We should never have
+ been binding function to slot bases - this was not ever correct behavior.
+ This was fixed earlier in the year, but there is still some cruft including
+ the class name to clean up.
+
+ - renamed JSBoundSlotBaseFunction -> JSCustomGetterSetterFunction
+ - removed m_boundSlotBase - don't retain the original slot base
+ (we were not really using it anyway).
+ - ASSERT customGetterSetter->getter/setter are non-null, rather than checking.
+ - Store the PropertyName such that we can pass this to the getter
+ (we're currently reperforming the String->Identifier conversion every time).
+ - Removed JSFunction::lookUpOrCreateNativeExecutable - this is just overhead,
+ and not used consistently.
+
+ * CMakeLists.txt:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * runtime/JSBoundSlotBaseFunction.cpp: Removed.
+ * runtime/JSBoundSlotBaseFunction.h: Removed.
+ - JSBoundSlotBaseFunction -> JSCustomGetterSetterFunction
+ * runtime/JSCustomGetterSetterFunction.cpp: Copied from Source/JavaScriptCore/runtime/JSBoundSlotBaseFunction.cpp.
+ (JSC::JSCustomGetterSetterFunction::customGetterSetterFunctionCall):
+ - made a static function on JSCustomGetterSetterFunction such that accessor
+ to member properties could be made private. Call variant of callCustomSetter
+ that does not require slotBase, ASSERT getter/setter present, pass stored
+ PropertyName to getter.
+ (JSC::JSCustomGetterSetterFunction::JSCustomGetterSetterFunction):
+ - renamed, store propertyName.
+ (JSC::JSCustomGetterSetterFunction::create):
+ - use same function name to Executable as is being passed to Function::finishCreation.
+ (JSC::JSCustomGetterSetterFunction::visitChildren):
+ (JSC::JSCustomGetterSetterFunction::finishCreation):
+ - removed m_boundSlotBase.
+ * runtime/JSCustomGetterSetterFunction.h: Copied from Source/JavaScriptCore/runtime/JSBoundSlotBaseFunction.h.
+ (JSC::JSCustomGetterSetterFunction::customGetterSetter):
+ (JSC::JSCustomGetterSetterFunction::isSetter):
+ - made private.
+ (JSC::JSCustomGetterSetterFunction::propertyName):
+ - new accessor.
+ (JSC::JSBoundSlotBaseFunction::boundSlotBase): Deleted.
+ - removed.
+ * runtime/JSFunction.cpp:
+ (JSC::JSFunction::create):
+ (JSC::JSFunction::lookUpOrCreateNativeExecutable): Deleted.
+ - removed lookUpOrCreateNativeExecutable. This inconsistently used wrapper was providing no value, only bloat.
+ * runtime/JSFunction.h:
+ * runtime/JSGlobalObject.cpp:
+ (JSC::JSGlobalObject::init):
+ (JSC::JSGlobalObject::visitChildren):
+ - renamed JSBoundSlotBaseFunction -> JSCustomGetterSetterFunction, etc.
+ * runtime/JSGlobalObject.h:
+ (JSC::JSGlobalObject::customGetterSetterFunctionStructure):
+ (JSC::JSGlobalObject::boundSlotBaseFunctionStructure): Deleted.
+ - renamed JSBoundSlotBaseFunction -> JSCustomGetterSetterFunction, etc.
+ * runtime/JSNativeStdFunction.cpp:
+ (JSC::JSNativeStdFunction::create):
+ - removed lookUpOrCreateNativeExecutable.
+ * runtime/JSObject.cpp:
+ (JSC::getCustomGetterSetterFunctionForGetterSetter):
+ (JSC::JSObject::getOwnPropertyDescriptor):
+ (JSC::getBoundSlotBaseFunctionForGetterSetter): Deleted.
+ - renamed JSBoundSlotBaseFunction -> JSCustomGetterSetterFunction, etc.
+ * runtime/VM.h:
+ - renamed JSBoundSlotBaseFunction -> JSCustomGetterSetterFunction, etc.
+
</ins><span class="cx"> 2016-06-13 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> The sampling profiler should further protect itself against certain forms of sampling bias that arise due to the sampling interval being in sync with some other system process
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (202026 => 202027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2016-06-14 06:04:29 UTC (rev 202026)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2016-06-14 06:04:32 UTC (rev 202027)
</span><span class="lines">@@ -1157,8 +1157,6 @@
</span><span class="cx"> 43C392AB1C3BEB0500241F53 /* AssemblerCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 43C392AA1C3BEB0000241F53 /* AssemblerCommon.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 4443AE3316E188D90076F110 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51F0EB6105C86C6B00E6DF1B /* Foundation.framework */; };
</span><span class="cx"> 451539B912DC994500EF7AC4 /* Yarr.h in Headers */ = {isa = PBXBuildFile; fileRef = 451539B812DC994500EF7AC4 /* Yarr.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 46D4DCBD1C5AB2D500D8D321 /* JSBoundSlotBaseFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46D4DCBB1C5AB2D500D8D321 /* JSBoundSlotBaseFunction.cpp */; };
- 46D4DCBE1C5AB2D500D8D321 /* JSBoundSlotBaseFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 46D4DCBC1C5AB2D500D8D321 /* JSBoundSlotBaseFunction.h */; };
</del><span class="cx"> 52678F8E1A031009006A306D /* BasicBlockLocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 52678F8C1A031009006A306D /* BasicBlockLocation.cpp */; };
</span><span class="cx"> 52678F8F1A031009006A306D /* BasicBlockLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 52678F8D1A031009006A306D /* BasicBlockLocation.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 52678F911A04177C006A306D /* ControlFlowProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 52678F901A04177C006A306D /* ControlFlowProfiler.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -1272,6 +1270,8 @@
</span><span class="cx"> 70ECA6071AFDBEA200449739 /* TemplateRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70ECA6021AFDBEA200449739 /* TemplateRegistry.cpp */; };
</span><span class="cx"> 70ECA6081AFDBEA200449739 /* TemplateRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 70ECA6031AFDBEA200449739 /* TemplateRegistry.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 70ECA6091AFDBEA200449739 /* TemplateRegistryKey.h in Headers */ = {isa = PBXBuildFile; fileRef = 70ECA6041AFDBEA200449739 /* TemplateRegistryKey.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 72AAF7CD1D0D31B3005E60BE /* JSCustomGetterSetterFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72AAF7CB1D0D318B005E60BE /* JSCustomGetterSetterFunction.cpp */; };
+ 72AAF7CE1D0D31B3005E60BE /* JSCustomGetterSetterFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 72AAF7CC1D0D318B005E60BE /* JSCustomGetterSetterFunction.h */; };
</ins><span class="cx"> 79160DBD1C8E3EC8008C085A /* ProxyRevoke.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 79160DBB1C8E3EC8008C085A /* ProxyRevoke.cpp */; };
</span><span class="cx"> 79160DBE1C8E3EC8008C085A /* ProxyRevoke.h in Headers */ = {isa = PBXBuildFile; fileRef = 79160DBC1C8E3EC8008C085A /* ProxyRevoke.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 792CB3491C4EED5C00D13AF3 /* PCToCodeOriginMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 792CB3471C4EED5C00D13AF3 /* PCToCodeOriginMap.cpp */; };
</span><span class="lines">@@ -3295,8 +3295,6 @@
</span><span class="cx"> 449097EE0F8F81B50076A327 /* FeatureDefines.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FeatureDefines.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> 451539B812DC994500EF7AC4 /* Yarr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Yarr.h; path = yarr/Yarr.h; sourceTree = "<group>"; };
</span><span class="cx"> 45E12D8806A49B0F00E9DF84 /* jsc.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jsc.cpp; sourceTree = "<group>"; tabWidth = 4; };
</span><del>- 46D4DCBB1C5AB2D500D8D321 /* JSBoundSlotBaseFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBoundSlotBaseFunction.cpp; sourceTree = "<group>"; };
- 46D4DCBC1C5AB2D500D8D321 /* JSBoundSlotBaseFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBoundSlotBaseFunction.h; sourceTree = "<group>"; };
</del><span class="cx"> 51F0EB6105C86C6B00E6DF1B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
</span><span class="cx"> 51F0EC0705C86C9A00E6DF1B /* libobjc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libobjc.dylib; path = /usr/lib/libobjc.dylib; sourceTree = "<absolute>"; };
</span><span class="cx"> 52678F8C1A031009006A306D /* BasicBlockLocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BasicBlockLocation.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -3453,6 +3451,8 @@
</span><span class="cx"> 70ECA6021AFDBEA200449739 /* TemplateRegistry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TemplateRegistry.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 70ECA6031AFDBEA200449739 /* TemplateRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TemplateRegistry.h; sourceTree = "<group>"; };
</span><span class="cx"> 70ECA6041AFDBEA200449739 /* TemplateRegistryKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TemplateRegistryKey.h; sourceTree = "<group>"; };
</span><ins>+ 72AAF7CB1D0D318B005E60BE /* JSCustomGetterSetterFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCustomGetterSetterFunction.cpp; sourceTree = "<group>"; };
+ 72AAF7CC1D0D318B005E60BE /* JSCustomGetterSetterFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCustomGetterSetterFunction.h; sourceTree = "<group>"; };
</ins><span class="cx"> 79160DBB1C8E3EC8008C085A /* ProxyRevoke.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProxyRevoke.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 79160DBC1C8E3EC8008C085A /* ProxyRevoke.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProxyRevoke.h; sourceTree = "<group>"; };
</span><span class="cx"> 792CB3471C4EED5C00D13AF3 /* PCToCodeOriginMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PCToCodeOriginMap.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -5708,8 +5708,6 @@
</span><span class="cx"> A7BDAEC517F4EA1400F6140C /* JSArrayIterator.h */,
</span><span class="cx"> 86FA9E8F142BBB2D001773B7 /* JSBoundFunction.cpp */,
</span><span class="cx"> 86FA9E90142BBB2E001773B7 /* JSBoundFunction.h */,
</span><del>- 46D4DCBB1C5AB2D500D8D321 /* JSBoundSlotBaseFunction.cpp */,
- 46D4DCBC1C5AB2D500D8D321 /* JSBoundSlotBaseFunction.h */,
</del><span class="cx"> 657CF45619BF6662004ACBF2 /* JSCallee.cpp */,
</span><span class="cx"> 657CF45719BF6662004ACBF2 /* JSCallee.h */,
</span><span class="cx"> BC7F8FBA0E19D1EF008632C0 /* JSCell.cpp */,
</span><span class="lines">@@ -5719,6 +5717,8 @@
</span><span class="cx"> F692A8870255597D01FF60F7 /* JSCJSValue.cpp */,
</span><span class="cx"> 14ABB36E099C076400E2A24F /* JSCJSValue.h */,
</span><span class="cx"> 865A30F0135007E100CDB49E /* JSCJSValueInlines.h */,
</span><ins>+ 72AAF7CB1D0D318B005E60BE /* JSCustomGetterSetterFunction.cpp */,
+ 72AAF7CC1D0D318B005E60BE /* JSCustomGetterSetterFunction.h */,
</ins><span class="cx"> 0F2B66BD17B6B5AB00A7AE3F /* JSDataView.cpp */,
</span><span class="cx"> 0F2B66BE17B6B5AB00A7AE3F /* JSDataView.h */,
</span><span class="cx"> 0F2B66BF17B6B5AB00A7AE3F /* JSDataViewPrototype.cpp */,
</span><span class="lines">@@ -7353,6 +7353,7 @@
</span><span class="cx"> A741017F179DAF80002EB8BA /* DFGSaneStringGetByValSlowPathGenerator.h in Headers */,
</span><span class="cx"> 0F2FCCFD18A60070001A27F8 /* DFGScannable.h in Headers */,
</span><span class="cx"> 86ECA3FA132DF25A002B2AD7 /* DFGScoreBoard.h in Headers */,
</span><ins>+ 72AAF7CE1D0D31B3005E60BE /* JSCustomGetterSetterFunction.h in Headers */,
</ins><span class="cx"> 0F1E3A67153A21E2000F9456 /* DFGSilentRegisterSavePlan.h in Headers */,
</span><span class="cx"> 0FFB921D16D02F300055A5DB /* DFGSlowPathGenerator.h in Headers */,
</span><span class="cx"> 86EC9DD31328DF82002B2AD7 /* DFGSpeculativeJIT.h in Headers */,
</span><span class="lines">@@ -7978,7 +7979,6 @@
</span><span class="cx"> A5FD0070189B00AA00633231 /* ScriptCallStack.h in Headers */,
</span><span class="cx"> A5FD007E189B0B4C00633231 /* ScriptCallStackFactory.h in Headers */,
</span><span class="cx"> A503FA22188EFF6800110F14 /* ScriptDebugListener.h in Headers */,
</span><del>- 46D4DCBE1C5AB2D500D8D321 /* JSBoundSlotBaseFunction.h in Headers */,
</del><span class="cx"> A503FA26188EFFFD00110F14 /* ScriptDebugServer.h in Headers */,
</span><span class="cx"> A55D93A6185012A800400DED /* ScriptFunctionCall.h in Headers */,
</span><span class="cx"> A54CF2FA184EAEDA00237F19 /* ScriptObject.h in Headers */,
</span><span class="lines">@@ -8852,7 +8852,6 @@
</span><span class="cx"> 0F1725FF1B48719A00AC3A55 /* DFGMinifiedGraph.cpp in Sources */,
</span><span class="cx"> 0F2BDC4D1522818600CD8910 /* DFGMinifiedNode.cpp in Sources */,
</span><span class="cx"> 0F8F14351ADF090100ED792C /* DFGMovHintRemovalPhase.cpp in Sources */,
</span><del>- 46D4DCBD1C5AB2D500D8D321 /* JSBoundSlotBaseFunction.cpp in Sources */,
</del><span class="cx"> 0FF2CD5B1B61A4F8004955A8 /* DFGMultiGetByOffsetData.cpp in Sources */,
</span><span class="cx"> A737810D1799EA2E00817533 /* DFGNaturalLoops.cpp in Sources */,
</span><span class="cx"> 79B00CBE1C6AB07E0088C65D /* ProxyObject.cpp in Sources */,
</span><span class="lines">@@ -9256,6 +9255,7 @@
</span><span class="cx"> 0FF9CE731B9CD6D0004EDCA6 /* PolymorphicAccess.cpp in Sources */,
</span><span class="cx"> 0FE834171A6EF97B00D04847 /* PolymorphicCallStubRoutine.cpp in Sources */,
</span><span class="cx"> 0F338E141BF0276C0013C88F /* B3ValueKey.cpp in Sources */,
</span><ins>+ 72AAF7CD1D0D31B3005E60BE /* JSCustomGetterSetterFunction.cpp in Sources */,
</ins><span class="cx"> 0F98206016BFE38100240D02 /* PreciseJumpTargets.cpp in Sources */,
</span><span class="cx"> 0FF729AD166AD35C000F5BA3 /* ProfilerBytecode.cpp in Sources */,
</span><span class="cx"> 0FF729AE166AD35C000F5BA3 /* ProfilerBytecodes.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSBoundSlotBaseFunctioncpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/runtime/JSBoundSlotBaseFunction.cpp (202026 => 202027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSBoundSlotBaseFunction.cpp 2016-06-14 06:04:29 UTC (rev 202026)
+++ trunk/Source/JavaScriptCore/runtime/JSBoundSlotBaseFunction.cpp 2016-06-14 06:04:32 UTC (rev 202027)
</span><span class="lines">@@ -1,96 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015, 2016 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. AND ITS CONTRIBUTORS ``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 ITS 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 "JSBoundSlotBaseFunction.h"
-
-#include "CustomGetterSetter.h"
-#include "GetterSetter.h"
-#include "JSCInlines.h"
-#include "JSGlobalObject.h"
-
-namespace JSC {
-
-const ClassInfo JSBoundSlotBaseFunction::s_info = { "Function", &Base::s_info, 0, CREATE_METHOD_TABLE(JSBoundSlotBaseFunction) };
-
-EncodedJSValue JSC_HOST_CALL boundSlotBaseFunctionCall(ExecState* exec)
-{
- JSBoundSlotBaseFunction* boundSlotBaseFunction = jsCast<JSBoundSlotBaseFunction*>(exec->callee());
- JSObject* baseObject = boundSlotBaseFunction->boundSlotBase();
- CustomGetterSetter* customGetterSetter = boundSlotBaseFunction->customGetterSetter();
-
- if (boundSlotBaseFunction->isSetter()) {
- callCustomSetter(exec, customGetterSetter, true, baseObject, exec->thisValue(), exec->argument(0));
- return JSValue::encode(jsUndefined());
- }
-
- CustomGetterSetter::CustomGetter getter = customGetterSetter->getter();
- if (!getter)
- return JSValue::encode(jsUndefined());
-
- const String& name = boundSlotBaseFunction->name();
- return getter(exec, JSValue::encode(exec->thisValue()), PropertyName(Identifier::fromString(exec, name)));
-}
-
-JSBoundSlotBaseFunction::JSBoundSlotBaseFunction(VM& vm, JSGlobalObject* globalObject, Structure* structure, const Type type)
- : Base(vm, globalObject, structure)
- , m_type(type)
-{
-}
-
-JSBoundSlotBaseFunction* JSBoundSlotBaseFunction::create(VM& vm, JSGlobalObject* globalObject, JSObject* boundSlotBase, CustomGetterSetter* getterSetter, const Type type, const String& name)
-{
- NativeExecutable* executable = vm.getHostFunction(boundSlotBaseFunctionCall, callHostFunctionAsConstructor, name);
-
- Structure* structure = globalObject->boundSlotBaseFunctionStructure();
- JSBoundSlotBaseFunction* function = new (NotNull, allocateCell<JSBoundSlotBaseFunction>(vm.heap)) JSBoundSlotBaseFunction(vm, globalObject, structure, type);
-
- // Can't do this during initialization because getHostFunction might do a GC allocation.
- const char* prefix = (type == Type::Getter) ? "get " : "set ";
- function->finishCreation(vm, executable, boundSlotBase, getterSetter, makeString(prefix, name));
- return function;
-}
-
-void JSBoundSlotBaseFunction::visitChildren(JSCell* cell, SlotVisitor& visitor)
-{
- JSBoundSlotBaseFunction* thisObject = jsCast<JSBoundSlotBaseFunction*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- Base::visitChildren(thisObject, visitor);
-
- visitor.append(&thisObject->m_boundSlotBase);
- visitor.append(&thisObject->m_getterSetter);
-}
-
-void JSBoundSlotBaseFunction::finishCreation(VM& vm, NativeExecutable* executable, JSObject* boundSlotBase, CustomGetterSetter* getterSetter, const String& name)
-{
- Base::finishCreation(vm, executable, isSetter(), name);
- ASSERT(inherits(info()));
- ASSERT(boundSlotBase);
- ASSERT(getterSetter);
- m_boundSlotBase.set(vm, this, boundSlotBase);
- m_getterSetter.set(vm, this, getterSetter);
-}
-
-} // namespace JSC
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSBoundSlotBaseFunctionh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/runtime/JSBoundSlotBaseFunction.h (202026 => 202027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSBoundSlotBaseFunction.h 2016-06-14 06:04:29 UTC (rev 202026)
+++ trunk/Source/JavaScriptCore/runtime/JSBoundSlotBaseFunction.h 2016-06-14 06:04:32 UTC (rev 202027)
</span><span class="lines">@@ -1,75 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015, 2016 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. AND ITS CONTRIBUTORS ``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 ITS 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 JSBoundSlotBaseFunction_h
-#define JSBoundSlotBaseFunction_h
-
-#include "JSFunction.h"
-
-namespace JSC {
-
-class CustomGetterSetter;
-
-EncodedJSValue JSC_HOST_CALL boundSlotBaseFunctionCall(ExecState*);
-
-class JSBoundSlotBaseFunction : public JSFunction {
-public:
- typedef JSFunction Base;
-
- // The Type is set to the number of arguments the resultant function will have.
- enum class Type { Getter = 0, Setter = 1 };
-
- static const unsigned StructureFlags = Base::StructureFlags;
-
- static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
- {
- ASSERT(globalObject);
- return Structure::create(vm, globalObject, prototype, TypeInfo(JSFunctionType, StructureFlags), info());
- }
-
- static JSBoundSlotBaseFunction* create(VM&, JSGlobalObject*, JSObject*, CustomGetterSetter*, const Type, const String&);
-
- JSObject* boundSlotBase() const { return m_boundSlotBase.get(); }
- CustomGetterSetter* customGetterSetter() const { return m_getterSetter.get(); }
- bool isSetter() const { return m_type == Type::Setter; }
-
- DECLARE_EXPORT_INFO;
-
-protected:
- static void visitChildren(JSCell*, SlotVisitor&);
-
-private:
- JSBoundSlotBaseFunction(VM&, JSGlobalObject*, Structure*, Type);
-
- void finishCreation(VM&, NativeExecutable*, JSObject*, CustomGetterSetter*, const String&);
-
- WriteBarrier<JSObject> m_boundSlotBase;
- WriteBarrier<CustomGetterSetter> m_getterSetter;
- Type m_type;
-};
-
-} // namespace JSC
-
-#endif // JSBoundSlotBaseFunction_h
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCustomGetterSetterFunctioncppfromrev201951trunkSourceJavaScriptCoreruntimeJSBoundSlotBaseFunctioncpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/runtime/JSCustomGetterSetterFunction.cpp (from rev 201951, trunk/Source/JavaScriptCore/runtime/JSBoundSlotBaseFunction.cpp) (0 => 202027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCustomGetterSetterFunction.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/runtime/JSCustomGetterSetterFunction.cpp 2016-06-14 06:04:32 UTC (rev 202027)
</span><span class="lines">@@ -0,0 +1,96 @@
</span><ins>+/*
+ * Copyright (C) 2015, 2016 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. AND ITS CONTRIBUTORS ``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 ITS 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 "JSCustomGetterSetterFunction.h"
+
+#include "CustomGetterSetter.h"
+#include "GetterSetter.h"
+#include "JSCInlines.h"
+#include "JSGlobalObject.h"
+
+namespace JSC {
+
+const ClassInfo JSCustomGetterSetterFunction::s_info = { "Function", &Base::s_info, 0, CREATE_METHOD_TABLE(JSCustomGetterSetterFunction) };
+
+EncodedJSValue JSC_HOST_CALL JSCustomGetterSetterFunction::customGetterSetterFunctionCall(ExecState* exec)
+{
+ JSCustomGetterSetterFunction* customGetterSetterFunction = jsCast<JSCustomGetterSetterFunction*>(exec->callee());
+ CustomGetterSetter* customGetterSetter = customGetterSetterFunction->customGetterSetter();
+
+ if (customGetterSetterFunction->isSetter()) {
+ CustomGetterSetter::CustomSetter setter = customGetterSetter->setter();
+ ASSERT(setter);
+ callCustomSetter(exec, setter, true, exec->thisValue(), exec->argument(0));
+ return JSValue::encode(jsUndefined());
+ }
+
+ CustomGetterSetter::CustomGetter getter = customGetterSetter->getter();
+ ASSERT(getter);
+ return getter(exec, JSValue::encode(exec->thisValue()), customGetterSetterFunction->propertyName());
+}
+
+JSCustomGetterSetterFunction::JSCustomGetterSetterFunction(VM& vm, JSGlobalObject* globalObject, Structure* structure, const Type type, const PropertyName& propertyName)
+ : Base(vm, globalObject, structure)
+ , m_type(type)
+ , m_propertyName(propertyName)
+{
+}
+
+JSCustomGetterSetterFunction* JSCustomGetterSetterFunction::create(VM& vm, JSGlobalObject* globalObject, CustomGetterSetter* getterSetter, const Type type, const PropertyName& propertyName)
+{
+ ASSERT(type == Type::Getter ? !!getterSetter->getter() : !!getterSetter->setter());
+
+ const char* prefix = (type == Type::Getter) ? "get " : "set ";
+ String name = makeString(prefix, String(propertyName.publicName()));
+
+ NativeExecutable* executable = vm.getHostFunction(customGetterSetterFunctionCall, callHostFunctionAsConstructor, String(propertyName.publicName()));
+
+ Structure* structure = globalObject->customGetterSetterFunctionStructure();
+ JSCustomGetterSetterFunction* function = new (NotNull, allocateCell<JSCustomGetterSetterFunction>(vm.heap)) JSCustomGetterSetterFunction(vm, globalObject, structure, type, propertyName);
+
+ // Can't do this during initialization because getHostFunction might do a GC allocation.
+ function->finishCreation(vm, executable, getterSetter, name);
+ return function;
+}
+
+void JSCustomGetterSetterFunction::visitChildren(JSCell* cell, SlotVisitor& visitor)
+{
+ JSCustomGetterSetterFunction* thisObject = jsCast<JSCustomGetterSetterFunction*>(cell);
+ ASSERT_GC_OBJECT_INHERITS(thisObject, info());
+ Base::visitChildren(thisObject, visitor);
+
+ visitor.append(&thisObject->m_getterSetter);
+}
+
+void JSCustomGetterSetterFunction::finishCreation(VM& vm, NativeExecutable* executable, CustomGetterSetter* getterSetter, const String& name)
+{
+ Base::finishCreation(vm, executable, isSetter(), name);
+ ASSERT(inherits(info()));
+ ASSERT(getterSetter);
+ m_getterSetter.set(vm, this, getterSetter);
+}
+
+} // namespace JSC
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCustomGetterSetterFunctionhfromrev201951trunkSourceJavaScriptCoreruntimeJSBoundSlotBaseFunctionh"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/runtime/JSCustomGetterSetterFunction.h (from rev 201951, trunk/Source/JavaScriptCore/runtime/JSBoundSlotBaseFunction.h) (0 => 202027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCustomGetterSetterFunction.h (rev 0)
+++ trunk/Source/JavaScriptCore/runtime/JSCustomGetterSetterFunction.h 2016-06-14 06:04:32 UTC (rev 202027)
</span><span class="lines">@@ -0,0 +1,74 @@
</span><ins>+/*
+ * Copyright (C) 2015, 2016 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. AND ITS CONTRIBUTORS ``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 ITS 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 JSCustomGetterSetterFunction_h
+#define JSCustomGetterSetterFunction_h
+
+#include "JSFunction.h"
+
+namespace JSC {
+
+class CustomGetterSetter;
+
+class JSCustomGetterSetterFunction : public JSFunction {
+public:
+ typedef JSFunction Base;
+
+ // The Type is set to the number of arguments the resultant function will have.
+ enum class Type { Getter = 0, Setter = 1 };
+
+ static const unsigned StructureFlags = Base::StructureFlags;
+
+ static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
+ {
+ ASSERT(globalObject);
+ return Structure::create(vm, globalObject, prototype, TypeInfo(JSFunctionType, StructureFlags), info());
+ }
+
+ static JSCustomGetterSetterFunction* create(VM&, JSGlobalObject*, CustomGetterSetter*, const Type, const PropertyName&);
+
+ DECLARE_EXPORT_INFO;
+
+protected:
+ static void visitChildren(JSCell*, SlotVisitor&);
+
+private:
+ JSCustomGetterSetterFunction(VM&, JSGlobalObject*, Structure*, Type, const PropertyName&);
+ void finishCreation(VM&, NativeExecutable*, CustomGetterSetter*, const String&);
+
+ static EncodedJSValue JSC_HOST_CALL customGetterSetterFunctionCall(ExecState*);
+
+ CustomGetterSetter* customGetterSetter() const { return m_getterSetter.get(); }
+ bool isSetter() const { return m_type == Type::Setter; }
+ const PropertyName& propertyName() const { return m_propertyName; }
+
+ WriteBarrier<CustomGetterSetter> m_getterSetter;
+ Type m_type;
+ PropertyName m_propertyName;
+};
+
+} // namespace JSC
+
+#endif // JSCustomGetterSetterFunction_h
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSFunction.cpp (202026 => 202027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2016-06-14 06:04:29 UTC (rev 202026)
+++ trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2016-06-14 06:04:32 UTC (rev 202027)
</span><span class="lines">@@ -82,14 +82,9 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-NativeExecutable* JSFunction::lookUpOrCreateNativeExecutable(VM& vm, NativeFunction nativeFunction, Intrinsic intrinsic, NativeFunction nativeConstructor, const String& name)
-{
- return vm.getHostFunction(nativeFunction, intrinsic, nativeConstructor, name);
-}
-
</del><span class="cx"> JSFunction* JSFunction::create(VM& vm, JSGlobalObject* globalObject, int length, const String& name, NativeFunction nativeFunction, Intrinsic intrinsic, NativeFunction nativeConstructor)
</span><span class="cx"> {
</span><del>- NativeExecutable* executable = lookUpOrCreateNativeExecutable(vm, nativeFunction, intrinsic, nativeConstructor, name);
</del><ins>+ NativeExecutable* executable = vm.getHostFunction(nativeFunction, intrinsic, nativeConstructor, name);
</ins><span class="cx"> JSFunction* function = new (NotNull, allocateCell<JSFunction>(vm.heap)) JSFunction(vm, globalObject, globalObject->functionStructure());
</span><span class="cx"> // Can't do this during initialization because getHostFunction might do a GC allocation.
</span><span class="cx"> function->finishCreation(vm, executable, length, name);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSFunctionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSFunction.h (202026 => 202027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSFunction.h 2016-06-14 06:04:29 UTC (rev 202026)
+++ trunk/Source/JavaScriptCore/runtime/JSFunction.h 2016-06-14 06:04:32 UTC (rev 202027)
</span><span class="lines">@@ -178,8 +178,6 @@
</span><span class="cx"> static void visitChildren(JSCell*, SlotVisitor&);
</span><span class="cx">
</span><span class="cx">
</span><del>- static NativeExecutable* lookUpOrCreateNativeExecutable(VM&, NativeFunction, Intrinsic, NativeFunction nativeConstructor, const String& name);
-
</del><span class="cx"> private:
</span><span class="cx"> static JSFunction* createImpl(VM& vm, FunctionExecutable* executable, JSScope* scope, Structure* structure)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp (202026 => 202027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2016-06-14 06:04:29 UTC (rev 202026)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2016-06-14 06:04:32 UTC (rev 202027)
</span><span class="lines">@@ -65,11 +65,11 @@
</span><span class="cx"> #include "JSArrayBufferPrototype.h"
</span><span class="cx"> #include "JSArrayIterator.h"
</span><span class="cx"> #include "JSBoundFunction.h"
</span><del>-#include "JSBoundSlotBaseFunction.h"
</del><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "JSCallbackConstructor.h"
</span><span class="cx"> #include "JSCallbackFunction.h"
</span><span class="cx"> #include "JSCallbackObject.h"
</span><ins>+#include "JSCustomGetterSetterFunction.h"
</ins><span class="cx"> #include "JSDataView.h"
</span><span class="cx"> #include "JSDataViewPrototype.h"
</span><span class="cx"> #include "JSDollarVM.h"
</span><span class="lines">@@ -343,9 +343,9 @@
</span><span class="cx"> exec->setCallee(m_globalCallee.get());
</span><span class="cx">
</span><span class="cx"> m_functionStructure.set(vm, this, JSFunction::createStructure(vm, this, m_functionPrototype.get()));
</span><del>- m_boundSlotBaseFunctionStructure.initLater(
</del><ins>+ m_customGetterSetterFunctionStructure.initLater(
</ins><span class="cx"> [] (const Initializer<Structure>& init) {
</span><del>- init.set(JSBoundSlotBaseFunction::createStructure(init.vm, init.owner, init.owner->m_functionPrototype.get()));
</del><ins>+ init.set(JSCustomGetterSetterFunction::createStructure(init.vm, init.owner, init.owner->m_functionPrototype.get()));
</ins><span class="cx"> });
</span><span class="cx"> m_boundFunctionStructure.initLater(
</span><span class="cx"> [] (const Initializer<Structure>& init) {
</span><span class="lines">@@ -1095,7 +1095,7 @@
</span><span class="cx"> visitor.append(&thisObject->m_errorStructure);
</span><span class="cx"> visitor.append(&thisObject->m_calleeStructure);
</span><span class="cx"> visitor.append(&thisObject->m_functionStructure);
</span><del>- thisObject->m_boundSlotBaseFunctionStructure.visit(visitor);
</del><ins>+ thisObject->m_customGetterSetterFunctionStructure.visit(visitor);
</ins><span class="cx"> thisObject->m_boundFunctionStructure.visit(visitor);
</span><span class="cx"> visitor.append(&thisObject->m_getterSetterStructure);
</span><span class="cx"> thisObject->m_nativeStdFunctionStructure.visit(visitor);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h (202026 => 202027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2016-06-14 06:04:29 UTC (rev 202026)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2016-06-14 06:04:32 UTC (rev 202027)
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx"> WriteBarrier<Structure> m_calleeStructure;
</span><span class="cx"> WriteBarrier<Structure> m_functionStructure;
</span><span class="cx"> LazyProperty<JSGlobalObject, Structure> m_boundFunctionStructure;
</span><del>- LazyProperty<JSGlobalObject, Structure> m_boundSlotBaseFunctionStructure;
</del><ins>+ LazyProperty<JSGlobalObject, Structure> m_customGetterSetterFunctionStructure;
</ins><span class="cx"> WriteBarrier<Structure> m_getterSetterStructure;
</span><span class="cx"> LazyProperty<JSGlobalObject, Structure> m_nativeStdFunctionStructure;
</span><span class="cx"> LazyProperty<JSGlobalObject, Structure> m_namedFunctionStructure;
</span><span class="lines">@@ -557,7 +557,7 @@
</span><span class="cx"> Structure* calleeStructure() const { return m_calleeStructure.get(); }
</span><span class="cx"> Structure* functionStructure() const { return m_functionStructure.get(); }
</span><span class="cx"> Structure* boundFunctionStructure() const { return m_boundFunctionStructure.get(this); }
</span><del>- Structure* boundSlotBaseFunctionStructure() const { return m_boundSlotBaseFunctionStructure.get(this); }
</del><ins>+ Structure* customGetterSetterFunctionStructure() const { return m_customGetterSetterFunctionStructure.get(this); }
</ins><span class="cx"> Structure* getterSetterStructure() const { return m_getterSetterStructure.get(); }
</span><span class="cx"> Structure* nativeStdFunctionStructure() const { return m_nativeStdFunctionStructure.get(this); }
</span><span class="cx"> Structure* namedFunctionStructure() const { return m_namedFunctionStructure.get(this); }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSNativeStdFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSNativeStdFunction.cpp (202026 => 202027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSNativeStdFunction.cpp 2016-06-14 06:04:29 UTC (rev 202026)
+++ trunk/Source/JavaScriptCore/runtime/JSNativeStdFunction.cpp 2016-06-14 06:04:32 UTC (rev 202027)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> JSNativeStdFunction* JSNativeStdFunction::create(VM& vm, JSGlobalObject* globalObject, int length, const String& name, NativeStdFunction&& nativeStdFunction, Intrinsic intrinsic, NativeFunction nativeConstructor)
</span><span class="cx"> {
</span><del>- NativeExecutable* executable = lookUpOrCreateNativeExecutable(vm, runStdFunction, intrinsic, nativeConstructor, name);
</del><ins>+ NativeExecutable* executable = vm.getHostFunction(runStdFunction, intrinsic, nativeConstructor, name);
</ins><span class="cx"> NativeStdFunctionCell* functionCell = NativeStdFunctionCell::create(vm, WTFMove(nativeStdFunction));
</span><span class="cx"> Structure* structure = globalObject->nativeStdFunctionStructure();
</span><span class="cx"> JSNativeStdFunction* function = new (NotNull, allocateCell<JSNativeStdFunction>(vm.heap)) JSNativeStdFunction(vm, globalObject, structure);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.cpp (202026 => 202027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2016-06-14 06:04:29 UTC (rev 202026)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2016-06-14 06:04:32 UTC (rev 202027)
</span><span class="lines">@@ -37,8 +37,8 @@
</span><span class="cx"> #include "GetterSetter.h"
</span><span class="cx"> #include "HeapSnapshotBuilder.h"
</span><span class="cx"> #include "IndexingHeaderInlines.h"
</span><del>-#include "JSBoundSlotBaseFunction.h"
</del><span class="cx"> #include "JSCInlines.h"
</span><ins>+#include "JSCustomGetterSetterFunction.h"
</ins><span class="cx"> #include "JSFunction.h"
</span><span class="cx"> #include "JSGlobalObject.h"
</span><span class="cx"> #include "Lookup.h"
</span><span class="lines">@@ -2827,15 +2827,15 @@
</span><span class="cx"> return Butterfly::createOrGrowPropertyStorage(m_butterfly.get(), vm, this, structure(vm), oldSize, newSize);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static JSBoundSlotBaseFunction* getBoundSlotBaseFunctionForGetterSetter(ExecState* exec, PropertyName propertyName, JSC::PropertySlot& slot, CustomGetterSetter* getterSetter, JSBoundSlotBaseFunction::Type type)
</del><ins>+static JSCustomGetterSetterFunction* getCustomGetterSetterFunctionForGetterSetter(ExecState* exec, PropertyName propertyName, CustomGetterSetter* getterSetter, JSCustomGetterSetterFunction::Type type)
</ins><span class="cx"> {
</span><span class="cx"> auto key = std::make_pair(getterSetter, (int)type);
</span><del>- JSBoundSlotBaseFunction* boundSlotBase = exec->vm().customGetterSetterFunctionMap.get(key);
- if (!boundSlotBase) {
- boundSlotBase = JSBoundSlotBaseFunction::create(exec->vm(), exec->lexicalGlobalObject(), slot.slotBase(), getterSetter, type, propertyName.publicName());
- exec->vm().customGetterSetterFunctionMap.set(key, boundSlotBase);
</del><ins>+ JSCustomGetterSetterFunction* customGetterSetterFunction = exec->vm().customGetterSetterFunctionMap.get(key);
+ if (!customGetterSetterFunction) {
+ customGetterSetterFunction = JSCustomGetterSetterFunction::create(exec->vm(), exec->lexicalGlobalObject(), getterSetter, type, propertyName.publicName());
+ exec->vm().customGetterSetterFunctionMap.set(key, customGetterSetterFunction);
</ins><span class="cx"> }
</span><del>- return boundSlotBase;
</del><ins>+ return customGetterSetterFunction;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSObject::getOwnPropertyDescriptor(ExecState* exec, PropertyName propertyName, PropertyDescriptor& descriptor)
</span><span class="lines">@@ -2875,9 +2875,9 @@
</span><span class="cx"> ASSERT(maybeGetterSetter);
</span><span class="cx"> auto* getterSetter = jsCast<CustomGetterSetter*>(maybeGetterSetter);
</span><span class="cx"> if (getterSetter->getter())
</span><del>- descriptor.setGetter(getBoundSlotBaseFunctionForGetterSetter(exec, propertyName, slot, getterSetter, JSBoundSlotBaseFunction::Type::Getter));
</del><ins>+ descriptor.setGetter(getCustomGetterSetterFunctionForGetterSetter(exec, propertyName, getterSetter, JSCustomGetterSetterFunction::Type::Getter));
</ins><span class="cx"> if (getterSetter->setter())
</span><del>- descriptor.setSetter(getBoundSlotBaseFunctionForGetterSetter(exec, propertyName, slot, getterSetter, JSBoundSlotBaseFunction::Type::Setter));
</del><ins>+ descriptor.setSetter(getCustomGetterSetterFunctionForGetterSetter(exec, propertyName, getterSetter, JSCustomGetterSetterFunction::Type::Setter));
</ins><span class="cx"> } else
</span><span class="cx"> descriptor.setDescriptor(slot.getValue(exec, propertyName), slot.attributes());
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.h (202026 => 202027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.h 2016-06-14 06:04:29 UTC (rev 202026)
+++ trunk/Source/JavaScriptCore/runtime/VM.h 2016-06-14 06:04:32 UTC (rev 202027)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> class HeapProfiler;
</span><span class="cx"> class Identifier;
</span><span class="cx"> class Interpreter;
</span><del>-class JSBoundSlotBaseFunction;
</del><ins>+class JSCustomGetterSetterFunction;
</ins><span class="cx"> class JSGlobalObject;
</span><span class="cx"> class JSObject;
</span><span class="cx"> class LLIntOffsetsExtractor;
</span><span class="lines">@@ -337,7 +337,7 @@
</span><span class="cx"> NumericStrings numericStrings;
</span><span class="cx"> DateInstanceCache dateInstanceCache;
</span><span class="cx"> WTF::SimpleStats machineCodeBytesPerBytecodeWordForBaselineJIT;
</span><del>- WeakGCMap<std::pair<CustomGetterSetter*, int>, JSBoundSlotBaseFunction> customGetterSetterFunctionMap;
</del><ins>+ WeakGCMap<std::pair<CustomGetterSetter*, int>, JSCustomGetterSetterFunction> customGetterSetterFunctionMap;
</ins><span class="cx"> WeakGCMap<StringImpl*, JSString, PtrHash<StringImpl*>> stringCache;
</span><span class="cx"> Strong<JSString> lastCachedString;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>