Title: [223252] tags/Safari-605.1.10/Source/_javascript_Core
- Revision
- 223252
- Author
- [email protected]
- Date
- 2017-10-12 13:07:29 -0700 (Thu, 12 Oct 2017)
Log Message
Cherry-pick r223248. rdar://problem/34956170
Modified Paths
Diff
Modified: tags/Safari-605.1.10/Source/_javascript_Core/ChangeLog (223251 => 223252)
--- tags/Safari-605.1.10/Source/_javascript_Core/ChangeLog 2017-10-12 20:01:35 UTC (rev 223251)
+++ tags/Safari-605.1.10/Source/_javascript_Core/ChangeLog 2017-10-12 20:07:29 UTC (rev 223252)
@@ -1,3 +1,19 @@
+2017-10-12 Jason Marcell <[email protected]>
+
+ Cherry-pick r223248. rdar://problem/34956170
+
+ 2017-10-12 Per Arne Vollan <[email protected]>
+
+ [Win64] JSC compile error.
+ https://bugs.webkit.org/show_bug.cgi?id=178213
+
+ Reviewed by Alex Christensen.
+
+ Add static cast from int64 to uintptr_t.
+
+ * dfg/DFGOSRExit.cpp:
+ (JSC::DFG::OSRExit::executeOSRExit):
+
2017-10-11 Commit Queue <[email protected]>
Unreviewed, rolling out r223113 and r223121.
Modified: tags/Safari-605.1.10/Source/_javascript_Core/dfg/DFGOSRExit.cpp (223251 => 223252)
--- tags/Safari-605.1.10/Source/_javascript_Core/dfg/DFGOSRExit.cpp 2017-10-12 20:01:35 UTC (rev 223251)
+++ tags/Safari-605.1.10/Source/_javascript_Core/dfg/DFGOSRExit.cpp 2017-10-12 20:07:29 UTC (rev 223252)
@@ -668,8 +668,8 @@
saveCalleeSavesFor(context, baselineCodeBlock);
#if USE(JSVALUE64)
- cpu.gpr(GPRInfo::tagTypeNumberRegister) = TagTypeNumber;
- cpu.gpr(GPRInfo::tagMaskRegister) = TagTypeNumber | TagBitTypeOther;
+ cpu.gpr(GPRInfo::tagTypeNumberRegister) = static_cast<uintptr_t>(TagTypeNumber);
+ cpu.gpr(GPRInfo::tagMaskRegister) = static_cast<uintptr_t>(TagTypeNumber | TagBitTypeOther);
#endif
if (exit.isExceptionHandler())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
