Changeset 60170 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

May 25, 2010, 9:51:59 AM (15 years ago)

Author:

[email protected]

Message:

2010-05-25 Kwang Yul Seo <​[email protected]>

Reviewed by Darin Adler.

Build fix for JSFunction
​https://bugs.webkit.org/show_bug.cgi?id=39658

MSVC can't compile one of JSFunction constructors when JIT is disabled.
"PassRefPtr<NativeExecutable>" causes the compile error as NativeExecutable is not defined.
Add ENABLE(JIT) guard to the constructor.

• runtime/JSFunction.cpp: (JSC::JSFunction::JSFunction):
• runtime/JSFunction.h:

Location:

trunk/JavaScriptCore/runtime

Files:

• JSFunction.cpp (modified) (1 diff)
• JSFunction.h (modified) (1 diff)

trunk/JavaScriptCore/runtime/JSFunction.cpp

@@ -67 +67 @@
 }
 
+#if ENABLE(JIT)
 JSFunction::JSFunction(ExecState* exec, JSGlobalObject* globalObject, NonNullPassRefPtr<Structure> structure, int length, const Identifier& name, PassRefPtr<NativeExecutable> thunk)
     : Base(globalObject, structure)
-#if ENABLE(JIT)
     , m_executable(thunk)
-#endif
     , m_scopeChain(globalObject->globalScopeChain())
 {
     putDirect(exec->globalData().propertyNames->name, jsString(exec, name.isNull() ? "" : name.ustring()), DontDelete | ReadOnly | DontEnum);
-#if ENABLE(JIT)
     putDirect(exec->propertyNames().length, jsNumber(exec, length), DontDelete | ReadOnly | DontEnum);
-#else
-    UNUSED_PARAM(thunk);
-    UNUSED_PARAM(length);
-    ASSERT_NOT_REACHED();
-#endif
-}
+}
+#endif
 
 JSFunction::JSFunction(ExecState* exec, JSGlobalObject* globalObject, NonNullPassRefPtr<Structure> structure, int length, const Identifier& name, NativeFunction func)

trunk/JavaScriptCore/runtime/JSFunction.h

@@ -46 +46 @@
     public:
         JSFunction(ExecState*, JSGlobalObject*, NonNullPassRefPtr<Structure>, int length, const Identifier&, NativeFunction);
+#if ENABLE(JIT)
         JSFunction(ExecState*, JSGlobalObject*, NonNullPassRefPtr<Structure>, int length, const Identifier&, PassRefPtr<NativeExecutable>);
+#endif
         JSFunction(ExecState*, NonNullPassRefPtr<FunctionExecutable>, ScopeChainNode*);
         virtual ~JSFunction();