Add null constant argument type check

midnite8177 · Jul 31, 2013 · 01697c1 · 01697c1
1 parent 8ffb6b1
commit 01697c1
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/mcs/mcs/constant.cs b/mcs/mcs/constant.cs
@@ -2057,8 +2057,10 @@ public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder e
 		{
 			switch (targetType.BuiltinType) {
 			case BuiltinTypeSpec.Type.Object:
-				// Type it as string cast
-				enc.Encode (rc.Module.Compiler.BuiltinTypes.String);
+				// Type null literal it as string cast
+				if (type.BuiltinType == BuiltinTypeSpec.Type.Object)
+					enc.Encode (rc.Module.Compiler.BuiltinTypes.String);
+
 				goto case BuiltinTypeSpec.Type.String;
 			case BuiltinTypeSpec.Type.String:
 			case BuiltinTypeSpec.Type.Type: