Fix removing of hoisted variable moved to another storey

mcs/mcs/anonymous.cs

@@ -315,8 +315,11 @@ public void CaptureLocalVariable (ResolveContext ec, LocalVariable localVariable
 
 			var hoisted = localVariable.HoistedVariant;
 			if (hoisted != null && hoisted.Storey != this && hoisted.Storey is StateMachine) {
-				// TODO: It's too late the field is defined in HoistedLocalVariable ctor
+				//
+				// Variable is already hoisted but we need it in storey which can be shared
+				//
 				hoisted.Storey.hoisted_locals.Remove (hoisted);
+				hoisted.Storey.Members.Remove (hoisted.Field);
 				hoisted = null;
 			}
 
@@ -728,6 +731,12 @@ protected HoistedVariable (AnonymousMethodStorey storey, Field field)
 			this.field = field;
 		}
 
+		public Field Field {
+			get {
+				return field;
+			}
+		}
+
 		public AnonymousMethodStorey Storey {
 			get {
 				return storey;
@@ -848,12 +857,6 @@ public HoistedParameter (HoistedParameter hp, string name)
 
 		#region Properties
 
-		public Field Field {
-			get {
-				return field;
-			}
-		}
-
 		public bool IsAssigned { get; set; }
 
 		public ParameterReference Parameter {
@@ -893,12 +896,6 @@ public HoistedThis (AnonymousMethodStorey storey, Field field)
 			: base (storey, field)
 		{
 		}
-
-		public Field Field {
-			get {
-				return field;
-			}
-		}
 	}
 
 	//