<!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>[266019] 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/266019">266019</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2020-08-21 16:46:08 -0700 (Fri, 21 Aug 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, reverting <a href="http://trac.webkit.org/projects/webkit/changeset/265965">r265965</a>.
https://bugs.webkit.org/show_bug.cgi?id=215744

getCallData can be called from DFG concurrent compiler, but it
is not safe in DOM PluginObject

Reverted changeset:

"Use jsTypeofIsObject() in DFG AI and
operationTypeOfIsObject()"
https://bugs.webkit.org/show_bug.cgi?id=144457
https://trac.webkit.org/changeset/265965</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh">trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGOperationscpp">trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCommonSlowPathsh">trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOperationscpp">trunk/Source/JavaScriptCore/runtime/Operations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOperationsh">trunk/Source/JavaScriptCore/runtime/Operations.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (266018 => 266019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2020-08-21 23:07:40 UTC (rev 266018)
+++ trunk/Source/JavaScriptCore/ChangeLog       2020-08-21 23:46:08 UTC (rev 266019)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2020-08-21  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r265965.
+        https://bugs.webkit.org/show_bug.cgi?id=215744
+
+        getCallData can be called from DFG concurrent compiler, but it
+        is not safe in DOM PluginObject
+
+        Reverted changeset:
+
+        "Use jsTypeofIsObject() in DFG AI and
+        operationTypeOfIsObject()"
+        https://bugs.webkit.org/show_bug.cgi?id=144457
+        https://trac.webkit.org/changeset/265965
+
</ins><span class="cx"> 2020-08-21  Alexey Shvayka  <shvaikalesh@gmail.com>
</span><span class="cx"> 
</span><span class="cx">         Align "length" properties of function prototypes with the spec
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (266018 => 266019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h  2020-08-21 23:07:40 UTC (rev 266018)
+++ trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h     2020-08-21 23:46:08 UTC (rev 266019)
</span><span class="lines">@@ -1477,7 +1477,19 @@
</span><span class="cx">                     : child.value().isUndefined()));
</span><span class="cx">                 break;
</span><span class="cx">             case TypeOfIsObject:
</span><del>-                setConstant(node, jsBoolean(jsTypeofIsObject(m_codeBlock->globalObjectFor(node->origin.semantic), child.value())));
</del><ins>+                if (child.value().isObject()) {
+                    JSObject* object = asObject(child.value());
+                    if (object->type() == JSFunctionType)
+                        setConstant(node, jsBoolean(false));
+                    else if (!(object->inlineTypeFlags() & OverridesGetCallData))
+                        setConstant(node, jsBoolean(!child.value().asCell()->structure(m_vm)->masqueradesAsUndefined(m_codeBlock->globalObjectFor(node->origin.semantic))));
+                    else {
+                        // FIXME: This could just call getCallData.
+                        // https://bugs.webkit.org/show_bug.cgi?id=144457
+                        constantWasSet = false;
+                    }
+                } else
+                    setConstant(node, jsBoolean(child.value().isNull()));
</ins><span class="cx">                 break;
</span><span class="cx">             case TypeOfIsFunction:
</span><span class="cx">                 setConstant(node, jsBoolean(jsTypeofIsFunction(m_codeBlock->globalObjectFor(node->origin.semantic), child.value())));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp (266018 => 266019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp        2020-08-21 23:07:40 UTC (rev 266018)
+++ trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp   2020-08-21 23:46:08 UTC (rev 266019)
</span><span class="lines">@@ -2130,7 +2130,13 @@
</span><span class="cx">     CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
</span><span class="cx">     JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
</span><span class="cx"> 
</span><del>-    return jsTypeofIsObject(globalObject, asObject(object));
</del><ins>+    ASSERT(jsDynamicCast<JSObject*>(vm, object));
+    
+    if (object->structure(vm)->masqueradesAsUndefined(globalObject))
+        return false;
+    if (object->isCallable(vm))
+        return false;
+    return true;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> size_t JIT_OPERATION operationTypeOfIsFunction(JSGlobalObject* globalObject, JSCell* object)
</span><span class="lines">@@ -2139,7 +2145,9 @@
</span><span class="cx">     CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
</span><span class="cx">     JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
</span><span class="cx"> 
</span><del>-    return jsTypeofIsFunction(globalObject, asObject(object));
</del><ins>+    ASSERT(jsDynamicCast<JSObject*>(vm, object));
+
+    return jsTypeofIsFunction(globalObject, object);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> size_t JIT_OPERATION operationObjectIsCallable(JSGlobalObject* globalObject, JSCell* object)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCommonSlowPathsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h (266018 => 266019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h    2020-08-21 23:07:40 UTC (rev 266018)
+++ trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h       2020-08-21 23:46:08 UTC (rev 266019)
</span><span class="lines">@@ -253,6 +253,7 @@
</span><span class="cx"> SLOW_PATH_HIDDEN_DECL(slow_path_typeof);
</span><span class="cx"> SLOW_PATH_HIDDEN_DECL(slow_path_typeof_is_object);
</span><span class="cx"> SLOW_PATH_HIDDEN_DECL(slow_path_typeof_is_function);
</span><ins>+SLOW_PATH_HIDDEN_DECL(slow_path_is_object);
</ins><span class="cx"> SLOW_PATH_HIDDEN_DECL(slow_path_is_callable);
</span><span class="cx"> SLOW_PATH_HIDDEN_DECL(slow_path_is_constructor);
</span><span class="cx"> SLOW_PATH_HIDDEN_DECL(slow_path_in_by_id);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Operations.cpp (266018 => 266019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Operations.cpp       2020-08-21 23:07:40 UTC (rev 266018)
+++ trunk/Source/JavaScriptCore/runtime/Operations.cpp  2020-08-21 23:46:08 UTC (rev 266019)
</span><span class="lines">@@ -106,6 +106,25 @@
</span><span class="cx">     return jsTypeStringForValue(globalObject->vm(), globalObject, v);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+bool jsTypeofIsObject(JSGlobalObject* globalObject, JSValue v)
+{
+    VM& vm = globalObject->vm();
+    if (!v.isCell())
+        return v.isNull();
+
+    JSType type = v.asCell()->type();
+    if (type == StringType || type == SymbolType || type == HeapBigIntType)
+        return false;
+    if (type >= ObjectType) {
+        if (asObject(v)->structure(vm)->masqueradesAsUndefined(globalObject))
+            return false;
+        JSObject* object = asObject(v);
+        if (object->isCallable(vm))
+            return false;
+    }
+    return true;
+}
+
</ins><span class="cx"> size_t normalizePrototypeChain(JSGlobalObject* globalObject, JSCell* base, bool& sawPolyProto)
</span><span class="cx"> {
</span><span class="cx">     VM& vm = globalObject->vm();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOperationsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Operations.h (266018 => 266019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Operations.h 2020-08-21 23:07:40 UTC (rev 266018)
+++ trunk/Source/JavaScriptCore/runtime/Operations.h    2020-08-21 23:46:08 UTC (rev 266019)
</span><span class="lines">@@ -33,42 +33,22 @@
</span><span class="cx"> NEVER_INLINE JSValue jsAddSlowCase(JSGlobalObject*, JSValue, JSValue);
</span><span class="cx"> JSValue jsTypeStringForValue(JSGlobalObject*, JSValue);
</span><span class="cx"> JSValue jsTypeStringForValue(VM&, JSGlobalObject*, JSValue);
</span><ins>+bool jsTypeofIsObject(JSGlobalObject*, JSValue);
</ins><span class="cx"> size_t normalizePrototypeChain(JSGlobalObject*, JSCell*, bool& sawPolyProto);
</span><span class="cx"> 
</span><del>-ALWAYS_INLINE bool jsTypeofIsObject(JSGlobalObject* globalObject, JSObject* object)
</del><ins>+ALWAYS_INLINE bool jsTypeofIsFunction(JSGlobalObject* globalObject, JSValue value)
</ins><span class="cx"> {
</span><span class="cx">     VM& vm = globalObject->vm();
</span><del>-    if (object->structure(vm)->masqueradesAsUndefined(globalObject))
-        return false;
-    if (object->isCallable(vm))
-        return false;
-    return true;
-}
-
-ALWAYS_INLINE bool jsTypeofIsObject(JSGlobalObject* globalObject, JSValue value)
-{
-    if (value.isObject())
-        return jsTypeofIsObject(globalObject, asObject(value));
-    return value.isNull();
-}
-
-ALWAYS_INLINE bool jsTypeofIsFunction(JSGlobalObject* globalObject, JSObject* object)
-{
-    VM& vm = globalObject->vm();
-    if (object->structure(vm)->masqueradesAsUndefined(globalObject))
-        return false;
-    if (object->isCallable(vm))
-        return true;
</del><ins>+    if (value.isObject()) {
+        JSObject* object = asObject(value);
+        if (object->structure(vm)->masqueradesAsUndefined(globalObject))
+            return false;
+        if (object->isCallable(vm))
+            return true;
+    }
</ins><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-ALWAYS_INLINE bool jsTypeofIsFunction(JSGlobalObject* globalObject, JSValue value)
-{
-    if (value.isObject())
-        return jsTypeofIsFunction(globalObject, asObject(value));
-    return false;
-}
-
</del><span class="cx"> ALWAYS_INLINE JSString* jsString(JSGlobalObject* globalObject, const String& u1, JSString* s2)
</span><span class="cx"> {
</span><span class="cx">     VM& vm = getVM(globalObject);
</span></span></pre>
</div>
</div>

</body>
</html>