Merge branch 'master' of github.com:jfrijters/ikdasm

3 files changed, 16 insertions, 3 deletions

diff --git a/Disassembler.cs b/Disassembler.cs
index 646380c..79ae69d 100644
--- a/Disassembler.cs
+++ b/Disassembler.cs
@@ -967,18 +967,26 @@ namespace Ildasm
                     lw.Write(".ctor ");
                 }
                 string sep2 = "(";
-                foreach (var constraint in par.GetGenericParameterConstraints())
+                Type[] constraints = par.GetGenericParameterConstraints();
+                CustomModifiers[] customModifiers = par.__GetGenericParameterConstraintCustomModifiers();
+                for (int j = 0; j < constraints.Length; j++)
                 {
+                    Type constraint = constraints[j];
                     lw.Write(sep2);
                     sep2 = ", ";
                     if (constraint.__IsMissing || !constraint.IsGenericType)
                     {
+                        if (!customModifiers[j].IsEmpty && !constraint.IsGenericParameter)
+                        {
+                            lw.Write(constraint.IsValueType ? "valuetype " : "class ");
+                        }
                         WriteTypeDefOrRef(lw, constraint);
                     }
                     else
                     {
                         WriteSignatureType(lw, constraint);
                     }
+                    WriteCustomModifiers(lw, customModifiers[j]);
                 }
                 if (sep2 != "(")
                 {
@@ -2635,7 +2643,10 @@ namespace Ildasm
 
         void WriteCustomAttributeImpl(LineWriter lw, CustomAttributeData ca, bool comment, int level0)
         {
-            lw.Write("instance void ");
+            lw.Write("instance ");
+            WriteSignatureType(lw, ca.Constructor.__ReturnParameter.ParameterType);
+            WriteCustomModifiers(lw, ca.Constructor.__ReturnParameter.__GetCustomModifiers());
+            lw.Write(" ");
             WriteTypeDefOrRef(lw, ca.Constructor.DeclaringType);
             lw.Write("::.ctor(");
             int level = lw.Column;
diff --git a/IKVM.Reflection.dll b/IKVM.Reflection.dll
index 6353a61..1c97fd4 100644
--- a/IKVM.Reflection.dll
+++ b/IKVM.Reflection.dll
diff --git a/IL.cs b/IL.cs
index 1abd52d..4f5b5fc 100644
--- a/IL.cs
+++ b/IL.cs
@@ -714,7 +714,9 @@ namespace Ildasm
             WriteCallingConvention(lw, mb.CallingConvention);
             if (mb is ConstructorInfo)
             {
-                lw.Write("void ");
+                WriteSignatureType(lw, ((ConstructorInfo)mb).__ReturnParameter.ParameterType);
+                WriteCustomModifiers(lw, ((ConstructorInfo)mb).__ReturnParameter.__GetCustomModifiers());
+                lw.Write(" ");
             }
             else
             {