Fix massive crashes in all tests introduced by previous build fix, and fix non-DFG...

https://bugs.webkit.org/show_bug.cgi?id=75812

Reviewed by Csaba Osztrogonác.

* dfg/DFGOperations.cpp:
(JSC):
* jit/HostCallReturnValue.h:
(JSC::initializeHostCallReturnValue):

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

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 102e62c..7bd1912 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,5 +1,17 @@
 2012-02-21  Filip Pizlo  <fpizlo@apple.com>
 
+        Fix massive crashes in all tests introduced by previous build fix, and fix non-DFG build.
+        https://bugs.webkit.org/show_bug.cgi?id=75812
+
+        Reviewed by Csaba Osztrogonác.
+
+        * dfg/DFGOperations.cpp:
+        (JSC):
+        * jit/HostCallReturnValue.h:
+        (JSC::initializeHostCallReturnValue):
+
+2012-02-21  Filip Pizlo  <fpizlo@apple.com>
+
         Attempted build fix for ELF platforms.
 
         * dfg/DFGOperations.cpp:

diff --git a/Source/JavaScriptCore/dfg/DFGOperations.cpp b/Source/JavaScriptCore/dfg/DFGOperations.cpp
index 5009652..165a214 100644 (file)
--- a/Source/JavaScriptCore/dfg/DFGOperations.cpp
+++ b/Source/JavaScriptCore/dfg/DFGOperations.cpp
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "DFGOperations.h"
 
-#if ENABLE(DFG_JIT)
-
 #include "CodeBlock.h"
 #include "DFGOSRExit.h"
 #include "DFGRepatch.h"
@@ -39,6 +37,8 @@
 #include "JSGlobalData.h"
 #include "Operations.h"
 
+#if ENABLE(DFG_JIT)
+
 #if CPU(X86_64)
 
 #define FUNCTION_WRAPPER_WITH_RETURN_ADDRESS(function, register) \
@@ -1048,10 +1048,14 @@ void DFG_OPERATION debugOperationPrintSpeculationFailure(ExecState* exec, void*
 #endif
 
 } // extern "C"
-} // namespace DFG
+} } // namespace JSC::DFG
+
+#endif
 
 #if COMPILER(GCC)
 
+namespace JSC {
+
 #if CPU(X86_64)
 asm (
 ".globl " SYMBOL_STRING(getHostCallReturnValue) "\n"
@@ -1092,8 +1096,7 @@ extern "C" EncodedJSValue HOST_CALL_RETURN_VALUE_OPTION getHostCallReturnValueWi
     return JSValue::encode(exec->globalData().hostCallReturnValue);
 }
 
-#endif // COMPILER(GCC)
-
 } // namespace JSC
 
-#endif
+#endif // COMPILER(GCC)
+

diff --git a/Source/JavaScriptCore/jit/HostCallReturnValue.h b/Source/JavaScriptCore/jit/HostCallReturnValue.h
index 0fc5359..12fe10b 100644 (file)
--- a/Source/JavaScriptCore/jit/HostCallReturnValue.h
+++ b/Source/JavaScriptCore/jit/HostCallReturnValue.h
@@ -50,7 +50,6 @@ extern "C" EncodedJSValue HOST_CALL_RETURN_VALUE_OPTION getHostCallReturnValueWi
 
 inline void initializeHostCallReturnValue()
 {
-    getHostCallReturnValue();
     getHostCallReturnValueWithExecState(0);
 }