From 545e470e52f0ac6a3a072bf559c796b42c6066b6 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 15 Jun 2010 19:36:43 +0100 Subject: Merge webkit.org at r61121: Initial merge by git. Change-Id: Icd6db395c62285be384d137164d95d7466c98760 --- JavaScriptCore/jit/JITOpcodes32_64.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'JavaScriptCore/jit/JITOpcodes32_64.cpp') diff --git a/JavaScriptCore/jit/JITOpcodes32_64.cpp b/JavaScriptCore/jit/JITOpcodes32_64.cpp index a730b67..239751f 100644 --- a/JavaScriptCore/jit/JITOpcodes32_64.cpp +++ b/JavaScriptCore/jit/JITOpcodes32_64.cpp @@ -208,6 +208,7 @@ JIT::Label JIT::privateCompileCTINativeCall(JSGlobalData* globalData, bool isCon #elif ENABLE(JIT_OPTIMIZE_NATIVE_CALL) #error "JIT_OPTIMIZE_NATIVE_CALL not yet supported on this platform." #else + UNUSED_PARAM(executableOffsetToFunction); breakpoint(); #endif // CPU(X86) @@ -231,6 +232,7 @@ JIT::Label JIT::privateCompileCTINativeCall(JSGlobalData* globalData, bool isCon JIT::CodePtr JIT::privateCompileCTINativeCall(PassRefPtr executablePool, JSGlobalData* globalData, NativeFunction func) { + Call nativeCall; Label nativeCallThunk = align(); #if CPU(X86) @@ -252,7 +254,7 @@ JIT::CodePtr JIT::privateCompileCTINativeCall(PassRefPtr executa move(regT0, callFrameRegister); // Eagerly restore caller frame register to avoid loading from stack. // call the function - Call nativeCall = call(); + nativeCall = call(); addPtr(Imm32(16 - sizeof(void*)), stackPointerRegister); -- cgit v1.1