JSVALUE32_64 DFG JIT failed to be built on 32-bit Linux due to incorrect overloaded...

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

Patch by Yuqiang Xian <yuqiang.xian@intel.com> on 2011-09-29
Reviewed by Gavin Barraclough.

size_t is equal to uint32_t on most 32-bit platforms, except for Mac OS.

* dfg/DFGNode.h:

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

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 645598c..ea86aaf 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2011-09-29  Yuqiang Xian  <yuqiang.xian@intel.com>
+
+        JSVALUE32_64 DFG JIT failed to be built on 32-bit Linux due to incorrect overloaded OpInfo constructor
+        https://bugs.webkit.org/show_bug.cgi?id=69054
+
+        Reviewed by Gavin Barraclough.
+
+        size_t is equal to uint32_t on most 32-bit platforms, except for Mac OS.
+
+        * dfg/DFGNode.h:
+
 2011-09-28  Filip Pizlo  <fpizlo@apple.com>
 
         DFG checkArgumentTypes fails to check boolean predictions

diff --git a/Source/JavaScriptCore/dfg/DFGNode.h b/Source/JavaScriptCore/dfg/DFGNode.h
index 7140896..ac2628c 100644 (file)
--- a/Source/JavaScriptCore/dfg/DFGNode.h
+++ b/Source/JavaScriptCore/dfg/DFGNode.h
@@ -342,7 +342,9 @@ enum NodeType {
 struct OpInfo {
     explicit OpInfo(int32_t value) : m_value(static_cast<uintptr_t>(value)) { }
     explicit OpInfo(uint32_t value) : m_value(static_cast<uintptr_t>(value)) { }
+#if OS(DARWIN) || USE(JSVALUE64)
     explicit OpInfo(size_t value) : m_value(static_cast<uintptr_t>(value)) { }
+#endif
     explicit OpInfo(void* value) : m_value(reinterpret_cast<uintptr_t>(value)) { }
     uintptr_t m_value;
 };