Bump ikvm to pick up mono/mono@caa8e7f54279a47422626005d228447f5d3670d5. (mono/mono...

* Bump ikvm to pick up mono/mono@caa8e7f54279a47422626005d228447f5d3670d5.

* [monodis] Add a missing cattr parent case.

Commit migrated from https://github.com/mono/mono/commit/796a5751315dbf95bc7dedea684840e4cce84861

diff --git a/src/mono/mono/dis/dump.c b/src/mono/mono/dis/dump.c
index 282015d..5d652d0 100755 (executable)
--- a/src/mono/mono/dis/dump.c
+++ b/src/mono/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/src/mono/mono/metadata/row-indexes.h b/src/mono/mono/metadata/row-indexes.h
index 992dbde..d7837d0 100644 (file)
--- a/src/mono/mono/metadata/row-indexes.h
+++ b/src/mono/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
 };