Title: [237751] tags/Safari-607.1.12.1/Source/_javascript_Core
- Revision
- 237751
- Author
- [email protected]
- Date
- 2018-11-02 13:38:00 -0700 (Fri, 02 Nov 2018)
Log Message
Cherry-pick r237745. rdar://problem/45765887
API should use wrapper object if address is 32-bit
https://bugs.webkit.org/show_bug.cgi?id=191203
Reviewed by Filip Pizlo.
* API/APICast.h:
(toJS):
(toJSForGC):
(toRef):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237745 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: tags/Safari-607.1.12.1/Source/_javascript_Core/API/APICast.h (237750 => 237751)
--- tags/Safari-607.1.12.1/Source/_javascript_Core/API/APICast.h 2018-11-02 20:33:52 UTC (rev 237750)
+++ tags/Safari-607.1.12.1/Source/_javascript_Core/API/APICast.h 2018-11-02 20:38:00 UTC (rev 237751)
@@ -69,7 +69,7 @@
inline JSC::JSValue toJS(JSC::ExecState* exec, JSValueRef v)
{
ASSERT_UNUSED(exec, exec);
-#if USE(JSVALUE32_64)
+#if !CPU(ADDRESS64)
JSC::JSCell* jsCell = reinterpret_cast<JSC::JSCell*>(const_cast<OpaqueJSValue*>(v));
if (!jsCell)
return JSC::jsNull();
@@ -91,7 +91,7 @@
inline JSC::JSValue toJSForGC(JSC::ExecState* exec, JSValueRef v)
{
ASSERT_UNUSED(exec, exec);
-#if USE(JSVALUE32_64)
+#if !CPU(ADDRESS64)
JSC::JSCell* jsCell = reinterpret_cast<JSC::JSCell*>(const_cast<OpaqueJSValue*>(v));
if (!jsCell)
return JSC::JSValue();
@@ -131,7 +131,7 @@
inline JSValueRef toRef(JSC::ExecState* exec, JSC::JSValue v)
{
ASSERT(exec->vm().currentThreadIsHoldingAPILock());
-#if USE(JSVALUE32_64)
+#if !CPU(ADDRESS64)
if (!v)
return 0;
if (!v.isCell())
Modified: tags/Safari-607.1.12.1/Source/_javascript_Core/ChangeLog (237750 => 237751)
--- tags/Safari-607.1.12.1/Source/_javascript_Core/ChangeLog 2018-11-02 20:33:52 UTC (rev 237750)
+++ tags/Safari-607.1.12.1/Source/_javascript_Core/ChangeLog 2018-11-02 20:38:00 UTC (rev 237751)
@@ -1,5 +1,33 @@
2018-11-02 Babak Shafiei <[email protected]>
+ Cherry-pick r237745. rdar://problem/45765887
+
+ API should use wrapper object if address is 32-bit
+ https://bugs.webkit.org/show_bug.cgi?id=191203
+
+ Reviewed by Filip Pizlo.
+
+ * API/APICast.h:
+ (toJS):
+ (toJSForGC):
+ (toRef):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237745 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-11-02 Keith Miller <[email protected]>
+
+ API should use wrapper object if address is 32-bit
+ https://bugs.webkit.org/show_bug.cgi?id=191203
+
+ Reviewed by Filip Pizlo.
+
+ * API/APICast.h:
+ (toJS):
+ (toJSForGC):
+ (toRef):
+
+2018-11-02 Babak Shafiei <[email protected]>
+
Revert r237547. rdar://problem/45767917
2018-11-02 Babak Shafiei <[email protected]>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes