From 59c174845fbf5ee6db31486155a48a2e93e55806 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Thu, 29 Aug 2019 13:10:33 -0400 Subject: [PATCH 1/2] Bump ikvm to pick up caa8e7f54279a47422626005d228447f5d3670d5. --- external/ikvm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/ikvm b/external/ikvm index 847e05fced5c..caa8e7f54279 160000 --- a/external/ikvm +++ b/external/ikvm @@ -1 +1 @@ -Subproject commit 847e05fced5c9a41ff0f24f1f9d40d5a8a5772c1 +Subproject commit caa8e7f54279a47422626005d228447f5d3670d5 From 9a2f497100e0526a2f2f515a185f195d26e0b41e Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Thu, 29 Aug 2019 13:19:57 -0400 Subject: [PATCH 2/2] [monodis] Add a missing cattr parent case. --- mono/dis/dump.c | 3 +++ mono/metadata/row-indexes.h | 1 + 2 files changed, 4 insertions(+) diff --git a/mono/dis/dump.c b/mono/dis/dump.c index 4576cd0a7476..779dc415a866 100755 --- a/mono/dis/dump.c +++ b/mono/dis/dump.c @@ -794,6 +794,9 @@ has_cattr_get_table (MonoImage *m, guint32 val) case MONO_CUSTOM_ATTR_GENERICPAR: table = "GenericParam"; break; + case MONO_CUSTOM_ATTR_GENERICPARAMCONSTRAINT: + table = "GenericParamConstraint"; + break; default: table = "Unknown"; break; diff --git a/mono/metadata/row-indexes.h b/mono/metadata/row-indexes.h index 992dbdeea99f..d7837d01ba09 100644 --- a/mono/metadata/row-indexes.h +++ b/mono/metadata/row-indexes.h @@ -392,6 +392,7 @@ enum { MONO_CUSTOM_ATTR_EXP_TYPE, MONO_CUSTOM_ATTR_MANIFEST, MONO_CUSTOM_ATTR_GENERICPAR, + MONO_CUSTOM_ATTR_GENERICPARAMCONSTRAINT, MONO_CUSTOM_ATTR_BITS = 5, MONO_CUSTOM_ATTR_MASK = 0x1F };