[jit] Fix the saving of the 'cfg->ret_var_set' flag when inlining, it was set to...

[mono.git] / mcs / mcs / support.cs

diff --git a/mcs/mcs/support.cs b/mcs/mcs/support.cs
index 8cbbc14680557a301ba3dcb59834d1b2f8c09012..fe6343a814db2f0136d48500c484d376491fbd30 100644 (file)
--- a/mcs/mcs/support.cs
+++ b/mcs/mcs/support.cs
@@ -36,77 +36,6 @@ namespace Mono.CSharp {
                        return System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode (obj);
                }
        }
-#if !NET_4_0 && !MONODROID
-       public class Tuple<T1, T2> : IEquatable<Tuple<T1, T2>>
-       {
-               public Tuple (T1 item1, T2 item2)
-               {
-                       Item1 = item1;
-                       Item2 = item2;
-               }
-
-               public T1 Item1 { get; private set; }
-               public T2 Item2 { get; private set; }
-
-               public override int GetHashCode ()
-               {
-                       return Item1.GetHashCode () ^ Item2.GetHashCode ();
-               }
-
-               #region IEquatable<Tuple<T1,T2>> Members
-
-               public bool Equals (Tuple<T1, T2> other)
-               {
-                       return EqualityComparer<T1>.Default.Equals (Item1, other.Item1) &&
-                               EqualityComparer<T2>.Default.Equals (Item2, other.Item2);
-               }
-
-               #endregion
-       }
-
-       public class Tuple<T1, T2, T3> : IEquatable<Tuple<T1, T2, T3>>
-       {
-               public Tuple (T1 item1, T2 item2, T3 item3)
-               {
-                       Item1 = item1;
-                       Item2 = item2;
-                       Item3 = item3;
-               }
-
-               public T1 Item1 { get; private set; }
-               public T2 Item2 { get; private set; }
-               public T3 Item3 { get; private set; }
-
-               public override int GetHashCode ()
-               {
-                       return Item1.GetHashCode () ^ Item2.GetHashCode () ^ Item3.GetHashCode ();
-               }
-
-               #region IEquatable<Tuple<T1,T2>> Members
-
-               public bool Equals (Tuple<T1, T2, T3> other)
-               {
-                       return EqualityComparer<T1>.Default.Equals (Item1, other.Item1) &&
-                               EqualityComparer<T2>.Default.Equals (Item2, other.Item2) &&
-                               EqualityComparer<T3>.Default.Equals (Item3, other.Item3);
-               }
-
-               #endregion
-       }
-
-       static class Tuple
-       {
-               public static Tuple<T1, T2> Create<T1, T2> (T1 item1, T2 item2)
-               {
-                       return new Tuple<T1, T2> (item1, item2);
-               }
-
-               public static Tuple<T1, T2, T3> Create<T1, T2, T3> (T1 item1, T2 item2, T3 item3)
-               {
-                       return new Tuple<T1, T2, T3> (item1, item2, item3);
-               }
-       }
-#endif
 
        static class ArrayComparer
        {
@@ -144,7 +73,7 @@ namespace Mono.CSharp {
 #endif
 
                StreamReader reader;
-               Stream stream;
+               public readonly Stream Stream;
 
                char[] buffer;
                int read_ahead_length;  // the length of read buffer
@@ -154,7 +83,7 @@ namespace Mono.CSharp {
 
                public SeekableStreamReader (Stream stream, Encoding encoding, char[] sharedBuffer = null)
                {
-                       this.stream = stream;
+                       this.Stream = stream;
                        this.buffer = sharedBuffer;
 
                        InitializeStream (DefaultReadAheadSize);
@@ -176,7 +105,7 @@ namespace Mono.CSharp {
                        if (buffer == null || buffer.Length < required_buffer_size)
                                buffer = new char [required_buffer_size];
 
-                       stream.Position = 0;
+                       Stream.Position = 0;
                        buffer_start = char_count = pos = 0;
                }
 
@@ -205,7 +134,7 @@ namespace Mono.CSharp {
                                        // Cannot use handy reader.DiscardBufferedData () because it for
                                        // some strange reason resets encoding as well
                                        //
-                                       reader = new StreamReader (stream, reader.CurrentEncoding, true);
+                                       reader = new StreamReader (Stream, reader.CurrentEncoding, true);
                                }
 
                                while (value > buffer_start + char_count) {