[GR-32236] ZoneRulesBasedTimeZone should use offset after (not before) a transition.

PullRequest: js/2489

Author: iamstolis

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/builtins/JSDate.java

@@ -428,6 +428,12 @@ private static int getOffset(TimeZone timeZone, long t, boolean isUTC) {
 
         // dstOffset = 0, look back by standard DST savings
         int dstSavings = timeZone.getDSTSavings();
+        if (dstSavings == 0) {
+            // getDSTSavings() returns 0 for some time-zones (like America/Sao_Paulo)
+            // that stopped to use DST. Unfortunately, we may have a date that
+            // used DST still => try to use the usual DST savings (1 hour)
+            dstSavings = 3600000;
+        }
         offset = getOffset(timeZone, date - dstSavings, fields);
         int dstOffset = offset - rawOffset;
         if (dstOffset != 0 && dstOffset != dstSavings) {

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/util/ZoneRulesBasedTimeZone.java

@@ -50,6 +50,7 @@
 import java.time.ZoneOffset;
 import java.time.zone.ZoneRules;
 import java.util.Date;
+import java.util.List;
 
 /**
  * Implementation of ICU4J {@code TimeZone} that takes time-zone data from the provided
@@ -70,7 +71,14 @@ public int getOffset(int era, int year, int month, int day, int dayOfWeek, int m
         LocalDate date = LocalDate.of((era == GregorianCalendar.BC) ? -year : year, month + 1, day);
         LocalTime time = LocalTime.ofNanoOfDay(1000000L * milliseconds);
         LocalDateTime dateTime = LocalDateTime.of(date, time);
-        return toMillis(rules.getOffset(dateTime));
+        List<ZoneOffset> offsets = rules.getValidOffsets(dateTime);
+        ZoneOffset offset;
+        if (offsets.size() == 1) {
+            offset = offsets.get(0);
+        } else {
+            offset = rules.getTransition(dateTime).getOffsetAfter();
+        }
+        return toMillis(offset);
     }
 
     @Override