Title: [252618] trunk/Source/_javascript_Core
- Revision
- 252618
- Author
- [email protected]
- Date
- 2019-11-18 18:47:55 -0800 (Mon, 18 Nov 2019)
Log Message
Always enable Optional<OptionsStorage::Size> parse(const char* string) for OS(DARWIN).
https://bugs.webkit.org/show_bug.cgi?id=204333
<rdar://problem/57303785>
Reviewed by Yusuke Suzuki.
On OS(DARWIN), the compiler does not consider size_t and unsigned to be the same
type, even for 32-bit targets. Hence, we need the size_t version of the function
in addition to the unsigned version.
* runtime/Options.cpp:
(JSC::parse):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (252617 => 252618)
--- trunk/Source/_javascript_Core/ChangeLog 2019-11-19 02:32:03 UTC (rev 252617)
+++ trunk/Source/_javascript_Core/ChangeLog 2019-11-19 02:47:55 UTC (rev 252618)
@@ -1,3 +1,18 @@
+2019-11-18 Mark Lam <[email protected]>
+
+ Always enable Optional<OptionsStorage::Size> parse(const char* string) for OS(DARWIN).
+ https://bugs.webkit.org/show_bug.cgi?id=204333
+ <rdar://problem/57303785>
+
+ Reviewed by Yusuke Suzuki.
+
+ On OS(DARWIN), the compiler does not consider size_t and unsigned to be the same
+ type, even for 32-bit targets. Hence, we need the size_t version of the function
+ in addition to the unsigned version.
+
+ * runtime/Options.cpp:
+ (JSC::parse):
+
2019-11-18 Devin Rousso <[email protected]>
Web Inspector: Local Resource Overrides: allow substitution based on a url pattern
Modified: trunk/Source/_javascript_Core/runtime/Options.cpp (252617 => 252618)
--- trunk/Source/_javascript_Core/runtime/Options.cpp 2019-11-19 02:32:03 UTC (rev 252617)
+++ trunk/Source/_javascript_Core/runtime/Options.cpp 2019-11-19 02:47:55 UTC (rev 252618)
@@ -88,7 +88,7 @@
return WTF::nullopt;
}
-#if CPU(ADDRESS64)
+#if CPU(ADDRESS64) || OS(DARWIN)
template<>
Optional<OptionsStorage::Size> parse(const char* string)
{
@@ -97,7 +97,7 @@
return value;
return WTF::nullopt;
}
-#endif // CPU(ADDRESS64)
+#endif // CPU(ADDRESS64) || OS(DARWIN)
template<>
Optional<OptionsStorage::Double> parse(const char* string)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
