From 5ad20fb5ed153c01082611c6afc97c362c34a82e Mon Sep 17 00:00:00 2001
From: Justin Van Patten <jvp@justinvp.com>
Date: Tue, 3 Jan 2017 13:51:26 -0800
Subject: [PATCH] TimeZoneInfo.StringSerializer can be a struct (#8784)

---
 src/mscorlib/src/System/TimeZoneInfo.StringSerializer.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mscorlib/src/System/TimeZoneInfo.StringSerializer.cs b/src/mscorlib/src/System/TimeZoneInfo.StringSerializer.cs
index 0e495bc..8012d1f4 100644
--- a/src/mscorlib/src/System/TimeZoneInfo.StringSerializer.cs
+++ b/src/mscorlib/src/System/TimeZoneInfo.StringSerializer.cs
@@ -12,10 +12,9 @@ namespace System
     public sealed partial class TimeZoneInfo
     {
         /// <summary>
-        /// This class is used to serialize and deserialize TimeZoneInfo
-        /// objects based on the custom string serialization format.
+        /// Used to serialize and deserialize TimeZoneInfo objects based on the custom string serialization format.
         /// </summary>
-        private sealed class StringSerializer
+        private struct StringSerializer
         {
             private enum State
             {
@@ -124,6 +123,7 @@ namespace System
             private StringSerializer(string str)
             {
                 _serializedText = str;
+                _currentTokenStartIndex = 0;
                 _state = State.StartOfToken;
             }
 
-- 
2.7.4