Bring jbevain/cecil's commit 58c287883107819f9c73c336a940a5383e97f5a2, improve last...

diff --git a/mcs/class/Mono.Cecil/Mono.Cecil/MetadataSystem.cs b/mcs/class/Mono.Cecil/Mono.Cecil/MetadataSystem.cs
index ce9f741c5a6468602d2323c49207b8b8424199c3..d17a783867c619df635a90071613e92eb39abde6 100644 (file)
--- a/mcs/class/Mono.Cecil/Mono.Cecil/MetadataSystem.cs
+++ b/mcs/class/Mono.Cecil/Mono.Cecil/MetadataSystem.cs
@@ -122,11 +122,12 @@ namespace Mono.Cecil {
                                return false;
 
                        Row<ElementType, bool> primitive_data;
-                       if (!TryGetPrimitiveData (type, out primitive_data) && !primitive_data.Col1.IsPrimitive ())
-                               return false;
+                       if (TryGetPrimitiveData (type, out primitive_data) && primitive_data.Col1.IsPrimitive ()) {
+                               etype = primitive_data.Col1;
+                               return true;
+                       }
 
-                       etype = primitive_data.Col1;
-                       return true;
+                       return false;
                }
 
                static bool TryGetPrimitiveData (TypeReference type, out Row<ElementType, bool> primitive_data)