Title: [108326] trunk/Source/_javascript_Core
- Revision
- 108326
- Author
- [email protected]
- Date
- 2012-02-21 01:49:22 -0800 (Tue, 21 Feb 2012)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (108325 => 108326)
--- trunk/Source/_javascript_Core/ChangeLog 2012-02-21 09:20:04 UTC (rev 108325)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-02-21 09:49:22 UTC (rev 108326)
@@ -1,5 +1,17 @@
2012-02-21 Filip Pizlo <[email protected]>
+ 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 <[email protected]>
+
Attempted build fix for ELF platforms.
* dfg/DFGOperations.cpp:
Modified: trunk/Source/_javascript_Core/dfg/DFGOperations.cpp (108325 => 108326)
--- trunk/Source/_javascript_Core/dfg/DFGOperations.cpp 2012-02-21 09:20:04 UTC (rev 108325)
+++ trunk/Source/_javascript_Core/dfg/DFGOperations.cpp 2012-02-21 09:49:22 UTC (rev 108326)
@@ -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 @@
#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 @@
return JSValue::encode(exec->globalData().hostCallReturnValue);
}
+} // namespace JSC
+
#endif // COMPILER(GCC)
-} // namespace JSC
-
-#endif
Modified: trunk/Source/_javascript_Core/jit/HostCallReturnValue.h (108325 => 108326)
--- trunk/Source/_javascript_Core/jit/HostCallReturnValue.h 2012-02-21 09:20:04 UTC (rev 108325)
+++ trunk/Source/_javascript_Core/jit/HostCallReturnValue.h 2012-02-21 09:49:22 UTC (rev 108326)
@@ -50,7 +50,6 @@
inline void initializeHostCallReturnValue()
{
- getHostCallReturnValue();
getHostCallReturnValueWithExecState(0);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
