From d6493f6f5eca65e6e02995bf7b3f4c44e34f8c94 Mon Sep 17 00:00:00 2001
From: Unknown <brianra@unity3d.com>
Date: Tue, 5 Dec 2017 17:07:28 -0500
Subject: [PATCH] Enabling support for scopes in methods in the debugger

Local variables need iloffsets to define scopes and the method info returned by the debugger lists all of the available scopes in terms of il offsets as well.
---
 mono/mini/debugger-agent.c | 36 ++++++++++++++++++++++++++++--------
 mono/mini/il2cpp-c-types.h | 16 ++++++++++++++++
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c
index 130c0281e905..582bda2a1755 100644
--- a/mono/mini/debugger-agent.c
+++ b/mono/mini/debugger-agent.c
@@ -10026,7 +10026,7 @@ static void GetSequencePointsAndSourceFilesUniqueSequencePoints(MonoMethod* meth
 	}
 }
 
-static const Il2CppMethodExecutionContextInfoC* GetExecutionContextInfo(MonoMethod* method, uint32_t* count)
+static void GetExecutionContextAndHeaderInfo(MonoMethod* method, uint32_t* executionContextInfoCount, const Il2CppMethodExecutionContextInfoC **executionContextInfo, const Il2CppMethodHeaderInfoC **headerInfo)
 {
 	void *seqPointIter = NULL;
 	Il2CppSequencePointC *seqPoint;
@@ -10034,13 +10034,16 @@ static const Il2CppMethodExecutionContextInfoC* GetExecutionContextInfo(MonoMeth
 	{
 		if (il2cpp_mono_methods_match(seqPoint->method, method))
 		{
-			*count = seqPoint->executionContextInfoCount;
-			return seqPoint->executionContextInfos;
+			*executionContextInfoCount = seqPoint->executionContextInfoCount;
+			*executionContextInfo = seqPoint->executionContextInfos;
+			*headerInfo = seqPoint->header;
+			return;
 		}
 	}
 
 	g_assert(FALSE); // shouldn't be ever reached
 }
+
 #endif // IL2CPP_MONO_DEBUGGER
 
 static ErrorCode
@@ -10281,10 +10284,25 @@ method_commands_internal (int command, MonoMethod *method, MonoDomain *domain, g
 		g_free (locals_map);
 #else
 		uint32_t executionInfoCount, localVariableCount = 0, i;
-		const Il2CppMethodExecutionContextInfoC* executionContextInfo = GetExecutionContextInfo(method, &executionInfoCount);
+		const Il2CppMethodExecutionContextInfoC* executionContextInfo;
+		const Il2CppMethodHeaderInfoC* headerInfo;
+
+		GetExecutionContextAndHeaderInfo(method, &executionInfoCount, &executionContextInfo, &headerInfo);
 
 		if (CHECK_PROTOCOL_VERSION(2, 43)) {
-			buffer_add_int(buf, 0);
+			if (headerInfo)
+			{
+				buffer_add_int(buf, headerInfo->numScopes);
+				for (i = 0; i < headerInfo->numScopes; ++i)
+				{
+					buffer_add_int(buf, headerInfo->scopes[i].startOffset);
+					buffer_add_int(buf, headerInfo->scopes[i].endOffset);
+				}
+			}
+			else
+			{
+				buffer_add_int(buf, 0);
+			}
 		}
 
 		for (i = 0; i < executionInfoCount; i++)
@@ -10307,10 +10325,12 @@ method_commands_internal (int command, MonoMethod *method, MonoDomain *domain, g
 				buffer_add_string(buf, executionContextInfo[i].name);
 		}
 
-		for (i = 0; i < localVariableCount; i++)
+		for (i = 0; i < executionInfoCount; i++)
 		{
-			buffer_add_int(buf, 0);
-			buffer_add_int(buf, 0);
+			if (executionContextInfo[i].variableKind == kMethodVariableKindC_LocalVariable) {
+				buffer_add_int(buf, executionContextInfo[i].start);
+				buffer_add_int(buf, executionContextInfo[i].end);
+			}
 		}
 #endif // !IL2CPP_MONO_DEBUGGER
 		break;
diff --git a/mono/mini/il2cpp-c-types.h b/mono/mini/il2cpp-c-types.h
index 27f015ed3bd7..e58a452c808c 100644
--- a/mono/mini/il2cpp-c-types.h
+++ b/mono/mini/il2cpp-c-types.h
@@ -327,12 +327,28 @@ typedef struct
 	const Il2CppMonoType* const* const type;
 	const char* const name;
 	const MethodVariableKindC variableKind;
+	const int start;
+	const int end;
 } Il2CppMethodExecutionContextInfoC;
 
+typedef struct
+{
+	int startOffset;
+	int endOffset;
+} Il2CppMethodScopeC;
+
+typedef struct
+{
+	int codeSize;
+	int numScopes;
+	Il2CppMethodScopeC *scopes;
+} Il2CppMethodHeaderInfoC;
+
 typedef struct
 {
 	const Il2CppMethodExecutionContextInfoC* const executionContextInfos;
 	const uint32_t executionContextInfoCount;
+	const Il2CppMethodHeaderInfoC *header;
 	const Il2CppMonoMethod* method;
 	const char* const sourceFile;
 	const uint8_t sourceFileHash[16];