Attachment #159595 for bug #94564

View Details Raw Unified Return to Bug 94564



2012-08-20  Mark Lam  <mark.lam@apple.com>

        Fix broken non-JIT build.
        https://bugs.webkit.org/show_bug.cgi?id=94564.

        Reviewed by NOBODY (OOPS!).

        Added some UNUSED_PARAM() macros to make the compiler happy.

        * runtime/Executable.cpp:
        (JSC::EvalExecutable::compileInternal):
        (JSC::ProgramExecutable::compileInternal):
        (JSC::FunctionExecutable::compileForCallInternal):
        (JSC::FunctionExecutable::compileForConstructInternal):

2012-08-20  Mark Lam  <mark.lam@apple.com>

        Fixed erroneous line number for LLint frame when throwing exceptions.



    
#if !ENABLE(JIT)
    UNUSED_PARAM(jitType);
    UNUSED_PARAM(bytecodeIndex);
#endif
    JSObject* exception = 0;
    JSGlobalData* globalData = &exec->globalData();

    
#if !ENABLE(JIT)
    UNUSED_PARAM(jitType);
    UNUSED_PARAM(bytecodeIndex);
#endif
    JSObject* exception = 0;
    JSGlobalData* globalData = &exec->globalData();

    UNUSED_PARAM(exec);
    UNUSED_PARAM(jitType);
    UNUSED_PARAM(exec);
    UNUSED_PARAM(bytecodeIndex);
#endif
    ASSERT((jitType == JITCode::bottomTierJIT()) == !m_codeBlockForCall);
    JSObject* exception;

#if !ENABLE(JIT)
    UNUSED_PARAM(jitType);
    UNUSED_PARAM(exec);
    UNUSED_PARAM(bytecodeIndex);
#endif
    
    ASSERT((jitType == JITCode::bottomTierJIT()) == !m_codeBlockForConstruct);

Return to Bug 94564

Lines 199-204 JSObject* EvalExecutable::compileInterna Source/JavaScriptCore/runtime/Executable.cpp_sec1
- Source/JavaScriptCore/runtime/Executable.cpp +4 lines
199		199
200	#if !ENABLE(JIT)	200	#if !ENABLE(JIT)
201	UNUSED_PARAM(jitType);	201	UNUSED_PARAM(jitType);
		202	UNUSED_PARAM(bytecodeIndex);
202	#endif	203	#endif
203	JSObject* exception = 0;	204	JSObject* exception = 0;
204	JSGlobalData* globalData = &exec->globalData();	205	JSGlobalData* globalData = &exec->globalData();
Lines 325-330 JSObject* ProgramExecutable::compileInte Source/JavaScriptCore/runtime/Executable.cpp_sec2
325		326
326	#if !ENABLE(JIT)	327	#if !ENABLE(JIT)
327	UNUSED_PARAM(jitType);	328	UNUSED_PARAM(jitType);
		329	UNUSED_PARAM(bytecodeIndex);
328	#endif	330	#endif
329	JSObject* exception = 0;	331	JSObject* exception = 0;
330	JSGlobalData* globalData = &exec->globalData();	332	JSGlobalData* globalData = &exec->globalData();
Lines 510-515 JSObject* FunctionExecutable::compileFor Source/JavaScriptCore/runtime/Executable.cpp_sec3
510	UNUSED_PARAM(exec);	512	UNUSED_PARAM(exec);
511	UNUSED_PARAM(jitType);	513	UNUSED_PARAM(jitType);
512	UNUSED_PARAM(exec);	514	UNUSED_PARAM(exec);
		515	UNUSED_PARAM(bytecodeIndex);
513	#endif	516	#endif
514	ASSERT((jitType == JITCode::bottomTierJIT()) == !m_codeBlockForCall);	517	ASSERT((jitType == JITCode::bottomTierJIT()) == !m_codeBlockForCall);
515	JSObject* exception;	518	JSObject* exception;
Lines 551-556 JSObject* FunctionExecutable::compileFor Source/JavaScriptCore/runtime/Executable.cpp_sec4
551	#if !ENABLE(JIT)	554	#if !ENABLE(JIT)
552	UNUSED_PARAM(jitType);	555	UNUSED_PARAM(jitType);
553	UNUSED_PARAM(exec);	556	UNUSED_PARAM(exec);
		557	UNUSED_PARAM(bytecodeIndex);
554	#endif	558	#endif
555		559
556	ASSERT((jitType == JITCode::bottomTierJIT()) == !m_codeBlockForConstruct);	560	ASSERT((jitType == JITCode::bottomTierJIT()) == !m_codeBlockForConstruct);

Lines 1-3 Source/JavaScriptCore/ChangeLog_sec1
- Source/JavaScriptCore/ChangeLog +15 lines
		1	2012-08-20 Mark Lam <mark.lam@apple.com>
		2
		3	Fix broken non-JIT build.
		4	https://bugs.webkit.org/show_bug.cgi?id=94564.
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Added some UNUSED_PARAM() macros to make the compiler happy.
		9
		10	* runtime/Executable.cpp:
		11	(JSC::EvalExecutable::compileInternal):
		12	(JSC::ProgramExecutable::compileInternal):
		13	(JSC::FunctionExecutable::compileForCallInternal):
		14	(JSC::FunctionExecutable::compileForConstructInternal):
		15
1	2012-08-20 Mark Lam <mark.lam@apple.com>	16	2012-08-20 Mark Lam <mark.lam@apple.com>
2		17
3	Fixed erroneous line number for LLint frame when throwing exceptions.	18	Fixed erroneous line number for LLint frame when throwing exceptions.