<!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>[201766] 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/201766">201766</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-06-07 12:51:41 -0700 (Tue, 07 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>calculatedDisplayName() and friends actually need a VM& and not a ExecState/CallFrame.
https://bugs.webkit.org/show_bug.cgi?id=158488
Reviewed by Geoffrey Garen.
calculatedDisplayName() (and some of its friends) actually just need a VM&.
Their work has nothing to do with an ExecState at all. This patch will make that
clear by changing these functions to take a VM& arg instead of an ExecState* or
CallFrame*.
Also removed the JS_EXPORT_PRIVATE attribute from Interpreter::StackFrame::toString().
The JS_EXPORT_PRIVATE attribute was a holdover from the days when WebInspector
was entirely in WebCore. It is no longer needed.
* debugger/DebuggerCallFrame.cpp:
(JSC::DebuggerCallFrame::functionName):
* inspector/JSInjectedScriptHost.cpp:
(Inspector::JSInjectedScriptHost::functionDetails):
* inspector/ScriptCallStackFactory.cpp:
(Inspector::createScriptCallStackFromException):
* interpreter/CallFrame.cpp:
(JSC::CallFrame::friendlyFunctionName):
* interpreter/Interpreter.cpp:
(JSC::StackFrame::friendlySourceURL):
(JSC::StackFrame::friendlyFunctionName):
(JSC::StackFrame::expressionInfo):
(JSC::StackFrame::toString):
(JSC::Interpreter::stackTraceAsString):
* interpreter/Interpreter.h:
* interpreter/StackVisitor.cpp:
(JSC::StackVisitor::Frame::functionName):
* runtime/InternalFunction.cpp:
(JSC::InternalFunction::name):
(JSC::InternalFunction::displayName):
(JSC::InternalFunction::getCallData):
(JSC::InternalFunction::calculatedDisplayName):
* runtime/InternalFunction.h:
(JSC::InternalFunction::createStructure):
* runtime/JSFunction.cpp:
(JSC::JSFunction::name):
(JSC::JSFunction::displayName):
(JSC::JSFunction::calculatedDisplayName):
(JSC::JSFunction::getConstructData):
(JSC::getCalculatedDisplayName):
* runtime/JSFunction.h:
(JSC::JSFunction::executable):
* runtime/JSObject.cpp:
(JSC::JSObject::calculatedClassName):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggerCallFramecpp">trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostcpp">trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptCallStackFactorycpp">trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterCallFramecpp">trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterInterpretercpp">trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterInterpreterh">trunk/Source/JavaScriptCore/interpreter/Interpreter.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterStackVisitorcpp">trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeInternalFunctioncpp">trunk/Source/JavaScriptCore/runtime/InternalFunction.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeInternalFunctionh">trunk/Source/JavaScriptCore/runtime/InternalFunction.h</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="#trunkSourceJavaScriptCoreruntimeJSObjectcpp">trunk/Source/JavaScriptCore/runtime/JSObject.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (201765 => 201766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-06-07 19:31:16 UTC (rev 201765)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-06-07 19:51:41 UTC (rev 201766)
</span><span class="lines">@@ -1,3 +1,54 @@
</span><ins>+2016-06-07 Mark Lam <mark.lam@apple.com>
+
+ calculatedDisplayName() and friends actually need a VM& and not a ExecState/CallFrame.
+ https://bugs.webkit.org/show_bug.cgi?id=158488
+
+ Reviewed by Geoffrey Garen.
+
+ calculatedDisplayName() (and some of its friends) actually just need a VM&.
+ Their work has nothing to do with an ExecState at all. This patch will make that
+ clear by changing these functions to take a VM& arg instead of an ExecState* or
+ CallFrame*.
+
+ Also removed the JS_EXPORT_PRIVATE attribute from Interpreter::StackFrame::toString().
+ The JS_EXPORT_PRIVATE attribute was a holdover from the days when WebInspector
+ was entirely in WebCore. It is no longer needed.
+
+ * debugger/DebuggerCallFrame.cpp:
+ (JSC::DebuggerCallFrame::functionName):
+ * inspector/JSInjectedScriptHost.cpp:
+ (Inspector::JSInjectedScriptHost::functionDetails):
+ * inspector/ScriptCallStackFactory.cpp:
+ (Inspector::createScriptCallStackFromException):
+ * interpreter/CallFrame.cpp:
+ (JSC::CallFrame::friendlyFunctionName):
+ * interpreter/Interpreter.cpp:
+ (JSC::StackFrame::friendlySourceURL):
+ (JSC::StackFrame::friendlyFunctionName):
+ (JSC::StackFrame::expressionInfo):
+ (JSC::StackFrame::toString):
+ (JSC::Interpreter::stackTraceAsString):
+ * interpreter/Interpreter.h:
+ * interpreter/StackVisitor.cpp:
+ (JSC::StackVisitor::Frame::functionName):
+ * runtime/InternalFunction.cpp:
+ (JSC::InternalFunction::name):
+ (JSC::InternalFunction::displayName):
+ (JSC::InternalFunction::getCallData):
+ (JSC::InternalFunction::calculatedDisplayName):
+ * runtime/InternalFunction.h:
+ (JSC::InternalFunction::createStructure):
+ * runtime/JSFunction.cpp:
+ (JSC::JSFunction::name):
+ (JSC::JSFunction::displayName):
+ (JSC::JSFunction::calculatedDisplayName):
+ (JSC::JSFunction::getConstructData):
+ (JSC::getCalculatedDisplayName):
+ * runtime/JSFunction.h:
+ (JSC::JSFunction::executable):
+ * runtime/JSObject.cpp:
+ (JSC::JSObject::calculatedClassName):
+
</ins><span class="cx"> 2016-06-07 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Do not allocate unnecessary UTF-8 string for encodeXXX functions
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggerCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp (201765 => 201766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp 2016-06-07 19:31:16 UTC (rev 201765)
+++ trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp 2016-06-07 19:51:41 UTC (rev 201766)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx">
</span><span class="cx"> if (isTailDeleted()) {
</span><span class="cx"> if (JSFunction* func = jsDynamicCast<JSFunction*>(m_shadowChickenFrame.callee))
</span><del>- return func->calculatedDisplayName(m_validMachineFrame);
</del><ins>+ return func->calculatedDisplayName(m_validMachineFrame->vm());
</ins><span class="cx"> return m_shadowChickenFrame.codeBlock->inferredName().data();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp (201765 => 201766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp 2016-06-07 19:31:16 UTC (rev 201765)
+++ trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp 2016-06-07 19:51:41 UTC (rev 201766)
</span><span class="lines">@@ -220,22 +220,23 @@
</span><span class="cx"> if (columnNumber)
</span><span class="cx"> columnNumber -= 1;
</span><span class="cx">
</span><ins>+ VM& vm = exec->vm();
</ins><span class="cx"> String scriptID = String::number(sourceCode->provider()->asID());
</span><span class="cx"> JSObject* location = constructEmptyObject(exec);
</span><del>- location->putDirect(exec->vm(), Identifier::fromString(exec, "scriptId"), jsString(exec, scriptID));
- location->putDirect(exec->vm(), Identifier::fromString(exec, "lineNumber"), jsNumber(lineNumber));
- location->putDirect(exec->vm(), Identifier::fromString(exec, "columnNumber"), jsNumber(columnNumber));
</del><ins>+ location->putDirect(vm, Identifier::fromString(exec, "scriptId"), jsString(exec, scriptID));
+ location->putDirect(vm, Identifier::fromString(exec, "lineNumber"), jsNumber(lineNumber));
+ location->putDirect(vm, Identifier::fromString(exec, "columnNumber"), jsNumber(columnNumber));
</ins><span class="cx">
</span><span class="cx"> JSObject* result = constructEmptyObject(exec);
</span><del>- result->putDirect(exec->vm(), Identifier::fromString(exec, "location"), location);
</del><ins>+ result->putDirect(vm, Identifier::fromString(exec, "location"), location);
</ins><span class="cx">
</span><span class="cx"> String name = function->name();
</span><span class="cx"> if (!name.isEmpty())
</span><del>- result->putDirect(exec->vm(), Identifier::fromString(exec, "name"), jsString(exec, name));
</del><ins>+ result->putDirect(vm, Identifier::fromString(exec, "name"), jsString(exec, name));
</ins><span class="cx">
</span><del>- String displayName = function->displayName(exec);
</del><ins>+ String displayName = function->displayName(vm);
</ins><span class="cx"> if (!displayName.isEmpty())
</span><del>- result->putDirect(exec->vm(), Identifier::fromString(exec, "displayName"), jsString(exec, displayName));
</del><ins>+ result->putDirect(vm, Identifier::fromString(exec, "displayName"), jsString(exec, displayName));
</ins><span class="cx">
</span><span class="cx"> // FIXME: provide function scope data in "scopesRaw" property when JSC supports it.
</span><span class="cx"> // <https://webkit.org/b/87192> [JSC] expose function (closure) inner context to debugger
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptCallStackFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp (201765 => 201766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp 2016-06-07 19:31:16 UTC (rev 201765)
+++ trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp 2016-06-07 19:51:41 UTC (rev 201766)
</span><span class="lines">@@ -138,11 +138,12 @@
</span><span class="cx"> {
</span><span class="cx"> Vector<ScriptCallFrame> frames;
</span><span class="cx"> RefCountedArray<StackFrame> stackTrace = exception->stack();
</span><ins>+ VM& vm = exec->vm();
</ins><span class="cx"> for (size_t i = 0; i < stackTrace.size() && i < maxStackSize; i++) {
</span><span class="cx"> unsigned line;
</span><span class="cx"> unsigned column;
</span><span class="cx"> stackTrace[i].computeLineAndColumn(line, column);
</span><del>- String functionName = stackTrace[i].friendlyFunctionName(exec);
</del><ins>+ String functionName = stackTrace[i].friendlyFunctionName(vm);
</ins><span class="cx"> frames.append(ScriptCallFrame(functionName, stackTrace[i].friendlySourceURL(), static_cast<SourceID>(stackTrace[i].sourceID), line, column));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp (201765 => 201766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp 2016-06-07 19:31:16 UTC (rev 201765)
+++ trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp 2016-06-07 19:51:41 UTC (rev 201766)
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx"> return ASCIILiteral("global code");
</span><span class="cx"> case FunctionCode:
</span><span class="cx"> if (callee())
</span><del>- return getCalculatedDisplayName(this, callee());
</del><ins>+ return getCalculatedDisplayName(vm(), callee());
</ins><span class="cx"> return emptyString();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp (201765 => 201766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2016-06-07 19:31:16 UTC (rev 201765)
+++ trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2016-06-07 19:51:41 UTC (rev 201766)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> return traceLine.isNull() ? emptyString() : traceLine;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String StackFrame::friendlyFunctionName(CallFrame* callFrame) const
</del><ins>+String StackFrame::friendlyFunctionName(VM& vm) const
</ins><span class="cx"> {
</span><span class="cx"> String traceLine;
</span><span class="cx"> JSObject* stackFrameCallee = callee.get();
</span><span class="lines">@@ -120,10 +120,10 @@
</span><span class="cx"> break;
</span><span class="cx"> case StackFrameNativeCode:
</span><span class="cx"> if (callee)
</span><del>- traceLine = getCalculatedDisplayName(callFrame, stackFrameCallee).impl();
</del><ins>+ traceLine = getCalculatedDisplayName(vm, stackFrameCallee).impl();
</ins><span class="cx"> break;
</span><span class="cx"> case StackFrameFunctionCode:
</span><del>- traceLine = getCalculatedDisplayName(callFrame, stackFrameCallee).impl();
</del><ins>+ traceLine = getCalculatedDisplayName(vm, stackFrameCallee).impl();
</ins><span class="cx"> break;
</span><span class="cx"> case StackFrameGlobalCode:
</span><span class="cx"> traceLine = "global code";
</span><span class="lines">@@ -496,10 +496,10 @@
</span><span class="cx"> divot += characterOffset;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String StackFrame::toString(CallFrame* callFrame)
</del><ins>+String StackFrame::toString(VM& vm)
</ins><span class="cx"> {
</span><span class="cx"> StringBuilder traceBuild;
</span><del>- String functionName = friendlyFunctionName(callFrame);
</del><ins>+ String functionName = friendlyFunctionName(vm);
</ins><span class="cx"> String sourceURL = friendlySourceURL();
</span><span class="cx"> traceBuild.append(functionName);
</span><span class="cx"> if (!sourceURL.isEmpty()) {
</span><span class="lines">@@ -593,8 +593,9 @@
</span><span class="cx"> {
</span><span class="cx"> // FIXME: JSStringJoiner could be more efficient than StringBuilder here.
</span><span class="cx"> StringBuilder builder;
</span><ins>+ VM& vm = exec->vm();
</ins><span class="cx"> for (unsigned i = 0; i < stackTrace.size(); i++) {
</span><del>- builder.append(String(stackTrace[i].toString(exec)));
</del><ins>+ builder.append(String(stackTrace[i].toString(vm)));
</ins><span class="cx"> if (i != stackTrace.size() - 1)
</span><span class="cx"> builder.append('\n');
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterInterpreterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/Interpreter.h (201765 => 201766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/Interpreter.h 2016-06-07 19:31:16 UTC (rev 201765)
+++ trunk/Source/JavaScriptCore/interpreter/Interpreter.h 2016-06-07 19:51:41 UTC (rev 201766)
</span><span class="lines">@@ -95,9 +95,9 @@
</span><span class="cx"> unsigned bytecodeOffset;
</span><span class="cx"> String sourceURL;
</span><span class="cx"> intptr_t sourceID;
</span><del>- JS_EXPORT_PRIVATE String toString(CallFrame*);
</del><ins>+ String toString(VM&);
</ins><span class="cx"> String friendlySourceURL() const;
</span><del>- String friendlyFunctionName(CallFrame*) const;
</del><ins>+ String friendlyFunctionName(VM&) const;
</ins><span class="cx"> JS_EXPORT_PRIVATE void computeLineAndColumn(unsigned& line, unsigned& column);
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterStackVisitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp (201765 => 201766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp 2016-06-07 19:31:16 UTC (rev 201765)
+++ trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp 2016-06-07 19:51:41 UTC (rev 201766)
</span><span class="lines">@@ -223,10 +223,10 @@
</span><span class="cx"> break;
</span><span class="cx"> case CodeType::Native:
</span><span class="cx"> if (callee)
</span><del>- traceLine = getCalculatedDisplayName(callFrame(), callee).impl();
</del><ins>+ traceLine = getCalculatedDisplayName(callFrame()->vm(), callee).impl();
</ins><span class="cx"> break;
</span><span class="cx"> case CodeType::Function:
</span><del>- traceLine = getCalculatedDisplayName(callFrame(), callee).impl();
</del><ins>+ traceLine = getCalculatedDisplayName(callFrame()->vm(), callee).impl();
</ins><span class="cx"> break;
</span><span class="cx"> case CodeType::Global:
</span><span class="cx"> traceLine = ASCIILiteral("global code");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeInternalFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/InternalFunction.cpp (201765 => 201766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/InternalFunction.cpp 2016-06-07 19:31:16 UTC (rev 201765)
+++ trunk/Source/JavaScriptCore/runtime/InternalFunction.cpp 2016-06-07 19:51:41 UTC (rev 201766)
</span><span class="lines">@@ -65,9 +65,9 @@
</span><span class="cx"> return name;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const String InternalFunction::displayName(ExecState* exec)
</del><ins>+const String InternalFunction::displayName(VM& vm)
</ins><span class="cx"> {
</span><del>- JSValue displayName = getDirect(exec->vm(), exec->vm().propertyNames->displayName);
</del><ins>+ JSValue displayName = getDirect(vm, vm.propertyNames->displayName);
</ins><span class="cx">
</span><span class="cx"> if (displayName && isJSString(displayName))
</span><span class="cx"> return asString(displayName)->tryGetValue();
</span><span class="lines">@@ -81,9 +81,9 @@
</span><span class="cx"> return CallType::None;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const String InternalFunction::calculatedDisplayName(ExecState* exec)
</del><ins>+const String InternalFunction::calculatedDisplayName(VM& vm)
</ins><span class="cx"> {
</span><del>- const String explicitName = displayName(exec);
</del><ins>+ const String explicitName = displayName(vm);
</ins><span class="cx">
</span><span class="cx"> if (!explicitName.isEmpty())
</span><span class="cx"> return explicitName;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeInternalFunctionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/InternalFunction.h (201765 => 201766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/InternalFunction.h 2016-06-07 19:31:16 UTC (rev 201765)
+++ trunk/Source/JavaScriptCore/runtime/InternalFunction.h 2016-06-07 19:51:41 UTC (rev 201766)
</span><span class="lines">@@ -41,8 +41,8 @@
</span><span class="cx"> JS_EXPORT_PRIVATE static void visitChildren(JSCell*, SlotVisitor&);
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE const String& name();
</span><del>- const String displayName(ExecState*);
- const String calculatedDisplayName(ExecState*);
</del><ins>+ const String displayName(VM&);
+ const String calculatedDisplayName(VM&);
</ins><span class="cx">
</span><span class="cx"> static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue proto)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSFunction.cpp (201765 => 201766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2016-06-07 19:31:16 UTC (rev 201765)
+++ trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2016-06-07 19:51:41 UTC (rev 201766)
</span><span class="lines">@@ -178,9 +178,9 @@
</span><span class="cx"> return jsExecutable()->name().string();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String JSFunction::displayName(ExecState* exec)
</del><ins>+String JSFunction::displayName(VM& vm)
</ins><span class="cx"> {
</span><del>- JSValue displayName = getDirect(exec->vm(), exec->vm().propertyNames->displayName);
</del><ins>+ JSValue displayName = getDirect(vm, vm.propertyNames->displayName);
</ins><span class="cx">
</span><span class="cx"> if (displayName && isJSString(displayName))
</span><span class="cx"> return asString(displayName)->tryGetValue();
</span><span class="lines">@@ -188,9 +188,9 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const String JSFunction::calculatedDisplayName(ExecState* exec)
</del><ins>+const String JSFunction::calculatedDisplayName(VM& vm)
</ins><span class="cx"> {
</span><del>- const String explicitName = displayName(exec);
</del><ins>+ const String explicitName = displayName(vm);
</ins><span class="cx">
</span><span class="cx"> if (!explicitName.isEmpty())
</span><span class="cx"> return explicitName;
</span><span class="lines">@@ -556,12 +556,12 @@
</span><span class="cx"> return ConstructType::JS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String getCalculatedDisplayName(CallFrame* callFrame, JSObject* object)
</del><ins>+String getCalculatedDisplayName(VM& vm, JSObject* object)
</ins><span class="cx"> {
</span><span class="cx"> if (JSFunction* function = jsDynamicCast<JSFunction*>(object))
</span><del>- return function->calculatedDisplayName(callFrame);
</del><ins>+ return function->calculatedDisplayName(vm);
</ins><span class="cx"> if (InternalFunction* function = jsDynamicCast<InternalFunction*>(object))
</span><del>- return function->calculatedDisplayName(callFrame);
</del><ins>+ return function->calculatedDisplayName(vm);
</ins><span class="cx"> return emptyString();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSFunctionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSFunction.h (201765 => 201766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSFunction.h 2016-06-07 19:31:16 UTC (rev 201765)
+++ trunk/Source/JavaScriptCore/runtime/JSFunction.h 2016-06-07 19:51:41 UTC (rev 201766)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE EncodedJSValue JSC_HOST_CALL callHostFunctionAsConstructor(ExecState*);
</span><span class="cx">
</span><del>-JS_EXPORT_PRIVATE String getCalculatedDisplayName(CallFrame*, JSObject*);
</del><ins>+JS_EXPORT_PRIVATE String getCalculatedDisplayName(VM&, JSObject*);
</ins><span class="cx">
</span><span class="cx"> class JSFunction : public JSCallee {
</span><span class="cx"> friend class JIT;
</span><span class="lines">@@ -82,8 +82,8 @@
</span><span class="cx"> static JSFunction* createBuiltinFunction(VM&, FunctionExecutable*, JSGlobalObject*, const String& name);
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE String name();
</span><del>- JS_EXPORT_PRIVATE String displayName(ExecState*);
- const String calculatedDisplayName(ExecState*);
</del><ins>+ JS_EXPORT_PRIVATE String displayName(VM&);
+ const String calculatedDisplayName(VM&);
</ins><span class="cx">
</span><span class="cx"> ExecutableBase* executable() const { return m_executable.get(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.cpp (201765 => 201766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2016-06-07 19:31:16 UTC (rev 201765)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2016-06-07 19:51:41 UTC (rev 201766)
</span><span class="lines">@@ -319,10 +319,11 @@
</span><span class="cx"> if (constructorValue.isCell()) {
</span><span class="cx"> if (JSCell* constructorCell = constructorValue.asCell()) {
</span><span class="cx"> if (JSObject* ctorObject = constructorCell->getObject()) {
</span><ins>+ VM& vm = exec->vm();
</ins><span class="cx"> if (JSFunction* constructorFunction = jsDynamicCast<JSFunction*>(ctorObject))
</span><del>- prototypeFunctionName = constructorFunction->calculatedDisplayName(exec);
</del><ins>+ prototypeFunctionName = constructorFunction->calculatedDisplayName(vm);
</ins><span class="cx"> else if (InternalFunction* constructorFunction = jsDynamicCast<InternalFunction*>(ctorObject))
</span><del>- prototypeFunctionName = constructorFunction->calculatedDisplayName(exec);
</del><ins>+ prototypeFunctionName = constructorFunction->calculatedDisplayName(vm);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>