Don't emit reaonly. prefix for reference loads

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

diff --git a/mcs/mcs/context.cs b/mcs/mcs/context.cs
index 6cbb42b6e00e08d95cf7411ddcc351be47c2675c..316968454ef3442f14de3a7f707dd3800ecb805f 100644 (file)
--- a/mcs/mcs/context.cs
+++ b/mcs/mcs/context.cs
@@ -55,7 +55,6 @@ namespace Mono.CSharp
                bool IsObsolete { get; }
                bool IsUnsafe { get; }
                bool IsStatic { get; }
-               bool HasUnresolvedConstraints { get; }
 
                string GetSignatureForError ();
 
@@ -160,7 +159,7 @@ namespace Mono.CSharp
                        return branching;
                }
 
-               public FlowBranchingIterator StartFlowBranching (Iterator iterator, FlowBranching parent)
+               public FlowBranchingIterator StartFlowBranching (StateMachineInitializer iterator, FlowBranching parent)
                {
                        FlowBranchingIterator branching = new FlowBranchingIterator (parent, iterator);
                        current_flow_branching = branching;
@@ -268,6 +267,8 @@ namespace Mono.CSharp
 
                        UsingInitializerScope = 1 << 12,
 
+                       LockScope = 1 << 13,
+
                        /// <summary>
                        ///   Whether control flow analysis is enabled
                        /// </summary>
@@ -421,10 +422,6 @@ namespace Mono.CSharp
                        get { return (flags & Options.DoFlowAnalysis) != 0; }
                }
 
-               public bool HasUnresolvedConstraints {
-                       get { return false; }
-               }
-
                public bool IsInProbingMode {
                        get {
                                return (flags & Options.ProbingMode) != 0;