From b6817ba2ac501b951660c4d6006a806a755c1464 Mon Sep 17 00:00:00 2001
From: CyrusNajmabadi <cyrusn@microsoft.com>
Date: Mon, 10 Apr 2017 16:04:52 -0700
Subject: [PATCH] Remove unnecessary tuple creation.

---
 .../Core/Portable/Serialization/ObjectBinderState.cs      | 7 ++-----
 .../Core/Portable/Serialization/StreamObjectReader.cs     | 8 ++++----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/Compilers/Core/Portable/Serialization/ObjectBinderState.cs b/src/Compilers/Core/Portable/Serialization/ObjectBinderState.cs
index edb1412d49c..fa77abdae80 100644
--- a/src/Compilers/Core/Portable/Serialization/ObjectBinderState.cs
+++ b/src/Compilers/Core/Portable/Serialization/ObjectBinderState.cs
@@ -65,11 +65,8 @@ public int GetOrAddTypeId(Type type)
         public Type GetTypeFromId(int typeId)
             => _types[typeId];
 
-        public (Type, Func<ObjectReader, object>) GetTypeAndReaderFromId(int typeId)
-            => (_types[typeId], _typeReaders[typeId]);
-
-        public Func<ObjectReader, object> GetTypeReader(int index)
-            => _typeReaders[index];
+        public Func<ObjectReader, object> GetTypeReaderFromId(int typeId)
+            => _typeReaders[typeId];
 
         public bool RegisterTypeReader(Type type, Func<ObjectReader, object> typeReader)
         {
diff --git a/src/Compilers/Core/Portable/Serialization/StreamObjectReader.cs b/src/Compilers/Core/Portable/Serialization/StreamObjectReader.cs
index d4e817ee818..3a8df5a1fc6 100644
--- a/src/Compilers/Core/Portable/Serialization/StreamObjectReader.cs
+++ b/src/Compilers/Core/Portable/Serialization/StreamObjectReader.cs
@@ -577,17 +577,17 @@ public Type ReadType()
         private Type ReadTypeAfterTag()
             => _binderState.GetTypeFromId(this.ReadInt32());
 
-        private (Type, Func<ObjectReader, object>) ReadTypeAndReader()
+        private Func<ObjectReader, object> ReadTypeReader()
         {
             _reader.ReadByte();
-            return _binderState.GetTypeAndReaderFromId(this.ReadInt32());
+            return _binderState.GetTypeReaderFromId(this.ReadInt32());
         }
 
         private object ReadObject()
         {
-            int id = _objectReferenceMap.GetNextReferenceId();
+            var id = _objectReferenceMap.GetNextReferenceId();
 
-            var (type, typeReader) = this.ReadTypeAndReader();
+            var typeReader = this.ReadTypeReader();
 
             // recursive: read and construct instance immediately from member elements encoding next in the stream
             var instance = typeReader(this);
-- 
GitLab