Reverted e4cea8b4 because also runtime reverted

2 files changed, 4 insertions, 30 deletions

diff --git a/Mono.Debugger.Soft/Mono.Debugger.Soft/Connection.cs b/Mono.Debugger.Soft/Mono.Debugger.Soft/Connection.cs
index 6be3b23..4bbbf8d 100644
--- a/Mono.Debugger.Soft/Mono.Debugger.Soft/Connection.cs
+++ b/Mono.Debugger.Soft/Mono.Debugger.Soft/Connection.cs
@@ -119,9 +119,6 @@ namespace Mono.Debugger.Soft
 		public int[] live_range_end;
 		public int[] scopes_start;
 		public int[] scopes_end;
-		public int nhoisted;
-		public int[] hoisted_scopes_start;
-		public int[] hoisted_scopes_end;
 	}
 
 	struct PropInfo {
@@ -424,7 +421,7 @@ namespace Mono.Debugger.Soft
 		 * with newer runtimes, and vice versa.
 		 */
 		internal const int MAJOR_VERSION = 2;
-		internal const int MINOR_VERSION = 46;
+		internal const int MINOR_VERSION = 45;
 
 		enum WPSuspendPolicy {
 			NONE = 0,
@@ -1918,15 +1915,6 @@ namespace Mono.Debugger.Soft
 					info.scopes_end [i] = info.scopes_start [i] + res.ReadInt ();
 					last_start = info.scopes_start [i];
 				}
-				if (Version.AtLeast (2, 46)) {
-					info.nhoisted = res.ReadInt ();
-					info.hoisted_scopes_start = new int [info.nhoisted];
-					info.hoisted_scopes_end = new int [info.nhoisted];
-					for (int i = 0; i < info.nhoisted; ++i) {
-						info.hoisted_scopes_start [i] = res.ReadInt ();
-						info.hoisted_scopes_end [i] = res.ReadInt ();
-					}
-				}
 			}
 
 			int nlocals = res.ReadInt ();
diff --git a/Mono.Debugger.Soft/Mono.Debugger.Soft/MethodMirror.cs b/Mono.Debugger.Soft/Mono.Debugger.Soft/MethodMirror.cs
index 44b59fb..f2b5a79 100644
--- a/Mono.Debugger.Soft/Mono.Debugger.Soft/MethodMirror.cs
+++ b/Mono.Debugger.Soft/Mono.Debugger.Soft/MethodMirror.cs
@@ -24,7 +24,6 @@ namespace Mono.Debugger.Soft
 		MethodBodyMirror body;
 		MethodMirror gmd;
 		TypeMirror[] type_args;
-		LocalScope[] hoisted_scopes;
 
 		internal MethodMirror (VirtualMachine vm, long id) : base (vm, id) {
 		}
@@ -242,21 +241,12 @@ namespace Mono.Debugger.Soft
 		}
 
 		public LocalScope [] GetScopes () {
-			vm.CheckProtocolVersion (2, 43);
+			if (!vm.Version.AtLeast (2, 43))
+				throw new InvalidOperationException ("Scopes support was implemented in 2.43 version of protocol.");
 			GetLocals ();
 			return scopes;
 		}
 
-		//
-		// Return the contents of the State Machine Hoisted Locals Scope record:
-		// https://github.com/dotnet/corefx/blob/master/src/System.Reflection.Metadata/specs/PortablePdb-Metadata.md#state-machine-hoisted-local-scopes-c--vb-compilers
-		//
-		public LocalScope [] GetHoistedScopes () {
-			vm.CheckProtocolVersion (2, 46);
-			GetLocals ();
-			return hoisted_scopes;
-		}
-
 		public LocalVariable[] GetLocals () {
 			if (locals == null) {
 				LocalsInfo li = new LocalsInfo ();
@@ -282,10 +272,6 @@ namespace Mono.Debugger.Soft
 					for (int i = 0; i < scopes.Length; ++i)
 						scopes [i] = new LocalScope (vm, this, li.scopes_start [i], li.scopes_end [i]);
 				}
-
-				hoisted_scopes = new LocalScope [li.nhoisted];
-				for (int i = 0; i < li.nhoisted; ++i)
-					hoisted_scopes [i] = new LocalScope (vm, this, li.hoisted_scopes_start [i], li.hoisted_scopes_end [i]);
 			}
 			return locals;
 		}
@@ -456,4 +442,4 @@ namespace Mono.Debugger.Soft
 			return interp.Evaluate (this_val, args);
 		}
 	}
-}
\ No newline at end of file
+}