Changeset 41886 in webkit

Timestamp:

Mar 20, 2009 6:18:16 PM (15 years ago)

Author:

jmalonzo@webkit.org

Message:

2009-03-20 Mike Hommey <​glandium@debian.org>

Reviewed by Mark Rowe. Committed by Jan Alonzo.

Use the proper definition of RETURN_PAIR on !MSVC

The other version is actually a work around for a quirk in the windows
ABI, so checking whether we're under MSVC is more a appropriate check for
it. It also happens this workaround is not 64-bits safe, so we also error
out on x86-64 MSVC.

Thanks Gavin Barraclough.

• jit/JITStubs.h:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/JITStubs.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-03-20  Mike Hommey  <glandium@debian.org>
+
+        Reviewed by Mark Rowe. Committed by Jan Alonzo.
+
+        Use the proper definition of RETURN_PAIR on !MSVC
+
+        The other version is actually a work around for a quirk in the windows
+        ABI, so checking whether we're under MSVC is more a appropriate check for
+        it. It also happens this workaround is not 64-bits safe, so we also error
+        out on x86-64 MSVC.
+
+        Thanks Gavin Barraclough.
+
+        * jit/JITStubs.h:
+
 2009-03-20  Norbert Leser  <norbert.leser@nokia.com>
 

trunk/JavaScriptCore/jit/JITStubs.h

@@ -75 +75 @@
 
 // The Mac compilers are fine with this, 
-#if PLATFORM(MAC)
+#if !COMPILER(MSVC)
     struct VoidPtrPair {
         void* first;
@@ -82 +82 @@
 #define RETURN_PAIR(a,b) VoidPtrPair pair = { a, b }; return pair
 #else
+    #if PLATFORM(X86_64)
+    #error MSVC version of RETURN_PAIR is not 64-bits safe
+    #endif
     typedef uint64_t VoidPtrPair;
     union VoidPtrPairValue {