Changeset 37253 in webkit for trunk/JavaScriptCore

Timestamp:

Oct 3, 2008, 1:56:50 PM (17 years ago)

Author:

[email protected]

Message:

2008-10-03 Cameron Zwarich <​[email protected]>

Reviewed by Geoff Garen.

Bug 21343: REGRESSSION (r37160): ecma_3/ExecutionContexts/10.1.3-1.js and js1_4/Functions/function-001.js fail on 64-bit
<​https://bugs.webkit.org/show_bug.cgi?id=21343>

Add a workaround for a bug in GCC, which affects GCC 4.0, GCC 4.2, and
llvm-gcc 4.2. I put it in an #ifdef because it was a slight regression
on SunSpider in 32-bit, although that might be entirely random.

• kjs/Arguments.cpp: (JSC::Arguments::getOwnPropertySlot):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/Arguments.cpp (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-10-03  Cameron Zwarich  <[email protected]>
+
+        Reviewed by Geoff Garen.
+
+        Bug 21343: REGRESSSION (r37160): ecma_3/ExecutionContexts/10.1.3-1.js and js1_4/Functions/function-001.js fail on 64-bit
+        <https://bugs.webkit.org/show_bug.cgi?id=21343>
+
+        Add a workaround for a bug in GCC, which affects GCC 4.0, GCC 4.2, and
+        llvm-gcc 4.2. I put it in an #ifdef because it was a slight regression
+        on SunSpider in 32-bit, although that might be entirely random.
+
+        * kjs/Arguments.cpp:
+        (JSC::Arguments::getOwnPropertySlot):
+
 2008-10-03  Darin Adler  <[email protected]>
 

trunk/JavaScriptCore/kjs/Arguments.cpp

@@ -111 +111 @@
 {
     if (i < d->numArguments && (!d->deletedArguments || !d->deletedArguments[i])) {
-        if (i < d->numParameters)
+        if (i < d->numParameters) {
+#if COMPILER(GCC) && PLATFORM(X86_64)
+            // The subscript variable is a workaround for a 64-bit code
+            // generation bug in GCC.
+            int subscript = d->firstParameterIndex + i;
+            slot.setRegisterSlot(&d->registers[subscript]);
+#else
             slot.setRegisterSlot(&d->registers[d->firstParameterIndex + i]);
-        else
+#endif
+        } else
             slot.setValue(d->extraArguments[i - d->numParameters].jsValue(exec));
         return true;
@@ -126 +133 @@
     unsigned i = propertyName.toArrayIndex(&isArrayIndex);
     if (isArrayIndex && i < d->numArguments && (!d->deletedArguments || !d->deletedArguments[i])) {
-        if (i < d->numParameters)
+        if (i < d->numParameters) {
+#if COMPILER(GCC) && PLATFORM(X86_64)
+            // The subscript variable is a workaround for a 64-bit code
+            // generation bug in GCC.
+            int subscript = d->firstParameterIndex + i;
+            slot.setRegisterSlot(&d->registers[subscript]);
+#else
             slot.setRegisterSlot(&d->registers[d->firstParameterIndex + i]);
-        else
+#endif
+        } else
             slot.setValue(d->extraArguments[i - d->numParameters].jsValue(exec));
         return true;