using System.Diagnostics;
using Mono.CompilerServices.SymbolWriter;
-#if NET_2_1
+#if MOBILE
using XmlElement = System.Object;
#endif
throw new InternalErrorException (tc, e);
}
}
+
+ if (PartialContainer != null && PartialContainer != this) {
+ containers = null;
+ }
}
return true;
}
}
+ public bool HasInstanceField {
+ get {
+ return (caching_flags & Flags.HasInstanceField) != 0;
+ }
+ set {
+ caching_flags |= Flags.HasInstanceField;
+ }
+ }
+
// Indicated whether container has StructLayout attribute set Explicit
public bool HasExplicitLayout {
get { return (caching_flags & Flags.HasExplicitLayout) != 0; }
if ((field.ModFlags & Modifiers.STATIC) != 0)
return true;
- var first_field = PartialContainer.first_nonstatic_field;
- if (first_field == null) {
+ if (!PartialContainer.HasInstanceField) {
+ PartialContainer.HasInstanceField = true;
PartialContainer.first_nonstatic_field = field;
return true;
}
- if (Kind == MemberKind.Struct && first_field.Parent != field.Parent) {
- Report.SymbolRelatedToPreviousError (first_field.Parent);
- Report.Warning (282, 3, field.Location,
- "struct instance field `{0}' found in different declaration from instance field `{1}'",
- field.GetSignatureForError (), first_field.GetSignatureForError ());
+ if (Kind == MemberKind.Struct) {
+ var first_field = PartialContainer.first_nonstatic_field;
+ if (first_field.Parent != field.Parent) {
+ Report.SymbolRelatedToPreviousError (first_field.Parent);
+ Report.Warning (282, 3, field.Location,
+ "struct instance field `{0}' found in different declaration from instance field `{1}'",
+ field.GetSignatureForError (), first_field.GetSignatureForError ());
+ }
}
+
return true;
}
//
// Sets .size to 1 for structs with no instance fields
//
- int type_size = Kind == MemberKind.Struct && first_nonstatic_field == null && !(this is StateMachine) ? 1 : 0;
+ int type_size = Kind == MemberKind.Struct && !HasInstanceField && !(this is StateMachine) ? 1 : 0;
var parent_def = Parent as TypeDefinition;
if (parent_def == null) {
targs.Arguments = new TypeSpec[hoisted_tparams.Length];
for (int i = 0; i < hoisted_tparams.Length; ++i) {
var tp = hoisted_tparams[i];
- var local_tp = new TypeParameter (tp, null, new MemberName (tp.Name, Location), null);
+ var tp_name = tp.Name;
+#if DEBUG
+ tp_name += "_Proxy";
+#endif
+ var local_tp = new TypeParameter (tp, null, new MemberName (tp_name, Location), null);
tparams.Add (local_tp);
targs.Add (new SimpleName (tp.Name, Location));
var mutator = new TypeParameterMutator (hoisted_tparams, tparams);
return_type = mutator.Mutate (return_type);
local_param_types = mutator.Mutate (local_param_types);
+
+ var inflator = new TypeParameterInflator (this, null, hoisted_tparams, targs.Arguments);
+ for (int i = 0; i < hoisted_tparams.Length; ++i) {
+ var tp_spec = (TypeParameterSpec) targs.Arguments [i];
+ tp_spec.InflateConstraints (inflator, tp_spec);
+ }
} else {
member_name = new MemberName (name);
}
base_parameters[i].Resolve (this, i);
}
- var cloned_params = ParametersCompiled.CreateFullyResolved (base_parameters, method.Parameters.Types);
+ var cloned_params = ParametersCompiled.CreateFullyResolved (base_parameters, local_param_types);
if (method.Parameters.HasArglist) {
cloned_params.FixedParameters[0] = new Parameter (null, "__arglist", Parameter.Modifier.NONE, null, Location);
cloned_params.Types[0] = Module.PredefinedTypes.RuntimeArgumentHandle.Resolve ();
public override void ExpandBaseInterfaces ()
{
+ DoResolveTypeParameters ();
+
if (!IsPartialPart)
DoExpandBaseInterfaces ();
protected override void DoDefineContainer ()
{
DefineBaseTypes ();
-
- DoResolveTypeParameters ();
}
//
this.spec = spec;
current_type = null;
if (class_partial_parts != null) {
- foreach (var part in class_partial_parts)
+ foreach (var part in class_partial_parts) {
part.spec = spec;
+ part.current_type = null;
+ }
}
}
public override void Emit ()
{
+ if (Interfaces != null) {
+ foreach (var iface in Interfaces) {
+ if (iface.HasNamedTupleElement) {
+ throw new NotImplementedException ("named tuples for .interfaceimpl");
+ }
+ }
+ }
+
if (OptAttributes != null)
OptAttributes.Emit ();
Module.PredefinedAttributes.CompilerGenerated.EmitAttribute (TypeBuilder);
#if STATIC
+ if (Kind == MemberKind.Struct && !HasStructLayout && HasInstanceField) {
+ TypeBuilder.__SetLayout (0, 0);
+ }
+
if ((TypeBuilder.Attributes & TypeAttributes.StringFormatMask) == 0 && Module.HasDefaultCharSet)
TypeBuilder.__SetAttributes (TypeBuilder.Attributes | Module.DefaultCharSetType);
#endif
// return null;
var container = PartialContainer.CurrentType;
- return MemberCache.FindNestedType (container, name, arity);
+ return MemberCache.FindNestedType (container, name, arity, false);
}
public void Mark_HasEquals ()
if ((ModFlags & Modifiers.METHOD_EXTENSION) != 0)
Module.PredefinedAttributes.Extension.EmitAttribute (TypeBuilder);
- if (base_type != null && base_type.HasDynamicElement) {
- Module.PredefinedAttributes.Dynamic.EmitAttribute (TypeBuilder, base_type, Location);
+ if (base_type != null) {
+ if (base_type.HasDynamicElement)
+ Module.PredefinedAttributes.Dynamic.EmitAttribute (TypeBuilder, base_type, Location);
+ if (base_type.HasNamedTupleElement)
+ Module.PredefinedAttributes.TupleElementNames.EmitAttribute (TypeBuilder, base_type, Location);
}
}
Modifiers.PROTECTED |
Modifiers.INTERNAL |
Modifiers.UNSAFE |
- Modifiers.PRIVATE;
+ Modifiers.PRIVATE |
+ Modifiers.READONLY;
public Struct (TypeContainer parent, MemberName name, Modifiers mod, Attributes attrs)
: base (parent, name, attrs, MemberKind.Struct)
public override void Emit ()
{
+ if ((ModFlags & Modifiers.READONLY) != 0)
+ Module.PredefinedAttributes.IsReadOnly.EmitAttribute (TypeBuilder);
+
CheckStructCycles ();
base.Emit ();
return false;
}
- if (first_nonstatic_field != null) {
+ if (HasInstanceField) {
requires_delayed_unmanagedtype_check = true;
foreach (var member in Members) {
ok = false;
}
- var base_member_type = ((IInterfaceMemberSpec) base_member).MemberType;
+ var base_member_type = ((IInterfaceMemberSpec)base_member).MemberType;
if (!TypeSpecComparer.Override.IsEqual (MemberType, base_member_type)) {
Report.SymbolRelatedToPreviousError (base_member);
- if (this is PropertyBasedMember) {
+ if (((base_member_type.Kind ^ MemberType.Kind) & MemberKind.ByRef) != 0) {
+ Report.Error (8148, Location, "`{0}': must {2}return by reference to match overridden member `{1}'",
+ GetSignatureForError (), base_member.GetSignatureForError (), base_member_type.Kind == MemberKind.ByRef ? "" : "not ");
+ } else if (this is PropertyBasedMember) {
Report.Error (1715, Location, "`{0}': type must be `{1}' to match overridden member `{2}'",
GetSignatureForError (), base_member_type.GetSignatureForError (), base_member.GetSignatureForError ());
} else {
GetSignatureForError (), base_member_type.GetSignatureForError (), base_member.GetSignatureForError ());
}
ok = false;
+ } else if (!NamedTupleSpec.CheckOverrideName (MemberType, base_member_type)) {
+ // CSC: Should be different error code
+ Report.Error (8139, Location, "`{0}': cannot change return type tuple element names when overriding inherited member `{1}'",
+ GetSignatureForError (), base_member.GetSignatureForError ());
+ ok = false;
+ }
+
+ var base_params = base_member as IParametersMember;
+ if (base_params != null) {
+ if (!NamedTupleSpec.CheckOverrideName ((IParametersMember)this, base_params)) {
+ Report.Error (8139, Location, "`{0}': cannot change tuple element names when overriding inherited member `{1}'",
+ GetSignatureForError (), base_member.GetSignatureForError ());
+ ok = false;
+ }
}
return ok;
projects / mono.git / blobdiff