X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fmcs%2Fimport.cs;h=8474e29a5b44c1467bd04008a1afdc3dbb9169dd;hb=e2b2d181084848f3c5dde2788370db1b79893c69;hp=37ea71470802ac1f138adf1d32c4178d3ab3d7db;hpb=bfb8d1f57bcd8403b136395fc18fc97bfbacd3f0;p=mono.git diff --git a/mcs/mcs/import.cs b/mcs/mcs/import.cs index 37ea7147080..8474e29a5b4 100644 --- a/mcs/mcs/import.cs +++ b/mcs/mcs/import.cs @@ -5,7 +5,8 @@ // // Dual licensed under the terms of the MIT X11 or GNU GPL // -// Copyright 2009, 2010 Novell, Inc +// Copyright 2009-2011 Novell, Inc +// Copyright 2011-2012 Xamarin, Inc (http://www.xamarin.com) // using System; @@ -31,7 +32,7 @@ namespace Mono.CSharp // Dynamic types reader with additional logic to reconstruct a dynamic // type using DynamicAttribute values // - struct DynamicTypeReader + protected struct DynamicTypeReader { static readonly bool[] single_attribute = { true }; @@ -87,10 +88,9 @@ namespace Mono.CSharp } if (cad.Count > 0) { - string ns, name; foreach (var ca in cad) { - importer.GetCustomAttributeTypeName (ca, out ns, out name); - if (name != "DynamicAttribute" && ns != CompilerServicesNamespace) + var dt = ca.Constructor.DeclaringType; + if (dt.Name != "DynamicAttribute" || dt.Namespace != CompilerServicesNamespace) continue; if (ca.ConstructorArguments.Count == 0) { @@ -120,7 +120,7 @@ namespace Mono.CSharp protected readonly Dictionary import_cache; protected readonly Dictionary compiled_types; protected readonly Dictionary assembly_2_definition; - readonly ModuleContainer module; + protected readonly ModuleContainer module; public static readonly string CompilerServicesNamespace = "System.Runtime.CompilerServices"; @@ -149,7 +149,6 @@ namespace Mono.CSharp public abstract void AddCompiledType (TypeBuilder builder, TypeSpec spec); protected abstract MemberKind DetermineKindFromBaseType (MetaType baseType); protected abstract bool HasVolatileModifier (MetaType[] modifiers); - public abstract void GetCustomAttributeTypeName (CustomAttributeData cad, out string typeNamespace, out string typeName); public FieldSpec CreateField (FieldInfo fi, TypeSpec declaringType) { @@ -170,7 +169,8 @@ namespace Mono.CSharp break; default: // Ignore private fields (even for error reporting) to not require extra dependencies - if (IgnorePrivateMembers || HasAttribute (CustomAttributeData.GetCustomAttributes (fi), "CompilerGeneratedAttribute", CompilerServicesNamespace)) + if ((IgnorePrivateMembers && !declaringType.IsStruct) || + HasAttribute (CustomAttributeData.GetCustomAttributes (fi), "CompilerGeneratedAttribute", CompilerServicesNamespace)) return null; mod = Modifiers.PRIVATE; @@ -191,7 +191,9 @@ namespace Mono.CSharp var definition = new ImportedMemberDefinition (fi, field_type, this); if ((fa & FieldAttributes.Literal) != 0) { - var c = Constant.CreateConstantFromValue (field_type, fi.GetRawConstantValue (), Location.Null); + Constant c = field_type.Kind == MemberKind.MissingType ? + new NullConstant (InternalType.ErrorType, Location.Null) : + Constant.CreateConstantFromValue (field_type, fi.GetRawConstantValue (), Location.Null); return new ConstSpec (declaringType, definition, field_type, fi, mod, c); } @@ -390,18 +392,21 @@ namespace Mono.CSharp if ((mod & Modifiers.OVERRIDE) != 0) { bool is_real_override = false; if (kind == MemberKind.Method && declaringType.BaseType != null) { - var filter = MemberFilter.Method (name, tparams != null ? tparams.Length : 0, parameters, null); - var candidate = MemberCache.FindMember (declaringType.BaseType, filter, BindingRestriction.None); - - // - // For imported class method do additional validation to be sure that metadata - // override flag was correct - // - // Difference between protected internal and protected is ok - // - const Modifiers conflict_mask = Modifiers.AccessibilityMask & ~Modifiers.INTERNAL; - if (candidate != null && (candidate.Modifiers & conflict_mask) == (mod & conflict_mask) && !candidate.IsStatic) { - is_real_override = true; + var btype = declaringType.BaseType; + if (IsOverrideMethodBaseTypeAccessible (btype)) { + var filter = MemberFilter.Method (name, tparams != null ? tparams.Length : 0, parameters, null); + var candidate = MemberCache.FindMember (btype, filter, BindingRestriction.None); + + // + // For imported class method do additional validation to be sure that metadata + // override flag was correct + // + // Difference between protected internal and protected is ok + // + const Modifiers conflict_mask = Modifiers.AccessibilityMask & ~Modifiers.INTERNAL; + if (candidate != null && (candidate.Modifiers & conflict_mask) == (mod & conflict_mask) && !candidate.IsStatic) { + is_real_override = true; + } } } @@ -434,6 +439,30 @@ namespace Mono.CSharp return ms; } + bool IsOverrideMethodBaseTypeAccessible (TypeSpec baseType) + { + switch (baseType.Modifiers & Modifiers.AccessibilityMask) { + case Modifiers.PUBLIC: + return true; + case Modifiers.INTERNAL: + // + // Check whether imported method in base type is accessible from compiled + // context + // + return baseType.MemberDefinition.IsInternalAsPublic (module.DeclaringAssembly); + case Modifiers.PRIVATE: + return false; + default: + // protected + // protected internal + // + // Method accessibility checks will be done later based on context + // where the method is called (CS0122 error will be reported for inaccessible) + // + return true; + } + } + // // Imports System.Reflection parameters // @@ -462,7 +491,7 @@ namespace Mono.CSharp // var el = p.ParameterType.GetElementType (); types[i] = ImportType (el, new DynamicTypeReader (p)); // TODO: 1-based positio to be csc compatible - } else if (i == 0 && method.IsStatic && parent.IsStatic && parent.MemberDefinition.DeclaringAssembly.HasExtensionMethod && + } else if (i == 0 && method.IsStatic && (parent.Modifiers & Modifiers.METHOD_EXTENSION) != 0 && HasAttribute (CustomAttributeData.GetCustomAttributes (method), "ExtensionAttribute", CompilerServicesNamespace)) { mod = Parameter.Modifier.This; types[i] = ImportType (p.ParameterType); @@ -479,7 +508,7 @@ namespace Mono.CSharp if (!is_params && p.IsOptional) { object value = p.RawDefaultValue; var ptype = types[i]; - if ((p.Attributes & ParameterAttributes.HasDefault) != 0 && ptype.Kind != MemberKind.TypeParameter && (value != null || TypeManager.IsReferenceType (ptype))) { + if ((p.Attributes & ParameterAttributes.HasDefault) != 0 && ptype.Kind != MemberKind.TypeParameter && (value != null || TypeSpec.IsReferenceType (ptype))) { if (value == null) { default_value = Constant.CreateConstant (ptype, null, Location.Null); } else { @@ -591,33 +620,48 @@ namespace Mono.CSharp PropertySpec spec = null; if (!param.IsEmpty) { - var index_name = declaringType.MemberDefinition.GetAttributeDefaultMember (); - if (index_name == null) { - is_valid_property = false; - } else { - if (get != null) { - if (get.IsStatic) - is_valid_property = false; - if (get.Name.IndexOf (index_name, StringComparison.Ordinal) != 4) - is_valid_property = false; + if (is_valid_property) { + var index_name = declaringType.MemberDefinition.GetAttributeDefaultMember (); + if (index_name == null) { + is_valid_property = false; + } else { + if (get != null) { + if (get.IsStatic) + is_valid_property = false; + if (get.Name.IndexOf (index_name, StringComparison.Ordinal) != 4) + is_valid_property = false; + } + if (set != null) { + if (set.IsStatic) + is_valid_property = false; + if (set.Name.IndexOf (index_name, StringComparison.Ordinal) != 4) + is_valid_property = false; + } } - if (set != null) { - if (set.IsStatic) - is_valid_property = false; - if (set.Name.IndexOf (index_name, StringComparison.Ordinal) != 4) - is_valid_property = false; + + if (is_valid_property) { + spec = new IndexerSpec (declaringType, new ImportedParameterMemberDefinition (pi, type, param, this), type, param, pi, mod); + } else if (declaringType.MemberDefinition.IsComImport && param.FixedParameters[0].HasDefaultValue) { + // + // Enables support for properties with parameters (must have default value) of COM-imported types + // + is_valid_property = true; + + for (int i = 0; i < param.FixedParameters.Length; ++i) { + if (!param.FixedParameters[i].HasDefaultValue) { + is_valid_property = false; + break; + } + } } } - - if (is_valid_property) - spec = new IndexerSpec (declaringType, new ImportedParameterMemberDefinition (pi, type, param, this), type, param, pi, mod); } if (spec == null) spec = new PropertySpec (MemberKind.Property, declaringType, new ImportedMemberDefinition (pi, type, this), type, pi, mod); if (!is_valid_property) { - spec.IsNotRealProperty = true; + spec.IsNotCSharpCompatible = true; return spec; } @@ -650,7 +694,7 @@ namespace Mono.CSharp return CreateType (type, declaring_type, dtype, canImportBaseType); } - TypeSpec CreateType (MetaType type, TypeSpec declaringType, DynamicTypeReader dtype, bool canImportBaseType) + protected TypeSpec CreateType (MetaType type, TypeSpec declaringType, DynamicTypeReader dtype, bool canImportBaseType) { TypeSpec spec; if (import_cache.TryGetValue (type, out spec)) { @@ -835,6 +879,13 @@ namespace Mono.CSharp import_cache.Add (type, spec); + if (kind == MemberKind.TypeParameter) { + if (canImportBaseType) + ImportTypeParameterTypeConstraints ((TypeParameterSpec) spec, type); + + return spec; + } + // // Two stage setup as the base type can be inflated declaring type or // another nested type inside same declaring type which has not been @@ -853,7 +904,7 @@ namespace Mono.CSharp if (!assembly_2_definition.TryGetValue (assembly, out found)) { // This can happen in dynamic context only - var def = new ImportedAssemblyDefinition (assembly, this); + var def = new ImportedAssemblyDefinition (assembly); assembly_2_definition.Add (assembly, def); def.ReadAttributes (); found = def; @@ -912,15 +963,14 @@ namespace Mono.CSharp // Test for a custom attribute type match. Custom attributes are not really predefined globaly // they can be assembly specific therefore we do check based on names only // - public bool HasAttribute (IList attributesData, string attrName, string attrNamespace) + public static bool HasAttribute (IList attributesData, string attrName, string attrNamespace) { if (attributesData.Count == 0) return false; - string ns, name; foreach (var attr in attributesData) { - GetCustomAttributeTypeName (attr, out ns, out name); - if (name == attrName && ns == attrNamespace) + var dt = attr.Constructor.DeclaringType; + if (dt.Name == attrName && dt.Namespace == attrNamespace) return true; } @@ -965,6 +1015,15 @@ namespace Mono.CSharp if (spec.BaseType != null) { var bifaces = spec.BaseType.Interfaces; if (bifaces != null) { + // + // Before adding base class interfaces close defined interfaces + // on type parameter + // + var tp = spec as TypeParameterSpec; + if (tp != null && tp.InterfacesDefined == null) { + tp.InterfacesDefined = TypeSpec.EmptyTypes; + } + foreach (var iface in bifaces) spec.AddInterface (iface); } @@ -984,10 +1043,9 @@ namespace Mono.CSharp ImportTypeParameterTypeConstraints (tp, tp.GetMetaInfo ()); } } - } - protected void ImportTypes (MetaType[] types, Namespace targetNamespace, bool hasExtensionTypes) + protected void ImportTypes (MetaType[] types, Namespace targetNamespace, bool importExtensionTypes) { Namespace ns = targetNamespace; string prev_namespace = null; @@ -1011,12 +1069,14 @@ namespace Mono.CSharp prev_namespace = t.Namespace; } - ns.AddType (module, it); - - if (it.IsStatic && hasExtensionTypes && + // Cannot rely on assembly level Extension attribute or static modifier because they + // are not followed by other compilers (e.g. F#). + if (it.IsClass && it.Arity == 0 && importExtensionTypes && HasAttribute (CustomAttributeData.GetCustomAttributes (t), "ExtensionAttribute", CompilerServicesNamespace)) { it.SetExtensionMethodContainer (); } + + ns.AddType (module, it); } } @@ -1033,12 +1093,13 @@ namespace Mono.CSharp continue; } - if (!IsMissingType (ct) && ct.IsClass) { - spec.BaseType = CreateType (ct); + var constraint_type = CreateType (ct); + if (constraint_type.IsClass) { + spec.BaseType = constraint_type; continue; } - spec.AddInterface (CreateType (ct)); + spec.AddInterface (constraint_type); } if (spec.BaseType == null) @@ -1133,10 +1194,9 @@ namespace Mono.CSharp if (attrs.Count == 0) return null; - string name, ns; foreach (var ca in attrs) { - GetCustomAttributeTypeName (ca, out ns, out name); - if (name != "DecimalConstantAttribute" || ns != CompilerServicesNamespace) + var dt = ca.Constructor.DeclaringType; + if (dt.Name != "DecimalConstantAttribute" || dt.Namespace != CompilerServicesNamespace) continue; var value = new decimal ( @@ -1228,11 +1288,11 @@ namespace Mono.CSharp // It should not throw any loading exception IList attrs = CustomAttributeData.GetCustomAttributes (mi); - string ns, name; foreach (var a in attrs) { - importer.GetCustomAttributeTypeName (a, out ns, out name); + var dt = a.Constructor.DeclaringType; + string name = dt.Name; if (name == "ObsoleteAttribute") { - if (ns != "System") + if (dt.Namespace != "System") continue; if (bag == null) @@ -1252,7 +1312,7 @@ namespace Mono.CSharp } if (name == "ConditionalAttribute") { - if (ns != "System.Diagnostics") + if (dt.Namespace != "System.Diagnostics") continue; if (bag == null) @@ -1266,7 +1326,7 @@ namespace Mono.CSharp } if (name == "CLSCompliantAttribute") { - if (ns != "System") + if (dt.Namespace != "System") continue; if (bag == null) @@ -1279,7 +1339,7 @@ namespace Mono.CSharp // Type only attributes if (mi.MemberType == MemberTypes.TypeInfo || mi.MemberType == MemberTypes.NestedType) { if (name == "DefaultMemberAttribute") { - if (ns != "System.Reflection") + if (dt.Namespace != "System.Reflection") continue; if (bag == null) @@ -1290,7 +1350,7 @@ namespace Mono.CSharp } if (name == "AttributeUsageAttribute") { - if (ns != "System") + if (dt.Namespace != "System") continue; if (bag == null) @@ -1308,7 +1368,7 @@ namespace Mono.CSharp // Interface only attribute if (name == "CoClassAttribute") { - if (ns != "System.Runtime.InteropServices") + if (dt.Namespace != "System.Runtime.InteropServices") continue; if (bag == null) @@ -1401,12 +1461,10 @@ namespace Mono.CSharp { readonly Module module; bool cls_compliant; - readonly MetadataImporter importer; - public ImportedModuleDefinition (Module module, MetadataImporter importer) + public ImportedModuleDefinition (Module module) { this.module = module; - this.importer = importer; } #region Properties @@ -1429,11 +1487,10 @@ namespace Mono.CSharp { IList attrs = CustomAttributeData.GetCustomAttributes (module); - string ns, name; foreach (var a in attrs) { - importer.GetCustomAttributeTypeName (a, out ns, out name); - if (name == "CLSCompliantAttribute") { - if (ns != "System") + var dt = a.Constructor.DeclaringType; + if (dt.Name == "CLSCompliantAttribute") { + if (dt.Namespace != "System") continue; cls_compliant = (bool) a.ConstructorArguments[0].Value; @@ -1482,18 +1539,15 @@ namespace Mono.CSharp { readonly Assembly assembly; readonly AssemblyName aname; - readonly MetadataImporter importer; bool cls_compliant; - bool contains_extension_methods; List internals_visible_to; Dictionary internals_visible_to_cache; - public ImportedAssemblyDefinition (Assembly assembly, MetadataImporter importer) + public ImportedAssemblyDefinition (Assembly assembly) { this.assembly = assembly; this.aname = assembly.GetName (); - this.importer = importer; } #region Properties @@ -1510,12 +1564,6 @@ namespace Mono.CSharp } } - public bool HasExtensionMethod { - get { - return contains_extension_methods; - } - } - public bool HasStrongName { get { return aname.GetPublicKey ().Length != 0; @@ -1608,31 +1656,21 @@ namespace Mono.CSharp IList attrs = CustomAttributeData.GetCustomAttributes (assembly); - string ns, name; foreach (var a in attrs) { - importer.GetCustomAttributeTypeName (a, out ns, out name); - + var dt = a.Constructor.DeclaringType; + var name = dt.Name; if (name == "CLSCompliantAttribute") { - if (ns == "System") { - try { - cls_compliant = (bool) a.ConstructorArguments[0].Value; - } catch { - } + if (dt.Namespace == "System") { + cls_compliant = (bool) a.ConstructorArguments[0].Value; } continue; } if (name == "InternalsVisibleToAttribute") { - if (ns != MetadataImporter.CompilerServicesNamespace) + if (dt.Namespace != MetadataImporter.CompilerServicesNamespace) continue; - string s; - try { - s = a.ConstructorArguments[0].Value as string; - } catch { - s = null; - } - + string s = a.ConstructorArguments[0].Value as string; if (s == null) continue; @@ -1643,13 +1681,6 @@ namespace Mono.CSharp internals_visible_to.Add (an); continue; } - - if (name == "ExtensionAttribute") { - if (ns == MetadataImporter.CompilerServicesNamespace) - contains_extension_methods = true; - - continue; - } } } @@ -1752,6 +1783,29 @@ namespace Mono.CSharp } } + bool ITypeDefinition.IsComImport { + get { + return ((MetaType) provider).IsImport; + } + } + + + bool ITypeDefinition.IsPartial { + get { + return false; + } + } + + bool ITypeDefinition.IsTypeForwarder { + get { +#if STATIC + return ((MetaType) provider).__IsTypeForwarder; +#else + return false; +#endif + } + } + public override string Name { get { if (name == null) { @@ -1798,7 +1852,15 @@ namespace Mono.CSharp // or referenced from the user core in which case compilation error has to // be reported because compiler cannot continue anyway // - foreach (var t in types) { + for (int i = 0; i < types.Count; ++i) { + var t = types [i]; + + // + // Report missing types only once per type + // + if (i > 0 && types.IndexOf (t) < i) + continue; + string name = t.GetSignatureForError (); if (t.MemberDefinition.DeclaringAssembly == ctx.Module.DeclaringAssembly) { @@ -1806,9 +1868,15 @@ namespace Mono.CSharp "Reference to type `{0}' claims it is defined in this assembly, but it is not defined in source or any added modules", name); } else if (t.MemberDefinition.DeclaringAssembly.IsMissing) { - ctx.Module.Compiler.Report.Error (12, loc, - "The type `{0}' is defined in an assembly that is not referenced. Consider adding a reference to assembly `{1}'", - name, t.MemberDefinition.DeclaringAssembly.FullName); + if (t.MemberDefinition.IsTypeForwarder) { + ctx.Module.Compiler.Report.Error (1070, loc, + "The type `{0}' has been forwarded to an assembly that is not referenced. Consider adding a reference to assembly `{1}'", + name, t.MemberDefinition.DeclaringAssembly.FullName); + } else { + ctx.Module.Compiler.Report.Error (12, loc, + "The type `{0}' is defined in an assembly that is not referenced. Consider adding a reference to assembly `{1}'", + name, t.MemberDefinition.DeclaringAssembly.FullName); + } } else { ctx.Module.Compiler.Report.Error (1684, loc, "Reference to type `{0}' claims it is defined assembly `{1}', but it could not be found", @@ -1896,7 +1964,13 @@ namespace Mono.CSharp if ((t.Attributes & TypeAttributes.VisibilityMask) == TypeAttributes.NestedPrivate && importer.IgnorePrivateMembers) continue; - imported = importer.CreateNestedType (t, declaringType); + try { + imported = importer.CreateNestedType (t, declaringType); + } catch (Exception e) { + throw new InternalErrorException (e, "Could not import nested type `{0}' from `{1}'", + t.FullName, declaringType.MemberDefinition.DeclaringAssembly.FullName); + } + cache.AddMemberImported (imported); } @@ -1913,6 +1987,15 @@ namespace Mono.CSharp } } + // + // Load base interfaces first to minic behaviour of compiled members + // + if (declaringType.IsInterface && declaringType.Interfaces != null) { + foreach (var iface in declaringType.Interfaces) { + cache.AddInterface (iface); + } + } + if (!onlyTypes) { // // The logic here requires methods to be returned first which seems to work for both Mono and .NET @@ -1920,6 +2003,10 @@ namespace Mono.CSharp foreach (var member in all) { switch (member.MemberType) { case MemberTypes.Constructor: + if (declaringType.IsInterface) + continue; + + goto case MemberTypes.Method; case MemberTypes.Method: MethodBase mb = (MethodBase) member; var attrs = mb.Attributes; @@ -1933,7 +2020,7 @@ namespace Mono.CSharp continue; // Ignore compiler generated methods - if (importer.HasAttribute (CustomAttributeData.GetCustomAttributes (mb), "CompilerGeneratedAttribute", MetadataImporter.CompilerServicesNamespace)) + if (MetadataImporter.HasAttribute (CustomAttributeData.GetCustomAttributes (mb), "CompilerGeneratedAttribute", MetadataImporter.CompilerServicesNamespace)) continue; } @@ -2040,13 +2127,10 @@ namespace Mono.CSharp throw new NotImplementedException (member.ToString ()); } - cache.AddMemberImported (imported); - } - } + if (imported.IsStatic && declaringType.IsInterface) + continue; - if (declaringType.IsInterface && declaringType.Interfaces != null) { - foreach (var iface in declaringType.Interfaces) { - cache.AddInterface (iface); + cache.AddMemberImported (imported); } } } @@ -2067,6 +2151,24 @@ namespace Mono.CSharp } } + bool ITypeDefinition.IsComImport { + get { + return false; + } + } + + bool ITypeDefinition.IsPartial { + get { + return false; + } + } + + bool ITypeDefinition.IsTypeForwarder { + get { + return false; + } + } + public string Namespace { get { return null;