Title: [160442] branches/safari-537.74-branch/Source/_javascript_Core
- Revision
- 160442
- Author
- [email protected]
- Date
- 2013-12-11 10:01:32 -0800 (Wed, 11 Dec 2013)
Log Message
Merge 156934: <rdar://problem/15498872>.
Modified Paths
Diff
Modified: branches/safari-537.74-branch/Source/_javascript_Core/ChangeLog (160441 => 160442)
--- branches/safari-537.74-branch/Source/_javascript_Core/ChangeLog 2013-12-11 17:53:46 UTC (rev 160441)
+++ branches/safari-537.74-branch/Source/_javascript_Core/ChangeLog 2013-12-11 18:01:32 UTC (rev 160442)
@@ -1,3 +1,15 @@
+2013-12-11 Matthew Hanson <[email protected]>
+
+ Merge 156934.
+
+ 2013-10-04 Brent Fulgham <[email protected]>
+
+ Silence compiler warning when building 64-bit (on Windows)
+
+ Reviewed by Geoffrey Garen.
+
+ * jit/JSInterfaceJIT.h: Add a static cast for assignment.
+
2013-12-10 Matthew Hanson <[email protected]>
Merge 154333
Modified: branches/safari-537.74-branch/Source/_javascript_Core/jit/JSInterfaceJIT.h (160441 => 160442)
--- branches/safari-537.74-branch/Source/_javascript_Core/jit/JSInterfaceJIT.h 2013-12-11 17:53:46 UTC (rev 160441)
+++ branches/safari-537.74-branch/Source/_javascript_Core/jit/JSInterfaceJIT.h 2013-12-11 18:01:32 UTC (rev 160442)
@@ -180,7 +180,7 @@
static const unsigned Int32Tag = 0xffffffff;
COMPILE_ASSERT(Int32Tag == JSValue::Int32Tag, Int32Tag_out_of_sync);
#else
- static const unsigned Int32Tag = TagTypeNumber >> 32;
+ static const unsigned Int32Tag = static_cast<unsigned>(TagTypeNumber >> 32);
#endif
inline Jump emitLoadJSCell(unsigned virtualRegisterIndex, RegisterID payload);
inline Jump emitLoadInt32(unsigned virtualRegisterIndex, RegisterID dst);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
