Changeset 56842 in webkit

Timestamp:

Mar 31, 2010 8:59:00 AM (14 years ago)

Author:

Laszlo Gombos

Message:

2010-03-31 Laszlo Gombos <Laszlo Gombos>

Unreviewed, Symbian build fix.

Refactor JITStubs.cpp so that the list of STUB_FUNCTIONs
are not dependent on the JSVALUE32_64 guard.

• jit/JITStubs.cpp: Place the JSVALUE32_64 guard inside the body of cti_op_eq_strings.
• jit/JITStubs.h: Remove JSVALUE32_64 guard from cti_op_eq_strings stub.

Location:

trunk/JavaScriptCore

Files:

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

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-03-31  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+
+        Unreviewed, Symbian build fix.
+
+        Refactor JITStubs.cpp so that the list of STUB_FUNCTIONs
+        are not dependent on the JSVALUE32_64 guard.
+
+        * jit/JITStubs.cpp: Place the JSVALUE32_64 guard inside 
+        the body of cti_op_eq_strings.
+        * jit/JITStubs.h: Remove JSVALUE32_64 guard from 
+        cti_op_eq_strings stub.
+
 2010-03-30  Gavin Barraclough  <barraclough@apple.com>
 

trunk/JavaScriptCore/jit/JITStubs.cpp

@@ -2659 +2659 @@
 }
 
+DEFINE_STUB_FUNCTION(int, op_eq_strings)
+{
 #if USE(JSVALUE32_64)
-
-DEFINE_STUB_FUNCTION(int, op_eq_strings)
-{
     STUB_INIT_STACK_FRAME(stackFrame);
 
@@ -2671 +2670 @@
     ASSERT(string2->isString());
     return string1->value(stackFrame.callFrame) == string2->value(stackFrame.callFrame);
-}
-
+#else
+    ASSERT_NOT_REACHED();
+    return 0;
 #endif
+}
 
 DEFINE_STUB_FUNCTION(EncodedJSValue, op_lshift)

trunk/JavaScriptCore/jit/JITStubs.h

@@ -359 +359 @@
     VoidPtrPair JIT_STUB cti_op_call_arityCheck(STUB_ARGS_DECLARATION);
     int JIT_STUB cti_op_eq(STUB_ARGS_DECLARATION);
-#if USE(JSVALUE32_64)
     int JIT_STUB cti_op_eq_strings(STUB_ARGS_DECLARATION);
-#endif
     int JIT_STUB cti_op_jless(STUB_ARGS_DECLARATION);
     int JIT_STUB cti_op_jlesseq(STUB_ARGS_DECLARATION);