Changeset 37995 in webkit for trunk/JavaScriptCore/VM

Timestamp:

Oct 30, 2008, 2:35:24 AM (17 years ago)

Author:

[email protected]

Message:

2008-10-30 Alp Toker <​[email protected]>

Reviewed by Alexey Proskuryakov.

​https://bugs.webkit.org/show_bug.cgi?id=21571
VoidPtrPair breaks CTI on Linux

The VoidPtrPair return change made in r37457 does not work on Linux
since POD structs aren't passed in registers.

This patch uses a union to vectorize VoidPtrPair to a uint64_t and
matches Darwin/MSVC fixing CTI/WREC on Linux.

Alexey reports no measurable change in Mac performance with this fix.

• VM/Machine.cpp: (JSC::Machine::cti_op_call_JSFunction): (JSC::Machine::cti_op_construct_JSConstruct): (JSC::Machine::cti_op_resolve_func): (JSC::Machine::cti_op_post_inc): (JSC::Machine::cti_op_resolve_with_base): (JSC::Machine::cti_op_post_dec):
• VM/Machine.h: (JSC::):

Location:

trunk/JavaScriptCore/VM

Files:

• Machine.cpp (modified) (11 diffs)
• Machine.h (modified) (1 diff)

trunk/JavaScriptCore/VM/Machine.cpp

@@ -4350 +4350 @@
     do { \
         VM_THROW_EXCEPTION_AT_END(); \
-        VoidPtrPair pair = { 0, 0 }; \
-        return pair; \
+        VoidPtrPairValue pair = {{ 0, 0 }}; \
+        return pair.i; \
     } while (0)
 #define VM_THROW_EXCEPTION_AT_END() \
@@ -4725 +4725 @@
 
     if (LIKELY(argCount == newCodeBlock->numParameters)) {
-        VoidPtrPair pair = { newCodeBlock, CallFrame::create(callFrame->registers() + registerOffset) };
-        return pair;
+        VoidPtrPairValue pair = {{ newCodeBlock, CallFrame::create(callFrame->registers() + registerOffset) }};
+        return pair.i;
     }
 
@@ -4737 +4737 @@
             argv[i + argCount] = argv[i];
 
-        VoidPtrPair pair = { newCodeBlock, CallFrame::create(r) };
-        return pair;
+        VoidPtrPairValue pair = {{ newCodeBlock, CallFrame::create(r) }};
+        return pair.i;
     }
 
@@ -4753 +4753 @@
         argv[i] = jsUndefined();
 
-    VoidPtrPair pair = { newCodeBlock, CallFrame::create(r) };
-    return pair;
+    VoidPtrPairValue pair = {{ newCodeBlock, CallFrame::create(r) }};
+    return pair.i;
 }
 
@@ -4975 +4975 @@
 
     if (LIKELY(argCount == newCodeBlock->numParameters)) {
-        VoidPtrPair pair = { newCodeBlock, CallFrame::create(callFrame->registers() + registerOffset) };
-        return pair;
+        VoidPtrPairValue pair = {{ newCodeBlock, CallFrame::create(callFrame->registers() + registerOffset) }};
+        return pair.i;
     }
 
@@ -4987 +4987 @@
             argv[i + argCount] = argv[i];
 
-        VoidPtrPair pair = { newCodeBlock, CallFrame::create(r) };
-        return pair;
+        VoidPtrPairValue pair = {{ newCodeBlock, CallFrame::create(r) }};
+        return pair.i;
     }
 
@@ -5003 +5003 @@
         argv[i] = jsUndefined();
 
-    VoidPtrPair pair = { newCodeBlock, CallFrame::create(r) };
-    return pair;
+    VoidPtrPairValue pair = {{ newCodeBlock, CallFrame::create(r) }};
+    return pair.i;
 }
 
@@ -5104 +5104 @@
             VM_CHECK_EXCEPTION_AT_END();
 
-            VoidPtrPair pair = { thisObj, asPointer(result) };
-            return pair;
+            VoidPtrPairValue pair = {{ thisObj, asPointer(result) }};
+            return pair.i;
         }
         ++iter;
@@ -5385 +5385 @@
     VM_CHECK_EXCEPTION_AT_END();
 
-    VoidPtrPair pair = { asPointer(number), asPointer(jsNumber(ARG_globalData, number->uncheckedGetNumber() + 1)) };
-    return pair;
+    VoidPtrPairValue pair = {{ asPointer(number), asPointer(jsNumber(ARG_globalData, number->uncheckedGetNumber() + 1)) }};
+    return pair.i;
 }
 
@@ -5501 +5501 @@
             VM_CHECK_EXCEPTION_AT_END();
 
-            VoidPtrPair pair = { base, asPointer(result) };
-            return pair;
+            VoidPtrPairValue pair = {{ base, asPointer(result) }};
+            return pair.i;
         }
         ++iter;
@@ -5571 +5571 @@
     VM_CHECK_EXCEPTION_AT_END();
 
-    VoidPtrPair pair = { asPointer(number), asPointer(jsNumber(ARG_globalData, number->uncheckedGetNumber() - 1)) };
-    return pair;
+    VoidPtrPairValue pair = {{ asPointer(number), asPointer(jsNumber(ARG_globalData, number->uncheckedGetNumber() - 1)) }};
+    return pair.i;
 }
 

trunk/JavaScriptCore/VM/Machine.h

@@ -82 +82 @@
 #endif
 
-    struct VoidPtrPair { void* first; void* second; };
+    typedef uint64_t VoidPtrPair;
+
+    typedef union
+    {
+        struct { void* first; void* second; };
+        VoidPtrPair i;
+    } VoidPtrPairValue;
 #endif