Changeset 48854 in webkit for trunk/JavaScriptCore/runtime/Collector.cpp

Timestamp:

Sep 28, 2009, 9:51:11 PM (16 years ago)

Author:

[email protected]

Message:

<rdar://problem/7195704> JavaScriptCore fails to mark registers when built for x86_64 using LLVM GCC.

Reviewed by Gavin Barraclough.

• runtime/Collector.cpp:

(JSC::Heap::markCurrentThreadConservatively): Force jmp_buf to use the appropriate alignment for a pointer
to ensure that we correctly interpret the contents of registers during marking.

File:

• trunk/JavaScriptCore/runtime/Collector.cpp (modified) (1 diff)

trunk/JavaScriptCore/runtime/Collector.cpp

@@ -783 +783 @@
 }
 
+#if COMPILER(GCC)
+#define REGISTER_BUFFER_ALIGNMENT __attribute__ ((aligned (sizeof(void*))))
+#else
+#define REGISTER_BUFFER_ALIGNMENT
+#endif
+
 void Heap::markCurrentThreadConservatively(MarkStack& markStack)
 {
     // setjmp forces volatile registers onto the stack
-    jmp_buf registers;
+    jmp_buf registers REGISTER_BUFFER_ALIGNMENT;
 #if COMPILER(MSVC)
 #pragma warning(push)