Fix Marshal.load and keeps Time utc offset

Author: andrykonchin

spec/ruby/core/marshal/shared/load.rb

@@ -940,14 +940,38 @@
       t1.should equal t2
     end
 
-    it "loads the zone" do
+    it "keeps the local zone" do
       with_timezone 'AST', 3 do
         t = Time.local(2012, 1, 1)
         Marshal.send(@method, Marshal.dump(t)).zone.should == t.zone
       end
     end
 
-    it "loads nanoseconds" do
+    it "keeps UTC zone" do
+      t = Time.now.utc
+      t2 = Marshal.send(@method, Marshal.dump(t))
+      t2.should.utc?
+    end
+
+    it "keeps the zone" do
+      t = nil
+
+      with_timezone 'AST', 4 do
+        t = Time.local(2012, 1, 1)
+      end
+
+      with_timezone 'EET', -2 do
+        Marshal.send(@method, Marshal.dump(t)).zone.should == 'AST'
+      end
+    end
+
+    it "keeps utc offset" do
+      t = Time.new(2007,11,1,15,25,0, "+09:00")
+      t2 = Marshal.send(@method, Marshal.dump(t))
+      t2.utc_offset.should == 32400
+    end
+
+    it "keeps nanoseconds" do
       t = Time.now
       Marshal.send(@method, Marshal.dump(t)).nsec.should == t.nsec
     end

src/main/java/org/truffleruby/core/time/TimeNodes.java

@@ -403,6 +403,17 @@ protected Object timeZone(RubyTime time) {
         }
     }
 
+    @Primitive(name = "time_set_zone")
+    public abstract static class TimeSetZoneNode extends PrimitiveArrayArgumentsNode {
+        @Specialization(guards = "strings.isRubyString(zone)", limit = "1")
+        protected Object timeSetZone(RubyTime time, Object zone,
+                @Cached RubyStringLibrary strings) {
+            time.zone = zone;
+            return zone;
+        }
+
+    }
+
     @Primitive(name = "time_strftime")
     public abstract static class TimeStrftimePrimitiveNode extends PrimitiveArrayArgumentsNode {
 

src/main/ruby/truffleruby/core/marshal.rb

@@ -243,27 +243,45 @@ def set_instance_variables(obj)
     end
 
     def set_time_variables(time)
-      nano_num = nano_den = nil
+      nano_num = nano_den = offset = zone = nil
 
       construct_integer.times do
-        ivar = get_symbol
+        name = get_symbol
         value = construct
 
         case
-        when ivar == :nano_num
+        when name == :nano_num
           nano_num = value
-        when ivar == :nano_den
+        when name == :nano_den
           nano_den = value
-        when ivar.start_with?("@")
-          Primitive.object_ivar_set time, ivar, value
-        else
-          # ignore not regular instance variables (without @ prefix), e.g. :offset, :zone
+        when name == :offset
+          offset = value
+        when name == :zone
+          zone = value
+        when name.start_with?('@')
+          Primitive.object_ivar_set time, name, value
+        end
+      end
+
+      unless Primitive.nil?(offset)
+        begin
+          offset = Truffle::Type.coerce_to_exact_num(offset)
+        rescue TypeError
+          offset = nil
         end
       end
 
-      if nano_num && nano_den
+      unless Primitive.nil?(zone)
+        zone = Truffle::Type.rb_check_convert_type(zone, String, :to_str)
+        zone = nil if !Primitive.nil?(zone) && zone.include?("\0")
+      end
+
+      unless Primitive.nil?(nano_num) || Primitive.nil?(nano_den)
         Primitive.time_set_nseconds(time, Rational(nano_num, nano_den).to_i)
       end
+
+      time.localtime offset unless Primitive.nil?(offset)
+      Primitive.time_set_zone(time, zone) unless Primitive.nil?(zone)
     end
 
     STRING_ALLOCATE = String.method(:__allocate__).unbind