<!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>[197484] 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/197484">197484</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-03-02 18:04:49 -0800 (Wed, 02 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>clean up JSObject::isExtensibleInline and JSObject::setPrototypeOfInline, and rename setPrototypeOf to setPrototype
https://bugs.webkit.org/show_bug.cgi?id=154942
Reviewed by Benjamin Poulain.
These don't need to be inlined in the way they are.
Doing dynamic dispatch is ok performance wise until
we have evidence stating otherwise.
* API/JSObjectRef.cpp:
(JSObjectSetPrototype):
(JSObjectHasProperty):
* runtime/ClassInfo.h:
* runtime/IntlCollatorConstructor.cpp:
(JSC::constructIntlCollator):
* runtime/IntlDateTimeFormatConstructor.cpp:
(JSC::constructIntlDateTimeFormat):
* runtime/IntlNumberFormatConstructor.cpp:
(JSC::constructIntlNumberFormat):
* runtime/JSCell.cpp:
(JSC::JSCell::isExtensible):
(JSC::JSCell::setPrototype):
(JSC::JSCell::setPrototypeOf): Deleted.
* runtime/JSCell.h:
* runtime/JSGlobalObjectFunctions.cpp:
(JSC::globalFuncProtoSetter):
* runtime/JSObject.cpp:
(JSC::JSObject::setPrototypeWithCycleCheck):
(JSC::JSObject::setPrototype):
(JSC::JSObject::allowsAccessFrom):
(JSC::JSObject::isExtensible):
(JSC::JSObject::reifyAllStaticProperties):
(JSC::JSObject::defineOwnNonIndexProperty):
(JSC::JSObject::setPrototypeOf): Deleted.
* runtime/JSObject.h:
(JSC::JSObject::mayInterceptIndexedAccesses):
(JSC::JSObject::indexingShouldBeSparse):
(JSC::JSObject::setPrototypeOfInline): Deleted.
(JSC::JSObject::isExtensibleInline): Deleted.
* runtime/ObjectConstructor.cpp:
(JSC::objectConstructorSetPrototypeOf):
(JSC::objectConstructorIsSealed):
(JSC::objectConstructorIsFrozen):
(JSC::objectConstructorIsExtensible):
* runtime/ProxyObject.cpp:
(JSC::ProxyObject::performInternalMethodGetOwnProperty):
(JSC::ProxyObject::performHasProperty):
(JSC::ProxyObject::performPreventExtensions):
(JSC::ProxyObject::performIsExtensible):
* runtime/ReflectObject.cpp:
(JSC::reflectObjectIsExtensible):
(JSC::reflectObjectSetPrototypeOf):
* runtime/StringObject.cpp:
(JSC::StringObject::defineOwnProperty):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIJSObjectRefcpp">trunk/Source/JavaScriptCore/API/JSObjectRef.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeClassInfoh">trunk/Source/JavaScriptCore/runtime/ClassInfo.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlCollatorConstructorcpp">trunk/Source/JavaScriptCore/runtime/IntlCollatorConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlDateTimeFormatConstructorcpp">trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormatConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlNumberFormatConstructorcpp">trunk/Source/JavaScriptCore/runtime/IntlNumberFormatConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCellcpp">trunk/Source/JavaScriptCore/runtime/JSCell.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCellh">trunk/Source/JavaScriptCore/runtime/JSCell.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjectcpp">trunk/Source/JavaScriptCore/runtime/JSObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjecth">trunk/Source/JavaScriptCore/runtime/JSObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeObjectConstructorcpp">trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeProxyObjectcpp">trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeReflectObjectcpp">trunk/Source/JavaScriptCore/runtime/ReflectObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStringObjectcpp">trunk/Source/JavaScriptCore/runtime/StringObject.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIJSObjectRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSObjectRef.cpp (197483 => 197484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSObjectRef.cpp 2016-03-03 01:29:31 UTC (rev 197483)
+++ trunk/Source/JavaScriptCore/API/JSObjectRef.cpp 2016-03-03 02:04:49 UTC (rev 197484)
</span><span class="lines">@@ -291,7 +291,7 @@
</span><span class="cx"> // Someday we might use proxies for something other than JSGlobalObjects, but today is not that day.
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><del>- jsObject->setPrototypeOfInline(exec->vm(), exec, jsValue.isObject() ? jsValue : jsNull());
</del><ins>+ jsObject->setPrototype(exec->vm(), exec, jsValue.isObject() ? jsValue : jsNull());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSObjectHasProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (197483 => 197484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-03 01:29:31 UTC (rev 197483)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-03 02:04:49 UTC (rev 197484)
</span><span class="lines">@@ -1,3 +1,60 @@
</span><ins>+2016-03-02 Saam barati <sbarati@apple.com>
+
+ clean up JSObject::isExtensibleInline and JSObject::setPrototypeOfInline, and rename setPrototypeOf to setPrototype
+ https://bugs.webkit.org/show_bug.cgi?id=154942
+
+ Reviewed by Benjamin Poulain.
+
+ These don't need to be inlined in the way they are.
+ Doing dynamic dispatch is ok performance wise until
+ we have evidence stating otherwise.
+
+ * API/JSObjectRef.cpp:
+ (JSObjectSetPrototype):
+ (JSObjectHasProperty):
+ * runtime/ClassInfo.h:
+ * runtime/IntlCollatorConstructor.cpp:
+ (JSC::constructIntlCollator):
+ * runtime/IntlDateTimeFormatConstructor.cpp:
+ (JSC::constructIntlDateTimeFormat):
+ * runtime/IntlNumberFormatConstructor.cpp:
+ (JSC::constructIntlNumberFormat):
+ * runtime/JSCell.cpp:
+ (JSC::JSCell::isExtensible):
+ (JSC::JSCell::setPrototype):
+ (JSC::JSCell::setPrototypeOf): Deleted.
+ * runtime/JSCell.h:
+ * runtime/JSGlobalObjectFunctions.cpp:
+ (JSC::globalFuncProtoSetter):
+ * runtime/JSObject.cpp:
+ (JSC::JSObject::setPrototypeWithCycleCheck):
+ (JSC::JSObject::setPrototype):
+ (JSC::JSObject::allowsAccessFrom):
+ (JSC::JSObject::isExtensible):
+ (JSC::JSObject::reifyAllStaticProperties):
+ (JSC::JSObject::defineOwnNonIndexProperty):
+ (JSC::JSObject::setPrototypeOf): Deleted.
+ * runtime/JSObject.h:
+ (JSC::JSObject::mayInterceptIndexedAccesses):
+ (JSC::JSObject::indexingShouldBeSparse):
+ (JSC::JSObject::setPrototypeOfInline): Deleted.
+ (JSC::JSObject::isExtensibleInline): Deleted.
+ * runtime/ObjectConstructor.cpp:
+ (JSC::objectConstructorSetPrototypeOf):
+ (JSC::objectConstructorIsSealed):
+ (JSC::objectConstructorIsFrozen):
+ (JSC::objectConstructorIsExtensible):
+ * runtime/ProxyObject.cpp:
+ (JSC::ProxyObject::performInternalMethodGetOwnProperty):
+ (JSC::ProxyObject::performHasProperty):
+ (JSC::ProxyObject::performPreventExtensions):
+ (JSC::ProxyObject::performIsExtensible):
+ * runtime/ReflectObject.cpp:
+ (JSC::reflectObjectIsExtensible):
+ (JSC::reflectObjectSetPrototypeOf):
+ * runtime/StringObject.cpp:
+ (JSC::StringObject::defineOwnProperty):
+
</ins><span class="cx"> 2016-03-02 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> [cmake] Moved PRE/POST_BUILD_COMMAND to WEBKIT_FRAMEWORK.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeClassInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ClassInfo.h (197483 => 197484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ClassInfo.h 2016-03-03 01:29:31 UTC (rev 197483)
+++ trunk/Source/JavaScriptCore/runtime/ClassInfo.h 2016-03-03 02:04:49 UTC (rev 197484)
</span><span class="lines">@@ -109,8 +109,8 @@
</span><span class="cx"> typedef bool (*IsExtensibleFunctionPtr)(JSObject*, ExecState*);
</span><span class="cx"> IsExtensibleFunctionPtr isExtensible;
</span><span class="cx">
</span><del>- typedef bool (*SetPrototypeOfFunctionPtr)(JSObject*, ExecState*, JSValue);
- SetPrototypeOfFunctionPtr setPrototypeOf;
</del><ins>+ typedef bool (*SetPrototypeFunctionPtr)(JSObject*, ExecState*, JSValue);
+ SetPrototypeFunctionPtr setPrototype;
</ins><span class="cx">
</span><span class="cx"> typedef void (*DumpToStreamFunctionPtr)(const JSCell*, PrintStream&);
</span><span class="cx"> DumpToStreamFunctionPtr dumpToStream;
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> &ClassName::getTypedArrayImpl, \
</span><span class="cx"> &ClassName::preventExtensions, \
</span><span class="cx"> &ClassName::isExtensible, \
</span><del>- &ClassName::setPrototypeOf, \
</del><ins>+ &ClassName::setPrototype, \
</ins><span class="cx"> &ClassName::dumpToStream, \
</span><span class="cx"> &ClassName::estimatedSize \
</span><span class="cx"> }, \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlCollatorConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlCollatorConstructor.cpp (197483 => 197484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlCollatorConstructor.cpp 2016-03-03 01:29:31 UTC (rev 197483)
+++ trunk/Source/JavaScriptCore/runtime/IntlCollatorConstructor.cpp 2016-03-03 02:04:49 UTC (rev 197484)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> IntlCollator* collator = IntlCollator::create(vm, jsCast<IntlCollatorConstructor*>(state->callee()));
</span><span class="cx"> if (collator && !jsDynamicCast<IntlCollatorConstructor*>(newTarget)) {
</span><span class="cx"> JSValue proto = asObject(newTarget)->getDirect(vm, vm.propertyNames->prototype);
</span><del>- asObject(collator)->setPrototypeOfInline(vm, state, proto);
</del><ins>+ asObject(collator)->setPrototype(vm, state, proto);
</ins><span class="cx"> if (vm.exception())
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlDateTimeFormatConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormatConstructor.cpp (197483 => 197484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormatConstructor.cpp 2016-03-03 01:29:31 UTC (rev 197483)
+++ trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormatConstructor.cpp 2016-03-03 02:04:49 UTC (rev 197484)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> IntlDateTimeFormat* dateTimeFormat = IntlDateTimeFormat::create(vm, jsCast<IntlDateTimeFormatConstructor*>(state->callee()));
</span><span class="cx"> if (dateTimeFormat && !jsDynamicCast<IntlDateTimeFormatConstructor*>(newTarget)) {
</span><span class="cx"> JSValue proto = asObject(newTarget)->getDirect(vm, vm.propertyNames->prototype);
</span><del>- asObject(dateTimeFormat)->setPrototypeOfInline(vm, state, proto);
</del><ins>+ asObject(dateTimeFormat)->setPrototype(vm, state, proto);
</ins><span class="cx"> if (vm.exception())
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlNumberFormatConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlNumberFormatConstructor.cpp (197483 => 197484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlNumberFormatConstructor.cpp 2016-03-03 01:29:31 UTC (rev 197483)
+++ trunk/Source/JavaScriptCore/runtime/IntlNumberFormatConstructor.cpp 2016-03-03 02:04:49 UTC (rev 197484)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> IntlNumberFormat* numberFormat = IntlNumberFormat::create(vm, jsCast<IntlNumberFormatConstructor*>(state->callee()));
</span><span class="cx"> if (numberFormat && !jsDynamicCast<IntlNumberFormatConstructor*>(newTarget)) {
</span><span class="cx"> JSValue proto = asObject(newTarget)->getDirect(vm, vm.propertyNames->prototype);
</span><del>- asObject(numberFormat)->setPrototypeOfInline(vm, state, proto);
</del><ins>+ asObject(numberFormat)->setPrototype(vm, state, proto);
</ins><span class="cx"> if (vm.exception())
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSCell.cpp (197483 => 197484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCell.cpp 2016-03-03 01:29:31 UTC (rev 197483)
+++ trunk/Source/JavaScriptCore/runtime/JSCell.cpp 2016-03-03 02:04:49 UTC (rev 197484)
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool JSCell::setPrototypeOf(JSObject*, ExecState*, JSValue)
</del><ins>+bool JSCell::setPrototype(JSObject*, ExecState*, JSValue)
</ins><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCellh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSCell.h (197483 => 197484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCell.h 2016-03-03 01:29:31 UTC (rev 197483)
+++ trunk/Source/JavaScriptCore/runtime/JSCell.h 2016-03-03 02:04:49 UTC (rev 197484)
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> static NO_RETURN_DUE_TO_CRASH void getGenericPropertyNames(JSObject*, ExecState*, PropertyNameArray&, EnumerationMode);
</span><span class="cx"> static NO_RETURN_DUE_TO_CRASH bool preventExtensions(JSObject*, ExecState*);
</span><span class="cx"> static NO_RETURN_DUE_TO_CRASH bool isExtensible(JSObject*, ExecState*);
</span><del>- static NO_RETURN_DUE_TO_CRASH bool setPrototypeOf(JSObject*, ExecState*, JSValue);
</del><ins>+ static NO_RETURN_DUE_TO_CRASH bool setPrototype(JSObject*, ExecState*, JSValue);
</ins><span class="cx">
</span><span class="cx"> static String className(const JSObject*);
</span><span class="cx"> JS_EXPORT_PRIVATE static bool customHasInstance(JSObject*, ExecState*, JSValue);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp (197483 => 197484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp 2016-03-03 01:29:31 UTC (rev 197483)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp 2016-03-03 02:04:49 UTC (rev 197484)
</span><span class="lines">@@ -885,14 +885,14 @@
</span><span class="cx"> if (thisObject->prototype() == value)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><del>- bool isExtensible = thisObject->isExtensibleInline(exec);
</del><ins>+ bool isExtensible = thisObject->isExtensible(exec);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (!isExtensible)
</span><span class="cx"> return throwVMError(exec, createTypeError(exec, StrictModeReadonlyPropertyWriteError));
</span><span class="cx">
</span><span class="cx"> VM& vm = exec->vm();
</span><del>- if (!thisObject->setPrototypeOfInline(vm, exec, value)) {
</del><ins>+ if (!thisObject->setPrototype(vm, exec, value)) {
</ins><span class="cx"> if (!vm.exception())
</span><span class="cx"> vm.throwException(exec, createError(exec, ASCIILiteral("cyclic __proto__ value")));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.cpp (197483 => 197484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2016-03-03 01:29:31 UTC (rev 197483)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2016-03-03 02:04:49 UTC (rev 197484)
</span><span class="lines">@@ -1211,11 +1211,16 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool JSObject::setPrototypeOf(JSObject* object, ExecState* exec, JSValue prototype)
</del><ins>+bool JSObject::setPrototype(JSObject* object, ExecState* exec, JSValue prototype)
</ins><span class="cx"> {
</span><span class="cx"> return object->setPrototypeWithCycleCheck(exec->vm(), exec, prototype);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool JSObject::setPrototype(VM& vm, ExecState* exec, JSValue prototype)
+{
+ return methodTable(vm)->setPrototype(this, exec, prototype);
+}
+
</ins><span class="cx"> bool JSObject::allowsAccessFrom(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSGlobalObject* globalObject = this->globalObject();
</span><span class="lines">@@ -1701,6 +1706,12 @@
</span><span class="cx"> return obj->isExtensibleImpl();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool JSObject::isExtensible(ExecState* exec)
+{
+ VM& vm = exec->vm();
+ return methodTable(vm)->isExtensible(this, exec);
+}
+
</ins><span class="cx"> void JSObject::reifyAllStaticProperties(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!staticFunctionsReified());
</span><span class="lines">@@ -2863,7 +2874,7 @@
</span><span class="cx"> DefineOwnPropertyScope scope(exec);
</span><span class="cx"> PropertyDescriptor current;
</span><span class="cx"> bool isCurrentDefined = getOwnPropertyDescriptor(exec, propertyName, current);
</span><del>- bool isExtensible = isExtensibleInline(exec);
</del><ins>+ bool isExtensible = this->isExtensible(exec);
</ins><span class="cx"> if (UNLIKELY(exec->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> return validateAndApplyPropertyDescriptor(exec, this, propertyName, isExtensible, descriptor, isCurrentDefined, current, throwException);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.h (197483 => 197484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.h 2016-03-03 01:29:31 UTC (rev 197483)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.h 2016-03-03 02:04:49 UTC (rev 197484)
</span><span class="lines">@@ -119,15 +119,8 @@
</span><span class="cx"> // This is the fully virtual [[SetPrototypeOf]] internal function defined
</span><span class="cx"> // in the ECMAScript 6 specification. Use this when doing a [[SetPrototypeOf]]
</span><span class="cx"> // operation as dictated in the specification.
</span><del>- ALWAYS_INLINE bool setPrototypeOfInline(VM& vm, ExecState* exec, JSValue prototype)
- {
- auto setPrototypeOfMethod = methodTable(vm)->setPrototypeOf;
- if (LIKELY(setPrototypeOfMethod == JSObject::setPrototypeOf))
- return setPrototypeWithCycleCheck(vm, exec, prototype);
-
- return setPrototypeOfMethod(this, exec, prototype);
- }
- JS_EXPORT_PRIVATE static bool setPrototypeOf(JSObject*, ExecState*, JSValue prototype);
</del><ins>+ bool setPrototype(VM&, ExecState*, JSValue prototype);
+ JS_EXPORT_PRIVATE static bool setPrototype(JSObject*, ExecState*, JSValue prototype);
</ins><span class="cx">
</span><span class="cx"> bool mayInterceptIndexedAccesses()
</span><span class="cx"> {
</span><span class="lines">@@ -653,15 +646,7 @@
</span><span class="cx"> // You should call this when performing [[IsExtensible]] trap in a place
</span><span class="cx"> // that is described in the specification. This performs the fully virtual
</span><span class="cx"> // [[IsExtensible]] trap.
</span><del>- ALWAYS_INLINE bool isExtensibleInline(ExecState* exec)
- {
- VM& vm = exec->vm();
- auto isExtensibleMethod = methodTable(vm)->isExtensible;
- if (LIKELY(isExtensibleMethod == JSObject::isExtensible))
- return isExtensibleImpl();
-
- return isExtensibleMethod(this, exec);
- }
</del><ins>+ bool isExtensible(ExecState*);
</ins><span class="cx"> bool indexingShouldBeSparse()
</span><span class="cx"> {
</span><span class="cx"> return !isStructureExtensible()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeObjectConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp (197483 => 197484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp 2016-03-03 01:29:31 UTC (rev 197483)
+++ trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp 2016-03-03 02:04:49 UTC (rev 197484)
</span><span class="lines">@@ -212,14 +212,14 @@
</span><span class="cx"> if (object->prototype() == protoValue)
</span><span class="cx"> return JSValue::encode(objectValue);
</span><span class="cx">
</span><del>- bool isExtensible = object->isExtensibleInline(exec);
</del><ins>+ bool isExtensible = object->isExtensible(exec);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> if (!isExtensible)
</span><span class="cx"> return throwVMError(exec, createTypeError(exec, StrictModeReadonlyPropertyWriteError));
</span><span class="cx">
</span><span class="cx"> VM& vm = exec->vm();
</span><del>- bool didSetPrototype = object->setPrototypeOfInline(vm, exec, protoValue);
</del><ins>+ bool didSetPrototype = object->setPrototype(vm, exec, protoValue);
</ins><span class="cx"> if (vm.exception())
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> if (!didSetPrototype) {
</span><span class="lines">@@ -623,7 +623,7 @@
</span><span class="cx">
</span><span class="cx"> // 3. If the [[Extensible]] internal property of O is false, then return true.
</span><span class="cx"> // 4. Otherwise, return false.
</span><del>- bool isExtensible = object->isExtensibleInline(exec);
</del><ins>+ bool isExtensible = object->isExtensible(exec);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> return JSValue::encode(jsBoolean(!isExtensible));
</span><span class="lines">@@ -660,7 +660,7 @@
</span><span class="cx">
</span><span class="cx"> // 3. If the [[Extensible]] internal property of O is false, then return true.
</span><span class="cx"> // 4. Otherwise, return false.
</span><del>- bool isExtensible = object->isExtensibleInline(exec);
</del><ins>+ bool isExtensible = object->isExtensible(exec);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> return JSValue::encode(jsBoolean(!isExtensible));
</span><span class="lines">@@ -672,7 +672,7 @@
</span><span class="cx"> if (!obj.isObject())
</span><span class="cx"> return JSValue::encode(jsBoolean(false));
</span><span class="cx"> JSObject* object = asObject(obj);
</span><del>- bool isExtensible = object->isExtensibleInline(exec);
</del><ins>+ bool isExtensible = object->isExtensible(exec);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> return JSValue::encode(jsBoolean(isExtensible));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeProxyObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp (197483 => 197484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp 2016-03-03 01:29:31 UTC (rev 197483)
+++ trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp 2016-03-03 02:04:49 UTC (rev 197484)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> }
</span><span class="cx"> // FIXME: this doesn't work if 'target' is another Proxy. We don't have isExtensible implemented in a way that fits w/ Proxys.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=154375
</span><del>- bool isExtensible = target->isExtensibleInline(exec);
</del><ins>+ bool isExtensible = target->isExtensible(exec);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return false;
</span><span class="cx"> if (!isExtensible) {
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool isExtensible = target->isExtensibleInline(exec);
</del><ins>+ bool isExtensible = target->isExtensible(exec);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return false;
</span><span class="cx"> PropertyDescriptor trapResultAsDescriptor;
</span><span class="lines">@@ -299,7 +299,7 @@
</span><span class="cx"> throwVMTypeError(exec, ASCIILiteral("Proxy 'has' must return 'true' for non-configurable properties."));
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>- bool isExtensible = target->isExtensibleInline(exec);
</del><ins>+ bool isExtensible = target->isExtensible(exec);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return false;
</span><span class="cx"> if (!isExtensible) {
</span><span class="lines">@@ -637,7 +637,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (trapResultAsBool) {
</span><del>- bool targetIsExtensible = target->isExtensibleInline(exec);
</del><ins>+ bool targetIsExtensible = target->isExtensible(exec);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return false;
</span><span class="cx"> if (targetIsExtensible) {
</span><span class="lines">@@ -673,7 +673,7 @@
</span><span class="cx">
</span><span class="cx"> JSObject* target = this->target();
</span><span class="cx"> if (isExtensibleMethod.isUndefined())
</span><del>- return target->isExtensibleInline(exec);
</del><ins>+ return target->isExtensible(exec);
</ins><span class="cx">
</span><span class="cx"> MarkedArgumentBuffer arguments;
</span><span class="cx"> arguments.append(target);
</span><span class="lines">@@ -685,7 +685,7 @@
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- bool isTargetExtensible = target->isExtensibleInline(exec);
</del><ins>+ bool isTargetExtensible = target->isExtensible(exec);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeReflectObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ReflectObject.cpp (197483 => 197484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ReflectObject.cpp 2016-03-03 01:29:31 UTC (rev 197483)
+++ trunk/Source/JavaScriptCore/runtime/ReflectObject.cpp 2016-03-03 02:04:49 UTC (rev 197484)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> if (!target.isObject())
</span><span class="cx"> return JSValue::encode(throwTypeError(exec, ASCIILiteral("Reflect.isExtensible requires the first argument be an object")));
</span><span class="cx">
</span><del>- bool isExtensible = asObject(target)->isExtensibleInline(exec);
</del><ins>+ bool isExtensible = asObject(target)->isExtensible(exec);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> return JSValue::encode(jsBoolean(isExtensible));
</span><span class="lines">@@ -215,14 +215,14 @@
</span><span class="cx"> if (object->prototype() == proto)
</span><span class="cx"> return JSValue::encode(jsBoolean(true));
</span><span class="cx">
</span><del>- bool isExtensible = object->isExtensibleInline(exec);
</del><ins>+ bool isExtensible = object->isExtensible(exec);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> if (!isExtensible)
</span><span class="cx"> return JSValue::encode(jsBoolean(false));
</span><span class="cx">
</span><span class="cx"> VM& vm = exec->vm();
</span><del>- bool didSetPrototype = object->setPrototypeOfInline(vm, exec, proto);
</del><ins>+ bool didSetPrototype = object->setPrototype(vm, exec, proto);
</ins><span class="cx"> if (vm.exception())
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> return JSValue::encode(jsBoolean(didSetPrototype));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStringObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StringObject.cpp (197483 => 197484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StringObject.cpp 2016-03-03 01:29:31 UTC (rev 197483)
+++ trunk/Source/JavaScriptCore/runtime/StringObject.cpp 2016-03-03 02:04:49 UTC (rev 197484)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> StringObject* thisObject = jsCast<StringObject*>(object);
</span><span class="cx">
</span><span class="cx"> if (propertyName == exec->propertyNames().length) {
</span><del>- bool isExtensible = object->isExtensibleInline(exec);
</del><ins>+ bool isExtensible = object->isExtensible(exec);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return false;
</span><span class="cx"> if (!isExtensible) {
</span></span></pre>
</div>
</div>
</body>
</html>