Title: [177149] trunk/Source/_javascript_Core
- Revision
- 177149
- Author
- [email protected]
- Date
- 2014-12-11 09:09:04 -0800 (Thu, 11 Dec 2014)
Log Message
Fix broken build after r177146.
https://bugs.webkit.org/show_bug.cgi?id=139533
Not reviewed.
* interpreter/CallFrame.h:
(JSC::ExecState::init):
- Restored CallFrame::init() minus the unused JSScope* arg.
* runtime/JSGlobalObject.cpp:
(JSC::JSGlobalObject::init):
- Remove JSScope* arg when calling CallFrame::init().
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (177148 => 177149)
--- trunk/Source/_javascript_Core/ChangeLog 2014-12-11 17:07:42 UTC (rev 177148)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-12-11 17:09:04 UTC (rev 177149)
@@ -1,3 +1,17 @@
+2014-12-11 Mark Lam <[email protected]>
+
+ Fix broken build after r177146.
+ https://bugs.webkit.org/show_bug.cgi?id=139533
+
+ Not reviewed.
+
+ * interpreter/CallFrame.h:
+ (JSC::ExecState::init):
+ - Restored CallFrame::init() minus the unused JSScope* arg.
+ * runtime/JSGlobalObject.cpp:
+ (JSC::JSGlobalObject::init):
+ - Remove JSScope* arg when calling CallFrame::init().
+
2014-12-11 Michael Saboff <[email protected]>
REGRESSION: Use of undefined CallFrame::ScopeChain value
Modified: trunk/Source/_javascript_Core/interpreter/CallFrame.h (177148 => 177149)
--- trunk/Source/_javascript_Core/interpreter/CallFrame.h 2014-12-11 17:07:42 UTC (rev 177148)
+++ trunk/Source/_javascript_Core/interpreter/CallFrame.h 2014-12-11 17:09:04 UTC (rev 177149)
@@ -188,6 +188,18 @@
void setScope(int scopeRegisterOffset, JSScope* scope) { static_cast<Register*>(this)[scopeRegisterOffset] = scope; }
void setActivation(JSLexicalEnvironment*);
+ ALWAYS_INLINE void init(CodeBlock* codeBlock, Instruction* vPC,
+ CallFrame* callerFrame, int argc, JSObject* callee)
+ {
+ ASSERT(callerFrame == noCaller() || callerFrame->stack()->containsAddress(this));
+
+ setCodeBlock(codeBlock);
+ setCallerFrame(callerFrame);
+ setReturnPC(vPC); // This is either an Instruction* or a pointer into JIT generated code stored as an Instruction*.
+ setArgumentCountIncludingThis(argc); // original argument count (for the sake of the "arguments" object)
+ setCallee(callee);
+ }
+
// Read a register from the codeframe (or constant from the CodeBlock).
Register& r(int);
// Read a register for a non-constant
Modified: trunk/Source/_javascript_Core/runtime/JSGlobalObject.cpp (177148 => 177149)
--- trunk/Source/_javascript_Core/runtime/JSGlobalObject.cpp 2014-12-11 17:07:42 UTC (rev 177148)
+++ trunk/Source/_javascript_Core/runtime/JSGlobalObject.cpp 2014-12-11 17:09:04 UTC (rev 177149)
@@ -204,7 +204,7 @@
{
ASSERT(vm.currentThreadIsHoldingAPILock());
- JSGlobalObject::globalExec()->init(0, 0, this, CallFrame::noCaller(), 0, 0);
+ JSGlobalObject::globalExec()->init(0, 0, CallFrame::noCaller(), 0, 0);
m_debugger = 0;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
