Changeset 177149 in webkit

Timestamp:

Dec 11, 2014, 9:09:04 AM (10 years ago)

Author:

mark.lam@apple.com

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().

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• interpreter/CallFrame.h (modified) (1 diff)
• runtime/JSGlobalObject.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-12-11  Mark Lam  <mark.lam@apple.com>
+
+        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  <msaboff@apple.com>
 

trunk/Source/JavaScriptCore/interpreter/CallFrame.h

@@ -189 +189 @@
         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);

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -205 +205 @@
     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;