<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[279962] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/279962">279962</a></dd>
<dt>Author</dt> <dd>ysuzuki@apple.com</dd>
<dt>Date</dt> <dd>2021-07-15 13:44:57 -0700 (Thu, 15 Jul 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[JSC] Harden defaultTimeZone retrieval
https://bugs.webkit.org/show_bug.cgi?id=227996
JSTests:

Reviewed by Mark Lam.

* complex.yaml:
* complex/intl-timezone-check.js: Added.
(shouldBe):

Source/JavaScriptCore:

rdar://80540300

Reviewed by Mark Lam.

We received the report that "UTC" can appear in Intl.DateTimeFormat's default timezone.
While we cannot reproduce it, this patch attempts to avoid using TimeZone from UCalendar
so that the code gets the same to the old defaultTimeZone implementation.

* runtime/JSDateMath.cpp:
(JSC::DateCache::defaultTimeZone):
(JSC::DateCache::timeZoneCacheSlow):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkJSTestscomplexyaml">trunk/JSTests/complex.yaml</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSDateMathcpp">trunk/Source/JavaScriptCore/runtime/JSDateMath.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestscomplexintltimezonecheckjs">trunk/JSTests/complex/intl-timezone-check.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (279961 => 279962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog  2021-07-15 20:42:53 UTC (rev 279961)
+++ trunk/JSTests/ChangeLog     2021-07-15 20:44:57 UTC (rev 279962)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2021-07-15  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Harden defaultTimeZone retrieval
+        https://bugs.webkit.org/show_bug.cgi?id=227996
+
+        Reviewed by Mark Lam.
+
+        * complex.yaml:
+        * complex/intl-timezone-check.js: Added.
+        (shouldBe):
+
</ins><span class="cx"> 2021-07-15  Mark Lam  <mark.lam@apple.com>
</span><span class="cx"> 
</span><span class="cx">         JITWorklist::waitUntilAllPlansForVMAreReady() should also be notified when plans are cancelled.
</span></span></pre></div>
<a id="trunkJSTestscomplexintltimezonecheckjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/complex/intl-timezone-check.js (0 => 279962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/complex/intl-timezone-check.js                             (rev 0)
+++ trunk/JSTests/complex/intl-timezone-check.js        2021-07-15 20:44:57 UTC (rev 279962)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+function shouldBe(actual, expected) {
+    if (actual !== expected)
+        throw new Error('bad value: ' + actual);
+}
+
+shouldBe(Intl.DateTimeFormat().resolvedOptions().timeZone, "America/Los_Angeles");
</ins></span></pre></div>
<a id="trunkJSTestscomplexyaml"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/complex.yaml (279961 => 279962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/complex.yaml       2021-07-15 20:42:53 UTC (rev 279961)
+++ trunk/JSTests/complex.yaml  2021-07-15 20:44:57 UTC (rev 279962)
</span><span class="lines">@@ -43,3 +43,6 @@
</span><span class="cx"> 
</span><span class="cx"> - path: complex/date-parse-milliseconds.js
</span><span class="cx">   cmd: runComplexTest [], [], "TZ=America/Los_Angeles", "--useDollarVM=1"
</span><ins>+
+- path: complex/intl-timezone-check.js
+  cmd: runComplexTest [], [], "TZ=America/Los_Angeles", "--useDollarVM=1"
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (279961 => 279962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2021-07-15 20:42:53 UTC (rev 279961)
+++ trunk/Source/JavaScriptCore/ChangeLog       2021-07-15 20:44:57 UTC (rev 279962)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2021-07-15  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Harden defaultTimeZone retrieval
+        https://bugs.webkit.org/show_bug.cgi?id=227996
+        rdar://80540300
+
+        Reviewed by Mark Lam.
+
+        We received the report that "UTC" can appear in Intl.DateTimeFormat's default timezone.
+        While we cannot reproduce it, this patch attempts to avoid using TimeZone from UCalendar
+        so that the code gets the same to the old defaultTimeZone implementation.
+
+        * runtime/JSDateMath.cpp:
+        (JSC::DateCache::defaultTimeZone):
+        (JSC::DateCache::timeZoneCacheSlow):
+
</ins><span class="cx"> 2021-07-15  Mark Lam  <mark.lam@apple.com>
</span><span class="cx"> 
</span><span class="cx">         JITWorklist::waitUntilAllPlansForVMAreReady() should also be notified when plans are cancelled.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSDateMathcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSDateMath.cpp (279961 => 279962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSDateMath.cpp       2021-07-15 20:42:53 UTC (rev 279961)
+++ trunk/Source/JavaScriptCore/runtime/JSDateMath.cpp  2021-07-15 20:44:57 UTC (rev 279962)
</span><span class="lines">@@ -103,6 +103,7 @@
</span><span class="cx">     WTF_MAKE_FAST_ALLOCATED(OpaqueICUTimeZone);
</span><span class="cx"> public:
</span><span class="cx">     std::unique_ptr<UCalendar, ICUDeleter<ucal_close>> m_calendar;
</span><ins>+    String m_canonicalTimeZoneID;
</ins><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -334,22 +335,7 @@
</span><span class="cx"> String DateCache::defaultTimeZone()
</span><span class="cx"> {
</span><span class="cx"> #if HAVE(ICU_C_TIMEZONE_API)
</span><del>-    auto& timeZone = *timeZoneCache();
-    Vector<UChar, 32> buffer;
-    auto status = callBufferProducingFunction(ucal_getTimeZoneID, timeZone.m_calendar.get(), buffer);
-    if (U_FAILURE(status))
-        return "UTC"_s;
-
-    Vector<UChar, 32> canonicalBuffer;
-    status = callBufferProducingFunction(ucal_getCanonicalTimeZoneID, buffer.data(), buffer.size(), canonicalBuffer, nullptr);
-    if (U_FAILURE(status))
-        return "UTC"_s;
-
-    String canonical = String(canonicalBuffer);
-    if (isUTCEquivalent(canonical))
-        return "UTC"_s;
-
-    return canonical;
</del><ins>+    return timeZoneCache()->m_canonicalTimeZoneID;
</ins><span class="cx"> #else
</span><span class="cx">     icu::UnicodeString timeZoneID;
</span><span class="cx">     icu::UnicodeString canonicalTimeZoneID;
</span><span class="lines">@@ -384,9 +370,21 @@
</span><span class="cx">     ASSERT(!m_timeZoneCache);
</span><span class="cx"> #if HAVE(ICU_C_TIMEZONE_API)
</span><span class="cx">     auto* cache = new OpaqueICUTimeZone;
</span><ins>+
+    String canonical;
</ins><span class="cx">     Vector<UChar, 32> timeZoneID;
</span><span class="cx">     auto status = callBufferProducingFunction(ucal_getHostTimeZone, timeZoneID);
</span><del>-    ASSERT_UNUSED(status, U_SUCCESS(status));
</del><ins>+    if (U_SUCCESS(status)) {
+        Vector<UChar, 32> canonicalBuffer;
+        auto status = callBufferProducingFunction(ucal_getCanonicalTimeZoneID, timeZoneID.data(), timeZoneID.size(), canonicalBuffer, nullptr);
+        if (U_SUCCESS(status))
+            canonical = String(canonicalBuffer);
+    }
+    if (canonical.isNull() || isUTCEquivalent(canonical))
+        canonical = "UTC"_s;
+    cache->m_canonicalTimeZoneID = WTFMove(canonical);
+
+    status = U_ZERO_ERROR;
</ins><span class="cx">     cache->m_calendar = std::unique_ptr<UCalendar, ICUDeleter<ucal_close>>(ucal_open(timeZoneID.data(), timeZoneID.size(), "", UCAL_DEFAULT, &status));
</span><span class="cx">     ASSERT_UNUSED(status, U_SUCCESS(status));
</span><span class="cx">     ucal_setGregorianChange(cache->m_calendar.get(), minECMAScriptTime, &status); // Ignore "unsupported" error.
</span></span></pre>
</div>
</div>

</body>
</html>