Changeset 47582 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Aug 20, 2009, 11:04:37 AM (16 years ago)

Author:

[email protected]

Message:

Roll out r47571 and related build fixes as it caused us to leak the world without warning.

Location:

trunk/JavaScriptCore/runtime

Files:

• Executable.h (modified) (6 diffs)
• JSFunction.h (modified) (2 diffs)

trunk/JavaScriptCore/runtime/Executable.h

@@ -27 +27 @@
 #define Executable_h
 
-#include "JSFunction.h"
 #include "Nodes.h"
 
@@ -100 +99 @@
         ~EvalExecutable();
 
-        JSObject* parse(ExecState*, bool allowDebug = true);
+        JSObject* parse(ExecState* exec, bool allowDebug = true);
 
         EvalCodeBlock& bytecode(ScopeChainNode* scopeChainNode)
@@ -153 +152 @@
         ~ProgramExecutable();
 
-        JSObject* parse(ExecState*, bool allowDebug = true);
+        JSObject* parse(ExecState* exec, bool allowDebug = true);
 
         // CodeBlocks for program code are transient and therefore to not gain from from throwing out there exception information.
@@ -201 +200 @@
         const Identifier& name() { return m_name; }
 
-        JSFunction* make(ExecState* exec, ScopeChainNode* scopeChainNode)
-        {
-            return new (exec) JSFunction(exec, this, scopeChainNode);
-        }
+        JSFunction* make(ExecState* exec, ScopeChainNode* scopeChain);
 
         CodeBlock& bytecode(ScopeChainNode* scopeChainNode) 
@@ -230 +226 @@
         }
 
-        void recompile(ExecState*);
+        void recompile(ExecState* exec);
 
         ExceptionInfo* reparseExceptionInfo(JSGlobalData*, ScopeChainNode*, CodeBlock*);
@@ -259 +255 @@
 
     private:
-        FunctionExecutable(ExecState*);
+        FunctionExecutable(ExecState* exec);
         void generateJITCode(ScopeChainNode*);
 #endif

trunk/JavaScriptCore/runtime/JSFunction.h

@@ -25 +25 @@
 #define JSFunction_h
 
+#include "Executable.h"
 #include "InternalFunction.h"
 
 namespace JSC {
 
-    class FunctionExecutable;
     class FunctionPrototype;
     class JSActivation;
@@ -122 +122 @@
     }
 
+    inline JSFunction* FunctionExecutable::make(ExecState* exec, ScopeChainNode* scopeChain)
+    {
+        return new (exec) JSFunction(exec, this, scopeChain);
+    }
+
 } // namespace JSC