Skip to content

Commit 3d1a1f7

Browse files
authored
Merge pull request #783 from Unity-Technologies/unity-master-il2cpp-on-mono-fixes
Avoid some code paths on IL2CPP on Mono to avoid test failures.
2 parents a83dfbb + dc8d8fb commit 3d1a1f7

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

mono/metadata/gc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ static volatile gboolean finished;
708708
void
709709
mono_gc_finalize_notify (void)
710710
{
711-
#ifdef DEBUG
711+
#if defined(DEBUG) && !defined(IL2CPP_ON_MONO)
712712
g_message ( "%s: prodding finalizer", __func__);
713713
#endif
714714

mono/metadata/object.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5196,7 +5196,9 @@ mono_runtime_try_invoke_array (MonoMethod *method, void *obj, MonoArray *params,
51965196

51975197
if (mono_class_is_nullable (method->klass)) {
51985198
/* Need to create a boxed vtype instead */
5199+
#ifndef IL2CPP_ON_MONO
51995200
g_assert (!obj);
5201+
#endif
52005202

52015203
if (!params)
52025204
return NULL;

0 commit comments

Comments
 (0)