Mono hot reload reorg and beginning (disabled) add method support

src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis/AddLambdaCapturingThis.cs

@@ -0,0 +1,25 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+using System;
+
+
+namespace System.Reflection.Metadata.ApplyUpdate.Test
+{
+    public class AddLambdaCapturingThis
+    {
+	public AddLambdaCapturingThis () {
+	    field = "abcd";
+	}
+
+	public string GetField => field;
+
+	private string field;
+
+	public string TestMethod () {
+	    // capture 'this' but no locals
+	    Func<string,string> fn = s => field;
+	    return "123";
+	}
+
+    }
+}

src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis/AddLambdaCapturingThis_v1.cs

@@ -0,0 +1,29 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+using System;
+
+
+namespace System.Reflection.Metadata.ApplyUpdate.Test
+{
+    public class AddLambdaCapturingThis
+    {
+	public AddLambdaCapturingThis () {
+	    field = "abcd";
+	}
+
+	public string GetField => field;
+
+	private string field;
+
+	public string TestMethod () {
+	    // capture 'this' but no locals
+	    Func<string,string> fn = s => NewMethod (s + field, 42);
+	    return fn ("123");
+	}
+
+	private string NewMethod (string s, int i) {
+	    return i.ToString() + s;
+	}
+
+    }
+}

src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis/System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis.csproj

@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <RootNamespace>System.Runtime.Loader.Tests</RootNamespace>
+    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TestRuntime>true</TestRuntime>
+    <DeltaScript>deltascript.json</DeltaScript>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="AddLambdaCapturingThis.cs" />
+  </ItemGroup>
+</Project>

src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis/deltascript.json

@@ -0,0 +1,6 @@
+{
+    "changes": [
+        {"document": "AddLambdaCapturingThis.cs", "update": "AddLambdaCapturingThis_v1.cs"},
+    ]
+}
+

src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs

@@ -263,6 +263,26 @@ public void AsyncMethodChanges()
             });
         }
 
+	[ActiveIssue ("https://github.com/dotnet/runtime/issues/50249", TestRuntimes.Mono)]
+	[ConditionalFact(typeof(ApplyUpdateUtil), nameof(ApplyUpdateUtil.IsSupported))]
+	public static void TestAddLambdaCapturingThis()
+	{
+	    ApplyUpdateUtil.TestCase(static () =>
+	    {
+		var assm = typeof(System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis).Assembly;
+
+		var x = new System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis();
+
+		Assert.Equal("123", x.TestMethod());
+
+		ApplyUpdateUtil.ApplyUpdate(assm);
+
+		string result = x.TestMethod();
+		Assert.Equal("42123abcd", result);
+	    });
+	}
+
+
         class NonRuntimeAssembly : Assembly
         {
         }

src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj

@@ -43,6 +43,7 @@
     <ProjectReference Include="ApplyUpdate\System.Reflection.Metadata.ApplyUpdate.Test.LambdaBodyChange\System.Reflection.Metadata.ApplyUpdate.Test.LambdaBodyChange.csproj" />
     <ProjectReference Include="ApplyUpdate\System.Reflection.Metadata.ApplyUpdate.Test.LambdaCapturesThis\System.Reflection.Metadata.ApplyUpdate.Test.LambdaCapturesThis.csproj" />
     <ProjectReference Include="ApplyUpdate\System.Reflection.Metadata.ApplyUpdate.Test.FirstCallAfterUpdate\System.Reflection.Metadata.ApplyUpdate.Test.FirstCallAfterUpdate.csproj" />
+    <ProjectReference Include="ApplyUpdate\System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis\System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis.csproj" />
 
   </ItemGroup>
   <ItemGroup Condition="'$(TargetOS)' == 'Browser'">
@@ -60,6 +61,7 @@
       <TrimmerRootAssembly Condition="$([System.String]::Copy('%(ResolvedFileToPublish.FileName)%(ResolvedFileToPublish.Extension)').EndsWith('System.Reflection.Metadata.ApplyUpdate.Test.LambdaBodyChange.dll'))" Include="%(ResolvedFileToPublish.FullPath)" />
       <TrimmerRootAssembly Condition="$([System.String]::Copy('%(ResolvedFileToPublish.FileName)%(ResolvedFileToPublish.Extension)').EndsWith('System.Reflection.Metadata.ApplyUpdate.Test.LambdaCapturesThis.dll'))" Include="%(ResolvedFileToPublish.FullPath)" />
       <TrimmerRootAssembly Condition="$([System.String]::Copy('%(ResolvedFileToPublish.FileName)%(ResolvedFileToPublish.Extension)').EndsWith('System.Reflection.Metadata.ApplyUpdate.Test.FirstCallAfterUpdate.dll'))" Include="%(ResolvedFileToPublish.FullPath)" />
+      <TrimmerRootAssembly Condition="$([System.String]::Copy('%(ResolvedFileToPublish.FileName)%(ResolvedFileToPublish.Extension)').EndsWith('System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis.dll'))" Include="%(ResolvedFileToPublish.FullPath)" />
     </ItemGroup>
   </Target>
 

src/mono/mono/component/hot_reload-stub.c

@@ -39,10 +39,7 @@ static void
 hot_reload_stub_cleanup_on_close (MonoImage *image);
 
 static void
-hot_reload_stub_effective_table_slow (const MonoTableInfo **t, int *idx);
-
-static int
-hot_reload_stub_relative_delta_index (MonoImage *image_dmeta, int token);
+hot_reload_stub_effective_table_slow (const MonoTableInfo **t, int idx);
 
 static void
 hot_reload_stub_close_except_pools_all (MonoImage *base_image);
@@ -65,6 +62,15 @@ hot_reload_stub_get_updated_method_ppdb (MonoImage *base_image, uint32_t idx);
 static gboolean
 hot_reload_stub_has_modified_rows (const MonoTableInfo *table);
 
+static int
+hot_reload_stub_table_num_rows_slow (MonoImage *image, int table_index);
+
+static GArray*
+hot_reload_stub_get_added_methods (MonoClass *klass);
+
+static uint32_t
+hot_reload_stub_method_parent (MonoImage *image, uint32_t method_index);
+
 static MonoComponentHotReload fn_table = {
 	{ MONO_COMPONENT_ITF_VERSION, &hot_reload_stub_available },
 	&hot_reload_stub_set_fastpath_data,
@@ -74,7 +80,6 @@ static MonoComponentHotReload fn_table = {
 	&hot_reload_stub_get_thread_generation,
 	&hot_reload_stub_cleanup_on_close,
 	&hot_reload_stub_effective_table_slow,
-	&hot_reload_stub_relative_delta_index,
 	&hot_reload_stub_apply_changes,
 	&hot_reload_stub_close_except_pools_all,
 	&hot_reload_stub_close_all,
@@ -83,6 +88,9 @@ static MonoComponentHotReload fn_table = {
 	&hot_reload_stub_delta_heap_lookup,
 	&hot_reload_stub_get_updated_method_ppdb,
 	&hot_reload_stub_has_modified_rows,
+	&hot_reload_stub_table_num_rows_slow,
+	&hot_reload_stub_get_added_methods,
+	&hot_reload_stub_method_parent,
 };
 
 static bool
@@ -135,13 +143,7 @@ hot_reload_stub_cleanup_on_close (MonoImage *image)
 }
 
 void
-hot_reload_stub_effective_table_slow (const MonoTableInfo **t, int *idx)
-{
-	g_assert_not_reached ();
-}
-
-static int
-hot_reload_stub_relative_delta_index (MonoImage *image_dmeta, int token)
+hot_reload_stub_effective_table_slow (const MonoTableInfo **t, int idx)
 {
 	g_assert_not_reached ();
 }
@@ -192,6 +194,25 @@ hot_reload_stub_has_modified_rows (const MonoTableInfo *table)
 	return FALSE;
 }
 
+static int
+hot_reload_stub_table_num_rows_slow (MonoImage *image, int table_index)
+{
+	g_assert_not_reached (); /* should always take the fast path */
+}
+
+static GArray*
+hot_reload_stub_get_added_methods (MonoClass *klass)
+{
+	return NULL;
+}
+
+static uint32_t
+hot_reload_stub_method_parent (MonoImage *image, uint32_t method_index)
+{
+	return 0;
+}
+
+
 MONO_COMPONENT_EXPORT_ENTRYPOINT
 MonoComponentHotReload *
 mono_component_hot_reload_init (void)