Changeset 44884 in webkit for trunk/JavaScriptCore/jit/JIT.cpp

Timestamp:

Jun 19, 2009, 5:49:36 PM (16 years ago)

Author:

[email protected]

Message:

2009-06-19 Gavin Barraclough <​[email protected]>

Reviewed by Oliver Hunt.

Fix armv7 JIT build issues.

Unfortunate the arm compiler does not like the use of offsetof on JITStackFrame (since it now contains non POD types),
and the FIELD_OFFSET macro does not appear constantish enough for it to be happy with its use in COMPILE_ASSERT macros.

• Replace offsetofs with FIELD_OFFSETs (safe on C++ objects).
• Move COMPILE_ASSERTs defending layout of JITStackFrame structure on armv7 into JITThunks constructor.

• jit/JIT.cpp:
• jit/JIT.h:
• jit/JITInlineMethods.h: (JSC::JIT::restoreArgumentReference):
• jit/JITOpcodes.cpp: (JSC::JIT::emit_op_catch):
• jit/JITStubs.cpp: (JSC::JITThunks::JITThunks):

File:

• trunk/JavaScriptCore/jit/JIT.cpp (modified) (1 diff)

trunk/JavaScriptCore/jit/JIT.cpp

@@ -836 +836 @@
     move(ImmPtr(reinterpret_cast<void*>(ctiVMThrowTrampoline)), regT2);
     emitGetFromCallFrameHeaderPtr(RegisterFile::CallerFrame, callFrameRegister);
-    poke(callFrameRegister, offsetof(struct JITStackFrame, callFrame) / sizeof (void*));
+    poke(callFrameRegister, FIELD_OFFSET(struct JITStackFrame, callFrame) / sizeof (void*));
     restoreReturnAddressBeforeReturn(regT2);
     ret();