[Mono] Fix all the issues related to enabling WasmStripILAfterAOT

src/libraries/System.Runtime/tests/System/Reflection/MethodBaseTests.cs

@@ -55,27 +55,44 @@ public static void TestMethodBody()
         {
             MethodBase mbase = typeof(MethodBaseTests).GetMethod("MyOtherMethod", BindingFlags.Static | BindingFlags.Public);
             MethodBody mb = mbase.GetMethodBody();
+            var codeSize = mb.GetILAsByteArray().Length;
             Assert.True(mb.InitLocals);  // local variables are initialized
-#if DEBUG
-            Assert.Equal(2, mb.MaxStackSize);
-            Assert.Equal(3, mb.LocalVariables.Count);
 
-            foreach (LocalVariableInfo lvi in mb.LocalVariables)
+            if (codeSize == 0)
             {
-                if (lvi.LocalIndex == 0) { Assert.Equal(typeof(int), lvi.LocalType); }
-                if (lvi.LocalIndex == 1) { Assert.Equal(typeof(string), lvi.LocalType); }
-                if (lvi.LocalIndex == 2) { Assert.Equal(typeof(bool), lvi.LocalType); }
-            }
+                // This condition is needed for running this test under WASM AOT mode.
+                // Because IL trim is enabled be default for WASM apps whenever AOT is enabled.
+                // And the method body of "MyOtherMethod" will be trimmed.
+#if DEBUG
+                Assert.Equal(2, mb.MaxStackSize);
 #else
-            Assert.Equal(1, mb.MaxStackSize);
-            Assert.Equal(2, mb.LocalVariables.Count);
-
-            foreach (LocalVariableInfo lvi in mb.LocalVariables)
-            {
-                if (lvi.LocalIndex == 0) { Assert.Equal(typeof(int), lvi.LocalType); }
-                if (lvi.LocalIndex == 1) { Assert.Equal(typeof(string), lvi.LocalType); }
+                Assert.Equal(1, mb.MaxStackSize);
+#endif
+                Assert.Equal(0, mb.LocalVariables.Count);
             }
+            else
+            {
+#if DEBUG
+                Assert.Equal(2, mb.MaxStackSize);
+                Assert.Equal(3, mb.LocalVariables.Count);
+
+                foreach (LocalVariableInfo lvi in mb.LocalVariables)
+                {
+                    if (lvi.LocalIndex == 0) { Assert.Equal(typeof(int), lvi.LocalType); }
+                    if (lvi.LocalIndex == 1) { Assert.Equal(typeof(string), lvi.LocalType); }
+                    if (lvi.LocalIndex == 2) { Assert.Equal(typeof(bool), lvi.LocalType); }
+                }
+#else
+                Assert.Equal(1, mb.MaxStackSize);
+                Assert.Equal(2, mb.LocalVariables.Count);
+
+                foreach (LocalVariableInfo lvi in mb.LocalVariables)
+                {
+                    if (lvi.LocalIndex == 0) { Assert.Equal(typeof(int), lvi.LocalType); }
+                    if (lvi.LocalIndex == 1) { Assert.Equal(typeof(string), lvi.LocalType); }
+                }
 #endif
+            }
         }
 
         private static int MyAnotherMethod(int x)

src/mono/mono/eglib/gfile.c

@@ -104,3 +104,28 @@ g_file_error_from_errno (gint err_no)
 		return G_FILE_ERROR_FAILED;
 	}
 }
+
+FILE *
+g_fopen (const char *path, const char *mode)
+{
+	FILE *fp;
+
+	if (!path)
+		return NULL;
+
+#ifndef HOST_WIN32
+	fp = fopen (path, mode);
+#else
+	gunichar2 *wPath = g_utf8_to_utf16 (path, -1, 0, 0, 0);
+	gunichar2 *wMode = g_utf8_to_utf16 (mode, -1, 0, 0, 0);
+
+	if (!wPath || !wMode)
+		return NULL;
+
+	fp = _wfopen ((wchar_t *) wPath, (wchar_t *) wMode);
+	g_free (wPath);
+	g_free (wMode);
+#endif
+
+	return fp;
+}

src/mono/mono/eglib/glib.h

@@ -962,6 +962,7 @@ typedef enum {
 
 G_ENUM_FUNCTIONS (GFileTest)
 
+FILE *     g_fopen (const char *path, const char *mode);
 gboolean   g_file_get_contents (const gchar *filename, gchar **contents, gsize *length, GError **gerror);
 GFileError g_file_error_from_errno (gint err_no);
 gint       g_file_open_tmp (const gchar *tmpl, gchar **name_used, GError **gerror);

src/mono/mono/mini/aot-compiler.c

@@ -9885,10 +9885,15 @@ compile_method (MonoAotCompile *acfg, MonoMethod *method)
 	mono_atomic_inc_i32 (&acfg->stats.ccount);
 
 	if (acfg->aot_opts.trimming_eligible_methods_outfile && acfg->trimming_eligible_methods_outfile != NULL) {
-		if (!mono_method_is_generic_impl (method) && method->token != 0 && !cfg->deopt && !cfg->interp_entry_only && mini_get_interp_callbacks ()->jit_call_can_be_supported (method, mono_method_signature_internal (method), acfg->aot_opts.llvm_only)) {
-			// The call back to jit_call_can_be_supported is necessary for WASM, because it would still interprete some methods sometimes even though they were already AOT'ed.
+		if (!mono_method_is_generic_impl (method) && method->token != 0 && !cfg->deopt && !cfg->interp_entry_only) {
+			// The call to mono_jit_call_can_be_supported_by_interp is necessary for WASM, because it would still interprete some methods sometimes even though they were already AOT'ed.
 			// When that happens, interpreter needs to have the capability to call the AOT'ed version of that method, since the method body has already been trimmed.
-			fprintf (acfg->trimming_eligible_methods_outfile, "%x\n", method->token);
+			gboolean skip_trim = FALSE;
+			if (acfg->aot_opts.interp) {
+				skip_trim = (!mono_jit_call_can_be_supported_by_interp (method, mono_method_signature_internal (method), acfg->aot_opts.llvm_only) || (method->iflags & METHOD_IMPL_ATTRIBUTE_SYNCHRONIZED));
+			}
+			if (!skip_trim)
+				fprintf (acfg->trimming_eligible_methods_outfile, "%x\n", method->token);
 		}
 	}
 }
@@ -14917,7 +14922,7 @@ aot_assembly (MonoAssembly *ass, guint32 jit_opts, MonoAotOptions *aot_options)
 	}
 
 	if (acfg->aot_opts.trimming_eligible_methods_outfile && acfg->dedup_phase != DEDUP_COLLECT) {
-		acfg->trimming_eligible_methods_outfile = fopen (acfg->aot_opts.trimming_eligible_methods_outfile, "w+");
+		acfg->trimming_eligible_methods_outfile = g_fopen (acfg->aot_opts.trimming_eligible_methods_outfile, "w");
 		if (!acfg->trimming_eligible_methods_outfile)
 			aot_printerrf (acfg, "Unable to open trimming-eligible-methods-outfile specified file %s\n", acfg->aot_opts.trimming_eligible_methods_outfile);
 		else {

src/mono/mono/mini/ee.h

@@ -65,7 +65,6 @@ typedef gpointer MonoInterpFrameHandle;
 	MONO_EE_CALLBACK (void, entry_llvmonly, (gpointer res, gpointer *args, gpointer imethod)) \
 	MONO_EE_CALLBACK (gpointer, get_interp_method, (MonoMethod *method)) \
 	MONO_EE_CALLBACK (MonoJitInfo*, compile_interp_method, (MonoMethod *method, MonoError *error)) \
-	MONO_EE_CALLBACK (gboolean, jit_call_can_be_supported, (MonoMethod *method, MonoMethodSignature *sig, gboolean is_llvm_only)) \
 
 typedef struct _MonoEECallbacks {
 

src/mono/mono/mini/interp-stubs.c

@@ -252,12 +252,6 @@ stub_compile_interp_method (MonoMethod *method, MonoError *error)
 	return NULL;
 }
 
-static gboolean
-stub_jit_call_can_be_supported (MonoMethod *method, MonoMethodSignature *sig, gboolean is_llvm_only)
-{
-	return TRUE;
-}
-
 #undef MONO_EE_CALLBACK
 #define MONO_EE_CALLBACK(ret, name, sig) stub_ ## name,
 

src/mono/mono/mini/interp/interp-internals.h

@@ -320,9 +320,6 @@ mono_mint_type (MonoType *type);
 int
 mono_interp_type_size (MonoType *type, int mt, int *align_p);
 
-gboolean
-interp_jit_call_can_be_supported (MonoMethod *method, MonoMethodSignature *sig, gboolean is_llvm_only);
-
 #if HOST_BROWSER
 
 gboolean