More 32bit build fixes
authoroliver@apple.com <oliver@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 25 Jul 2013 17:10:51 +0000 (17:10 +0000)
committeroliver@apple.com <oliver@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 25 Jul 2013 17:10:51 +0000 (17:10 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@153334 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/API/APICallbackFunction.h
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/bytecode/CodeBlock.cpp
Source/JavaScriptCore/runtime/Structure.cpp

index 2893c5d..909193d 100644 (file)
@@ -40,7 +40,7 @@ template <typename T> static EncodedJSValue JSC_HOST_CALL call(ExecState*);
 };
 
 template <typename T>
-EncodedJSValue APICallbackFunction::call(ExecState* exec)
+EncodedJSValue JSC_HOST_CALL APICallbackFunction::call(ExecState* exec)
 {
     JSContextRef execRef = toRef(exec);
     JSObjectRef functionRef = toRef(exec->callee());
index 1d4d3a1..6637715 100644 (file)
@@ -1,3 +1,14 @@
+2013-07-25  Oliver Hunt  <oliver@apple.com>
+
+        More 32bit build fixes
+
+        - Apparnetly some compilers don't track the fastcall directive everywhere we expect
+
+        * API/APICallbackFunction.h:
+        (JSC::APICallbackFunction::call):
+        * bytecode/CodeBlock.cpp:
+        * runtime/Structure.cpp:
+
 2013-07-25  Yi Shen  <max.hong.shen@gmail.com>
 
         Optimize the thread locks for API Shims
index 097f27b..c184c8b 100644 (file)
@@ -2873,7 +2873,7 @@ void CodeBlock::noticeIncomingCall(ExecState* callerFrame)
 #endif
 }
 
-#if ENABLE(DFG_JIT)
+#if ENABLE(JIT)
 unsigned CodeBlock::reoptimizationRetryCounter() const
 {
     ASSERT(m_reoptimizationRetryCounter <= Options::reoptimizationRetryCounterMax());
index 339384e..9a94ed5 100644 (file)
@@ -27,6 +27,7 @@
 #include "Structure.h"
 
 #include "CodeBlock.h"
+#include "DumpContext.h"
 #include "JSObject.h"
 #include "JSPropertyNameIterator.h"
 #include "Lookup.h"