Merge pull request #929 from Unity-Technologies/unity-master-mcs-fix-to-match-csc-behavior

[mcs] Mimic csc behaviour when attribute value is a typedef and add a…

Author: mrvoorhe

mcs/mcs/assembly.cs

@@ -554,7 +554,8 @@ public virtual void Emit ()
 						if (prop != null) {
 							AttributeEncoder encoder = new AttributeEncoder ();
 							encoder.EncodeNamedPropertyArgument (prop, new BoolLiteral (Compiler.BuiltinTypes, true, Location.Null));
-							SetCustomAttribute (pa.Constructor, encoder.ToArray ());
+							SetCustomAttribute (pa.Constructor, encoder.ToArray (out var references));
+							module.AddAssemblyReferences (references);
 						}
 					}
 				}

mcs/mcs/attribute.cs

@@ -1053,8 +1053,10 @@ public void Emit (Dictionary<Attribute, List<Attribute>> allEmitted)
 			}
 
 			byte[] cdata;
+			List<Assembly> references;
 			if (pos_args == null && named_values == null) {
 				cdata = AttributeEncoder.Empty;
+				references = null;
 			} else {
 				AttributeEncoder encoder = new AttributeEncoder ();
 
@@ -1127,7 +1129,7 @@ public void Emit (Dictionary<Attribute, List<Attribute>> allEmitted)
 					encoder.EncodeEmptyNamedArguments ();
 				}
 
-				cdata = encoder.ToArray ();
+				cdata = encoder.ToArray (out references);
 			}
 
 			if (!IsConditionallyExcluded (ctor.DeclaringType)) {
@@ -1146,6 +1148,8 @@ public void Emit (Dictionary<Attribute, List<Attribute>> allEmitted)
 					Error_AttributeEmitError (e.Message);
 					return;
 				}
+
+				context.Module.AddAssemblyReferences (references);
 			}
 
 			if (!usage_attr.AllowMultiple && allEmitted != null) {
@@ -1404,6 +1408,7 @@ public enum EncodedTypeProperties
 		byte[] buffer;
 		int pos;
 		const ushort Version = 1;
+		List<Assembly> imports;
 
 		static AttributeEncoder ()
 		{
@@ -1583,7 +1588,15 @@ public EncodedTypeProperties Encode (TypeSpec type)
 		public void EncodeTypeName (TypeSpec type)
 		{
 			var old_type = type.GetMetaInfo ();
-			Encode (type.MemberDefinition.IsImported ? old_type.AssemblyQualifiedName : old_type.FullName);
+			if (type.MemberDefinition.IsImported) {
+				if (imports == null)
+					imports = new List<Assembly> ();
+
+				imports.Add (old_type.Assembly);
+				Encode (old_type.AssemblyQualifiedName);
+			} else {
+				Encode (old_type.FullName);
+			}
 		}
 
 		public void EncodeTypeName (TypeContainer type)
@@ -1664,8 +1677,10 @@ void WriteCompressedValue (int value)
 			Encode (value);
 		}
 
-		public byte[] ToArray ()
+		public byte[] ToArray (out List<Assembly> assemblyReferences)
 		{
+			assemblyReferences = imports;
+
 			byte[] buf = new byte[pos];
 			Array.Copy (buffer, buf, pos);
 			return buf;
@@ -1977,7 +1992,8 @@ public void EmitAttribute (FieldBuilder builder, System.Diagnostics.DebuggerBrow
 			encoder.Encode ((int) state);
 			encoder.EncodeEmptyNamedArguments ();
 
-			builder.SetCustomAttribute ((ConstructorInfo) ctor.GetMetaInfo (), encoder.ToArray ());
+			builder.SetCustomAttribute ((ConstructorInfo) ctor.GetMetaInfo (), encoder.ToArray (out var references));
+			module.AddAssemblyReferences (references);
 		}
 	}
 
@@ -2011,7 +2027,8 @@ public void EmitAttribute (AssemblyBuilder builder, System.Diagnostics.Debuggabl
 			encoder.Encode ((int) modes);
 			encoder.EncodeEmptyNamedArguments ();
 
-			builder.SetCustomAttribute ((ConstructorInfo) ctor.GetMetaInfo (), encoder.ToArray ());
+			builder.SetCustomAttribute ((ConstructorInfo) ctor.GetMetaInfo (), encoder.ToArray (out var references));
+			module.AddAssemblyReferences (references);
 		}
 	}
 
@@ -2037,7 +2054,8 @@ public void EmitAttribute (ParameterBuilder builder, decimal value, Location loc
 			encoder.Encode ((uint) bits[0]);
 			encoder.EncodeEmptyNamedArguments ();
 
-			builder.SetCustomAttribute ((ConstructorInfo) ctor.GetMetaInfo (), encoder.ToArray ());
+			builder.SetCustomAttribute ((ConstructorInfo) ctor.GetMetaInfo (), encoder.ToArray (out var references));
+			module.AddAssemblyReferences (references);
 		}
 
 		public void EmitAttribute (FieldBuilder builder, decimal value, Location loc)
@@ -2055,7 +2073,8 @@ public void EmitAttribute (FieldBuilder builder, decimal value, Location loc)
 			encoder.Encode ((uint) bits[0]);
 			encoder.EncodeEmptyNamedArguments ();
 
-			builder.SetCustomAttribute ((ConstructorInfo) ctor.GetMetaInfo (), encoder.ToArray ());
+			builder.SetCustomAttribute ((ConstructorInfo) ctor.GetMetaInfo (), encoder.ToArray (out var references));
+			module.AddAssemblyReferences (references);
 		}
 	}
 
@@ -2079,7 +2098,8 @@ public void EmitAttribute (MethodBuilder builder, StateMachine type)
 			encoder.EncodeTypeName (type);
 			encoder.EncodeEmptyNamedArguments ();
 
-			builder.SetCustomAttribute ((ConstructorInfo) ctor.GetMetaInfo (), encoder.ToArray ());
+			builder.SetCustomAttribute ((ConstructorInfo) ctor.GetMetaInfo (), encoder.ToArray (out var references));
+			module.AddAssemblyReferences (references);
 		}
 	}
 

mcs/mcs/class.cs

@@ -2105,7 +2105,8 @@ void EmitIndexerName ()
 			encoder.Encode (GetAttributeDefaultMember ());
 			encoder.EncodeEmptyNamedArguments ();
 
-			TypeBuilder.SetCustomAttribute ((ConstructorInfo) ctor.GetMetaInfo (), encoder.ToArray ());
+			TypeBuilder.SetCustomAttribute ((ConstructorInfo) ctor.GetMetaInfo (), encoder.ToArray (out var references));
+			Module.AddAssemblyReferences (references);
 		}
 
 		public override void VerifyMembers ()

mcs/mcs/field.cs

@@ -542,7 +542,7 @@ void EmitFieldSize (int buffer_size)
 				}
 			);
 
-			fixed_buffer_type.SetCustomAttribute ((ConstructorInfo) ctor.GetMetaInfo (), encoder.ToArray ());
+			fixed_buffer_type.SetCustomAttribute ((ConstructorInfo) ctor.GetMetaInfo (), encoder.ToArray (out _));
 #endif
 			//
 			// Don't emit FixedBufferAttribute attribute for private types
@@ -559,7 +559,8 @@ void EmitFieldSize (int buffer_size)
 			encoder.Encode (buffer_size);
 			encoder.EncodeEmptyNamedArguments ();
 
-			FieldBuilder.SetCustomAttribute ((ConstructorInfo) ctor.GetMetaInfo (), encoder.ToArray ());
+			FieldBuilder.SetCustomAttribute ((ConstructorInfo) ctor.GetMetaInfo (), encoder.ToArray (out var references));
+			Module.AddAssemblyReferences (references);
 		}
 	}
 

mcs/mcs/module.cs

@@ -472,6 +472,18 @@ public void AddAttribute (Attribute attr, IMemberContext context)
 			attributes.AddAttribute (attr);
 		}
 
+		public void AddAssemblyReferences (List<Assembly> names)
+		{
+			if (names == null)
+				return;
+
+#if STATIC
+			foreach (var name in names) {
+				Builder.__GetAssemblyToken (name);
+			}
+#endif
+		}
+
 		public override void AddTypeContainer (TypeContainer tc)
 		{
 			AddTypeContainerMember (tc);