Fixed build failure caused by merge.
authorggaren@apple.com <ggaren@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 25 May 2010 23:44:42 +0000 (23:44 +0000)
committerggaren@apple.com <ggaren@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 25 May 2010 23:44:42 +0000 (23:44 +0000)
* jit/JITStubs.cpp:
(JSC::DEFINE_STUB_FUNCTION): On error, return a single value, since this
function no longer returns a pair.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@60195 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/ChangeLog
JavaScriptCore/jit/JITStubs.cpp

index ba584fd..9aa3180 100644 (file)
@@ -1,5 +1,13 @@
 2010-05-25  Geoffrey Garen  <ggaren@apple.com>
 
+        Fixed build failure caused by merge.
+
+        * jit/JITStubs.cpp:
+        (JSC::DEFINE_STUB_FUNCTION): On error, return a single value, since this
+        function no longer returns a pair.
+
+2010-05-25  Geoffrey Garen  <ggaren@apple.com>
+
         Reviewed by Oliver Hunt.
 
         <rdar://problem/8020221>
index 4dfb29d..9862e76 100644 (file)
@@ -1859,7 +1859,7 @@ DEFINE_STUB_FUNCTION(void*, op_call_arityCheck)
             // moved the call frame forward.
             stackFrame.callFrame = oldCallFrame;
             throwStackOverflowError(oldCallFrame, stackFrame.globalData, stackFrame.args[1].returnAddress(), STUB_RETURN_ADDRESS);
-            RETURN_POINTER_PAIR(0, 0);
+            return 0;
         }
 
         Register* argv = r - RegisterFile::CallFrameHeaderSize - numParameters - argCount;
@@ -1916,7 +1916,7 @@ DEFINE_STUB_FUNCTION(void*, op_construct_arityCheck)
             // moved the call frame forward.
             stackFrame.callFrame = oldCallFrame;
             throwStackOverflowError(oldCallFrame, stackFrame.globalData, stackFrame.args[1].returnAddress(), STUB_RETURN_ADDRESS);
-            RETURN_POINTER_PAIR(0, 0);
+            return 0;
         }
 
         Register* argv = r - RegisterFile::CallFrameHeaderSize - numParameters - argCount;