<!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>[173706] 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/173706">173706</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2014-09-17 15:34:14 -0700 (Wed, 17 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change CallFrame to use Callee instead of JSScope to implement vm()
https://bugs.webkit.org/show_bug.cgi?id=136894
Reviewed by Geoffrey Garen.
Added JSCell::vm() method that can be used on any JSObject. Changed CallFrame::vm() to
use JSCell::vm with the Callee. Made similar changes in the LLInt.
In support of this, changed JSGlobalObject::init() to take a VM& parameter, as there is
a chicken/egg problem with trying to use the Callee in the global exec before the Callee
has been create. Besides, the vm is readily available in finishCreation(), the caller of
init().
* llint/LowLevelInterpreter32_64.asm:
* llint/LowLevelInterpreter64.asm:
Changed the calculation of CallFrame::VM to use the Callee instead of JSScope.
* runtime/JSCell.h:
* runtime/JSCellInlines.h:
(JSC::JSCell::vm): New method for getting VM from the pointer.
(JSC::ExecState::vm): Moved this method from JSScope.h to here since this file
contains the implementation of JSCell::vm(), this file is included by all users
of CallFrame::vm, and lastly putting it in CallFrameInlines.h required changing
many other .h files and possible the WebCore generator generate-bindings.pl.
* runtime/JSGlobalObject.cpp:
(JSC::JSGlobalObject::init):
* runtime/JSGlobalObject.h:
(JSC::JSGlobalObject::finishCreation):
Changed init() to take a VM parameter.
* runtime/JSScope.h:
(JSC::ExecState::vm): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCellh">trunk/Source/JavaScriptCore/runtime/JSCell.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCellInlinesh">trunk/Source/JavaScriptCore/runtime/JSCellInlines.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="#trunkSourceJavaScriptCoreruntimeJSScopeh">trunk/Source/JavaScriptCore/runtime/JSScope.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (173705 => 173706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-09-17 22:06:03 UTC (rev 173705)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-09-17 22:34:14 UTC (rev 173706)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2014-09-17 Michael Saboff <msaboff@apple.com>
+
+ Change CallFrame to use Callee instead of JSScope to implement vm()
+ https://bugs.webkit.org/show_bug.cgi?id=136894
+
+ Reviewed by Geoffrey Garen.
+
+ Added JSCell::vm() method that can be used on any JSObject. Changed CallFrame::vm() to
+ use JSCell::vm with the Callee. Made similar changes in the LLInt.
+ In support of this, changed JSGlobalObject::init() to take a VM& parameter, as there is
+ a chicken/egg problem with trying to use the Callee in the global exec before the Callee
+ has been create. Besides, the vm is readily available in finishCreation(), the caller of
+ init().
+
+ * llint/LowLevelInterpreter32_64.asm:
+ * llint/LowLevelInterpreter64.asm:
+ Changed the calculation of CallFrame::VM to use the Callee instead of JSScope.
+
+ * runtime/JSCell.h:
+ * runtime/JSCellInlines.h:
+ (JSC::JSCell::vm): New method for getting VM from the pointer.
+ (JSC::ExecState::vm): Moved this method from JSScope.h to here since this file
+ contains the implementation of JSCell::vm(), this file is included by all users
+ of CallFrame::vm, and lastly putting it in CallFrameInlines.h required changing
+ many other .h files and possible the WebCore generator generate-bindings.pl.
+
+ * runtime/JSGlobalObject.cpp:
+ (JSC::JSGlobalObject::init):
+ * runtime/JSGlobalObject.h:
+ (JSC::JSGlobalObject::finishCreation):
+ Changed init() to take a VM parameter.
+
+ * runtime/JSScope.h:
+ (JSC::ExecState::vm): Deleted.
+
</ins><span class="cx"> 2014-09-16 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, disable native inlining because it causes build failures.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (173705 => 173706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-09-17 22:06:03 UTC (rev 173705)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-09-17 22:34:14 UTC (rev 173706)
</span><span class="lines">@@ -387,7 +387,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> _handleUncaughtException:
</span><del>- loadp ScopeChain + PayloadOffset[cfr], t3
</del><ins>+ loadp Callee + PayloadOffset[cfr], t3
</ins><span class="cx"> andp MarkedBlockMask, t3
</span><span class="cx"> loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
</span><span class="cx"> loadp VM::callFrameForThrow[t3], cfr
</span><span class="lines">@@ -689,7 +689,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> macro branchIfException(label)
</span><del>- loadp ScopeChain[cfr], t3
</del><ins>+ loadp Callee[cfr], t3
</ins><span class="cx"> andp MarkedBlockMask, t3
</span><span class="cx"> loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
</span><span class="cx"> bieq VM::m_exception + TagOffset[t3], EmptyValueTag, .noException
</span><span class="lines">@@ -2036,7 +2036,7 @@
</span><span class="cx"> # the interpreter's throw trampoline (see _llint_throw_trampoline).
</span><span class="cx"> # The throwing code must have known that we were throwing to the interpreter,
</span><span class="cx"> # and have set VM::targetInterpreterPCForThrow.
</span><del>- loadp ScopeChain + PayloadOffset[cfr], t3
</del><ins>+ loadp Callee + PayloadOffset[cfr], t3
</ins><span class="cx"> andp MarkedBlockMask, t3
</span><span class="cx"> loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
</span><span class="cx"> loadp VM::callFrameForThrow[t3], cfr
</span><span class="lines">@@ -2124,6 +2124,7 @@
</span><span class="cx"> loadi ScopeChain + PayloadOffset[t0], t1
</span><span class="cx"> storei CellTag, ScopeChain + TagOffset[cfr]
</span><span class="cx"> storei t1, ScopeChain + PayloadOffset[cfr]
</span><ins>+ loadi Callee + PayloadOffset[t0], t1
</ins><span class="cx"> if X86 or X86_WIN
</span><span class="cx"> subp 8, sp # align stack pointer
</span><span class="cx"> andp MarkedBlockMask, t1
</span><span class="lines">@@ -2135,13 +2136,13 @@
</span><span class="cx"> loadp JSFunction::m_executable[t1], t1
</span><span class="cx"> checkStackPointerAlignment(t3, 0xdead0001)
</span><span class="cx"> call executableOffsetToFunction[t1]
</span><del>- loadp ScopeChain[cfr], t3
</del><ins>+ loadp Callee[cfr], t3
</ins><span class="cx"> andp MarkedBlockMask, t3
</span><span class="cx"> loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
</span><span class="cx"> addp 8, sp
</span><span class="cx"> elsif ARM or ARMv7 or ARMv7_TRADITIONAL or C_LOOP or MIPS or SH4
</span><span class="cx"> subp 8, sp # align stack pointer
</span><del>- # t1 already contains the ScopeChain.
</del><ins>+ # t1 already contains the Callee.
</ins><span class="cx"> andp MarkedBlockMask, t1
</span><span class="cx"> loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t1], t1
</span><span class="cx"> storep cfr, VM::topCallFrame[t1]
</span><span class="lines">@@ -2158,7 +2159,7 @@
</span><span class="cx"> else
</span><span class="cx"> call executableOffsetToFunction[t1]
</span><span class="cx"> end
</span><del>- loadp ScopeChain[cfr], t3
</del><ins>+ loadp Callee[cfr], t3
</ins><span class="cx"> andp MarkedBlockMask, t3
</span><span class="cx"> loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
</span><span class="cx"> addp 8, sp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (173705 => 173706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-09-17 22:06:03 UTC (rev 173705)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-09-17 22:34:14 UTC (rev 173706)
</span><span class="lines">@@ -327,7 +327,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> _handleUncaughtException:
</span><del>- loadp ScopeChain[cfr], t3
</del><ins>+ loadp Callee[cfr], t3
</ins><span class="cx"> andp MarkedBlockMask, t3
</span><span class="cx"> loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
</span><span class="cx"> loadp VM::callFrameForThrow[t3], cfr
</span><span class="lines">@@ -578,7 +578,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> macro branchIfException(label)
</span><del>- loadp ScopeChain[cfr], t3
</del><ins>+ loadp Callee[cfr], t3
</ins><span class="cx"> andp MarkedBlockMask, t3
</span><span class="cx"> loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
</span><span class="cx"> btqz VM::m_exception[t3], .noException
</span><span class="lines">@@ -1892,7 +1892,7 @@
</span><span class="cx"> # the interpreter's throw trampoline (see _llint_throw_trampoline).
</span><span class="cx"> # The throwing code must have known that we were throwing to the interpreter,
</span><span class="cx"> # and have set VM::targetInterpreterPCForThrow.
</span><del>- loadp ScopeChain[cfr], t3
</del><ins>+ loadp Callee[cfr], t3
</ins><span class="cx"> andp MarkedBlockMask, t3
</span><span class="cx"> loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
</span><span class="cx"> loadp VM::callFrameForThrow[t3], cfr
</span><span class="lines">@@ -1952,7 +1952,7 @@
</span><span class="cx"> const arg2 = t1 # t1 = rdx
</span><span class="cx"> const temp = t0
</span><span class="cx"> end
</span><del>- loadp ScopeChain[cfr], t0
</del><ins>+ loadp Callee[cfr], t0
</ins><span class="cx"> andp MarkedBlockMask, t0
</span><span class="cx"> loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t0], t0
</span><span class="cx"> storep cfr, VM::topCallFrame[t0]
</span><span class="lines">@@ -1970,11 +1970,11 @@
</span><span class="cx"> if X86_64_WIN
</span><span class="cx"> addp 32, sp
</span><span class="cx"> end
</span><del>- loadp ScopeChain[cfr], t3
</del><ins>+ loadp Callee[cfr], t3
</ins><span class="cx"> andp MarkedBlockMask, t3
</span><span class="cx"> loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
</span><span class="cx"> elsif ARM64 or C_LOOP
</span><del>- loadp ScopeChain[cfr], t0
</del><ins>+ loadp Callee[cfr], t0
</ins><span class="cx"> andp MarkedBlockMask, t0
</span><span class="cx"> loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t0], t0
</span><span class="cx"> storep cfr, VM::topCallFrame[t0]
</span><span class="lines">@@ -1993,7 +1993,7 @@
</span><span class="cx"> call executableOffsetToFunction[t1]
</span><span class="cx"> end
</span><span class="cx"> restoreReturnAddressBeforeReturn(t3)
</span><del>- loadp ScopeChain[cfr], t3
</del><ins>+ loadp Callee[cfr], t3
</ins><span class="cx"> andp MarkedBlockMask, t3
</span><span class="cx"> loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCellh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSCell.h (173705 => 173706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCell.h 2014-09-17 22:06:03 UTC (rev 173705)
+++ trunk/Source/JavaScriptCore/runtime/JSCell.h 2014-09-17 22:34:14 UTC (rev 173706)
</span><span class="lines">@@ -104,6 +104,8 @@
</span><span class="cx">
</span><span class="cx"> const char* className() const;
</span><span class="cx">
</span><ins>+ VM* vm() const;
+
</ins><span class="cx"> // Extracting the value.
</span><span class="cx"> JS_EXPORT_PRIVATE bool getString(ExecState*, String&) const;
</span><span class="cx"> JS_EXPORT_PRIVATE String getString(ExecState*) const; // null string if not a string
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCellInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSCellInlines.h (173705 => 173706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCellInlines.h 2014-09-17 22:06:03 UTC (rev 173705)
+++ trunk/Source/JavaScriptCore/runtime/JSCellInlines.h 2014-09-17 22:34:14 UTC (rev 173706)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "JSDestructibleObject.h"
</span><span class="cx"> #include "JSObject.h"
</span><span class="cx"> #include "JSString.h"
</span><ins>+#include "MarkedBlock.h"
</ins><span class="cx"> #include "Structure.h"
</span><span class="cx"> #include <wtf/CompilationThread.h>
</span><span class="cx">
</span><span class="lines">@@ -111,6 +112,17 @@
</span><span class="cx"> visitor.appendUnbarrieredPointer(&structure);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline VM* JSCell::vm() const
+{
+ return MarkedBlock::blockFor(this)->vm();
+}
+
+inline VM& ExecState::vm() const
+{
+ ASSERT(callee()->vm());
+ return *callee()->vm();
+}
+
</ins><span class="cx"> template<typename T>
</span><span class="cx"> void* allocateCell(Heap& heap, size_t size)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp (173705 => 173706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2014-09-17 22:06:03 UTC (rev 173705)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2014-09-17 22:34:14 UTC (rev 173706)
</span><span class="lines">@@ -199,9 +199,9 @@
</span><span class="cx"> m_globalThis.set(vm, this, globalThis);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSGlobalObject::init()
</del><ins>+void JSGlobalObject::init(VM& vm)
</ins><span class="cx"> {
</span><del>- ASSERT(vm().currentThreadIsHoldingAPILock());
</del><ins>+ ASSERT(vm.currentThreadIsHoldingAPILock());
</ins><span class="cx">
</span><span class="cx"> JSGlobalObject::globalExec()->init(0, 0, this, CallFrame::noCaller(), 0, 0);
</span><span class="cx">
</span><span class="lines">@@ -215,8 +215,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ExecState* exec = JSGlobalObject::globalExec();
</span><del>- VM& vm = exec->vm();
-
</del><ins>+
</ins><span class="cx"> m_functionPrototype.set(vm, this, FunctionPrototype::create(vm, FunctionPrototype::createStructure(vm, this, jsNull()))); // The real prototype will be set once ObjectPrototype is created.
</span><span class="cx"> m_calleeStructure.set(vm, this, JSCallee::createStructure(vm, this, jsNull()));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h (173705 => 173706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2014-09-17 22:06:03 UTC (rev 173705)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2014-09-17 22:34:14 UTC (rev 173706)
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx"> Base::finishCreation(vm);
</span><span class="cx"> structure()->setGlobalObject(vm, this);
</span><span class="cx"> m_experimentsEnabled = m_globalObjectMethodTable->javaScriptExperimentsEnabled(this);
</span><del>- init();
</del><ins>+ init(vm);
</ins><span class="cx"> setGlobalThis(vm, JSProxy::create(vm, JSProxy::createStructure(vm, this, prototype(), PureForwardingProxyType), this));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx"> Base::finishCreation(vm);
</span><span class="cx"> structure()->setGlobalObject(vm, this);
</span><span class="cx"> m_experimentsEnabled = m_globalObjectMethodTable->javaScriptExperimentsEnabled(this);
</span><del>- init();
</del><ins>+ init(vm);
</ins><span class="cx"> setGlobalThis(vm, thisValue);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -604,7 +604,7 @@
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE void setGlobalThis(VM&, JSObject* globalThis);
</span><span class="cx">
</span><del>- JS_EXPORT_PRIVATE void init();
</del><ins>+ JS_EXPORT_PRIVATE void init(VM&);
</ins><span class="cx">
</span><span class="cx"> void createThrowTypeError(VM&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSScope.h (173705 => 173706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSScope.h 2014-09-17 22:06:03 UTC (rev 173705)
+++ trunk/Source/JavaScriptCore/runtime/JSScope.h 2014-09-17 22:34:14 UTC (rev 173706)
</span><span class="lines">@@ -236,12 +236,6 @@
</span><span class="cx"> return jsCast<JSScope*>(jsValue());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline VM& ExecState::vm() const
-{
- ASSERT(scope()->vm());
- return *scope()->vm();
-}
-
</del><span class="cx"> inline JSGlobalObject* ExecState::lexicalGlobalObject() const
</span><span class="cx"> {
</span><span class="cx"> return scope()->globalObject();
</span></span></pre>
</div>
</div>
</body>
</html>