Changeset 39161 in webkit for trunk/JavaScriptCore/interpreter

Timestamp:

Dec 9, 2008, 8:22:00 PM (16 years ago)

Author:

[email protected]

Message:

2008-12-09 Gavin Barraclough <​[email protected]>

Reviewed by Oliver Hunt.

Use va_args to access cti function arguments.
​https://bugs.webkit.org/show_bug.cgi?id=22774

This may be a minor regression, but we'll take the hit if so to reduce fragility.

• interpreter/Interpreter.cpp:
• interpreter/Interpreter.h:

Location:

trunk/JavaScriptCore/interpreter

Files:

• Interpreter.cpp (modified) (2 diffs)
• Interpreter.h (modified) (1 diff)

trunk/JavaScriptCore/interpreter/Interpreter.cpp

@@ -4262 +4262 @@
 };
 
-#define CTI_STACK_HACK() StackHack stackHack(&CTI_RETURN_ADDRESS_SLOT)
+#define CTI_STACK_HACK() va_list vl_args; va_start(vl_args, args); StackHack stackHack(&CTI_RETURN_ADDRESS_SLOT)
 #define CTI_SET_RETURN_ADDRESS(address) stackHack.savedReturnAddress = address
 #define CTI_RETURN_ADDRESS stackHack.savedReturnAddress
@@ -4268 +4268 @@
 #else
 
-#define CTI_STACK_HACK() (void)0
+#define CTI_STACK_HACK() va_list vl_args; va_start(vl_args, args)
 #define CTI_SET_RETURN_ADDRESS(address) ctiSetReturnAddress(&CTI_RETURN_ADDRESS_SLOT, address);
 #define CTI_RETURN_ADDRESS CTI_RETURN_ADDRESS_SLOT

trunk/JavaScriptCore/interpreter/Interpreter.h

@@ -60 +60 @@
 #else
 #define CTI_ARGS void* args, ...
-#define ARGS (&args)
+#define ARGS (reinterpret_cast<void**>(vl_args) - 1)
 #endif