From 37e48378a23bc082272360f6ef69c6e4e91905c3 Mon Sep 17 00:00:00 2001 From: Jay Krell Date: Fri, 16 Aug 2019 06:32:48 -0700 Subject: [PATCH] Fill in more MONO_PATCH_INFO_NONE support. (mono/mono#13990) Commit migrated from https://github.com/mono/mono/commit/66afab580309acb23a5ed022a2e424c400907c65 --- src/mono/mono/mini/aot-runtime.c | 4 ++-- src/mono/mono/mini/mini-arm64.c | 2 ++ src/mono/mono/mini/mini-generic-sharing.c | 1 + src/mono/mono/mini/mini-runtime.c | 2 ++ src/mono/mono/mini/mini-s390x.c | 2 ++ 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/mono/mono/mini/aot-runtime.c b/src/mono/mono/mini/aot-runtime.c index 7185a89..c20ed02 100644 --- a/src/mono/mono/mini/aot-runtime.c +++ b/src/mono/mono/mini/aot-runtime.c @@ -3996,8 +3996,8 @@ decode_patch (MonoAotModule *aot_module, MonoMemPool *mp, MonoJumpInfo *ji, guin ji->data.index = decode_value (p, &p); break; default: - g_warning ("unhandled type %d", ji->type); - g_assert_not_reached (); + g_error ("unhandled type %d", ji->type); + break; } *endbuf = p; diff --git a/src/mono/mono/mini/mini-arm64.c b/src/mono/mono/mini/mini-arm64.c index c373dd9..03cedd0 100644 --- a/src/mono/mono/mini/mini-arm64.c +++ b/src/mono/mono/mini/mini-arm64.c @@ -1005,6 +1005,8 @@ mono_arch_patch_code_new (MonoCompile *cfg, MonoDomain *domain, guint8 *code, Mo default: arm_patch_full (cfg, domain, ip, (guint8*)target, ji->relocation); break; + case MONO_PATCH_INFO_NONE: + break; } } diff --git a/src/mono/mono/mini/mini-generic-sharing.c b/src/mono/mono/mini/mini-generic-sharing.c index ee4d051..f7b28a8 100644 --- a/src/mono/mono/mini/mini-generic-sharing.c +++ b/src/mono/mono/mini/mini-generic-sharing.c @@ -4181,6 +4181,7 @@ mini_get_rgctx_entry_slot (MonoJumpInfoRgctxEntry *entry) } default: g_assert_not_reached (); + case MONO_PATCH_INFO_NONE: break; } diff --git a/src/mono/mono/mini/mini-runtime.c b/src/mono/mono/mini/mini-runtime.c index a78a5c6..d23ef77 100644 --- a/src/mono/mono/mini/mini-runtime.c +++ b/src/mono/mono/mini/mini-runtime.c @@ -1264,6 +1264,7 @@ mono_patch_info_hash (gconstpointer data) printf ("info type: %d\n", ji->type); mono_print_ji (ji); printf ("\n"); g_assert_not_reached (); + case MONO_PATCH_INFO_NONE: return 0; } } @@ -1331,6 +1332,7 @@ mono_patch_info_equal (gconstpointer ka, gconstpointer kb) case MONO_PATCH_INFO_GSHAREDVT_IN_WRAPPER: return mono_metadata_signature_equal (ji1->data.sig, ji2->data.sig); case MONO_PATCH_INFO_GC_SAFE_POINT_FLAG: + case MONO_PATCH_INFO_NONE: return 1; } diff --git a/src/mono/mono/mini/mini-s390x.c b/src/mono/mono/mini/mini-s390x.c index 126f6d6..6a6caf3 100644 --- a/src/mono/mono/mini/mini-s390x.c +++ b/src/mono/mono/mini/mini-s390x.c @@ -5357,6 +5357,8 @@ mono_arch_patch_code (MonoCompile *cfg, MonoMethod *method, MonoDomain *domain, target = S390_RELATIVE(target, ip); ip += 2; s390_patch_rel (ip, (guint64) target); + case MONO_PATCH_INFO_NONE: + break; } } } -- 2.7.4