diff --git a/src/Compilers/Core/Portable/Serialization/ObjectBinderState.cs b/src/Compilers/Core/Portable/Serialization/ObjectBinderState.cs index edb1412d49c99d3a62b60788c84248278f7d8792..fa77abdae801279e33a91a2ca7e49315bf3d7342 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) GetTypeAndReaderFromId(int typeId) - => (_types[typeId], _typeReaders[typeId]); - - public Func GetTypeReader(int index) - => _typeReaders[index]; + public Func GetTypeReaderFromId(int typeId) + => _typeReaders[typeId]; public bool RegisterTypeReader(Type type, Func typeReader) { diff --git a/src/Compilers/Core/Portable/Serialization/StreamObjectReader.cs b/src/Compilers/Core/Portable/Serialization/StreamObjectReader.cs index d4e817ee818f0244dc87cb99168b5b3df6f17d21..3a8df5a1fc6bdcbbae3bc1b272f98076e1f11abc 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) ReadTypeAndReader() + private Func 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);