// A list of hoisted parameters
protected List<HoistedParameter> hoisted_params;
+ List<HoistedParameter> hoisted_local_params;
protected List<HoistedVariable> hoisted_locals;
// Hoisted this
}
var hoisted = localVariable.HoistedVariant;
+ if (hoisted != null && hoisted.Storey != this && hoisted.Storey is StateMachine) {
+ // TODO: It's too late the field is defined in HoistedLocalVariable ctor
+ hoisted.Storey.hoisted_locals.Remove (hoisted);
+ hoisted = null;
+ }
+
if (hoisted == null) {
hoisted = new HoistedLocalVariable (this, localVariable, GetVariableMangledName (localVariable));
localVariable.HoistedVariant = hoisted;
hoisted_locals.Add (hoisted);
}
- if (ec.CurrentBlock.Explicit != localVariable.Block.Explicit)
+ if (ec.CurrentBlock.Explicit != localVariable.Block.Explicit && !(hoisted.Storey is StateMachine))
hoisted.Storey.AddReferenceFromChildrenBlock (ec.CurrentBlock.Explicit);
}
}
var hoisted = parameterInfo.Parameter.HoistedVariant;
+
+ if (parameterInfo.Block.StateMachine != null) {
+ //
+ // Another storey in same block exists but state machine does not
+ // have parameter captured. We need to add it there as well to
+ // proxy parameter value correctly.
+ //
+ if (hoisted == null && parameterInfo.Block.StateMachine != this) {
+ var storey = parameterInfo.Block.StateMachine;
+
+ hoisted = new HoistedParameter (storey, parameterReference);
+ parameterInfo.Parameter.HoistedVariant = hoisted;
+
+ if (storey.hoisted_params == null)
+ storey.hoisted_params = new List<HoistedParameter> ();
+
+ storey.hoisted_params.Add (hoisted);
+ }
+
+ //
+ // Lift captured parameter from value type storey to reference type one. Otherwise
+ // any side effects would be done on a copy
+ //
+ if (hoisted != null && hoisted.Storey != this && hoisted.Storey is StateMachine) {
+ if (hoisted_local_params == null)
+ hoisted_local_params = new List<HoistedParameter> ();
+
+ hoisted_local_params.Add (hoisted);
+ hoisted = null;
+ }
+ }
+
if (hoisted == null) {
- var storey = parameterInfo.Block.StateMachine ?? this;
- var hp = new HoistedParameter (storey, parameterReference);
- hoisted = hp;
+ hoisted = new HoistedParameter (this, parameterReference);
parameterInfo.Parameter.HoistedVariant = hoisted;
- if (storey.hoisted_params == null)
- storey.hoisted_params = new List<HoistedParameter> (2);
+ if (hoisted_params == null)
+ hoisted_params = new List<HoistedParameter> ();
- storey.hoisted_params.Add (hp);
+ hoisted_params.Add (hoisted);
}
//
// When the current context is async (or iterator) lift local storey
// instantiation to the currect storey
//
- if (ec.CurrentAnonymousMethod is StateMachineInitializer) {
+ if (ec.CurrentAnonymousMethod is StateMachineInitializer && (block.HasYield || block.HasAwait)) {
//
// Unfortunately, normal capture mechanism could not be used because we are
// too late in the pipeline and standart assign cannot be used either due to
ec.CurrentAnonymousMethod = ae;
}
- protected virtual void EmitHoistedParameters (EmitContext ec, IList<HoistedParameter> hoisted)
+ protected virtual void EmitHoistedParameters (EmitContext ec, List<HoistedParameter> hoisted)
{
foreach (HoistedParameter hp in hoisted) {
+ if (hp == null)
+ continue;
+
+ //
+ // Parameters could be proxied via local fields for value type storey
+ //
+ if (hoisted_local_params != null) {
+ var local_param = hoisted_local_params.Find (l => l.Parameter.Parameter == hp.Parameter.Parameter);
+ var source = new FieldExpr (local_param.Field, Location);
+ source.InstanceExpression = new CompilerGeneratedThis (CurrentType, Location);
+ hp.EmitAssign (ec, source, false, false);
+ continue;
+ }
+
hp.EmitHoistingAssignment (ec);
}
}
public override void Emit (EmitContext ec)
{
ResolveContext rc = new ResolveContext (ec.MemberContext);
- Expression e = hv.GetFieldExpression (ec).CreateExpressionTree (rc);
+ Expression e = hv.GetFieldExpression (ec).CreateExpressionTree (rc, false);
// This should never fail
e = e.Resolve (rc);
if (e != null)
public class HoistedParameter : HoistedVariable
{
- sealed class HoistedFieldAssign : Assign
+ sealed class HoistedFieldAssign : CompilerAssign
{
public HoistedFieldAssign (Expression target, Expression source)
- : base (target, source, source.Location)
+ : base (target, source, target.Location)
{
}
this.parameter = hp.parameter;
}
+ #region Properties
+
public Field Field {
get {
return field;
}
}
+ public bool IsAssigned { get; set; }
+
+ public ParameterReference Parameter {
+ get {
+ return parameter;
+ }
+ }
+
+ #endregion
+
public void EmitHoistingAssignment (EmitContext ec)
{
//
// Remove hoisted redirection to emit assignment from original parameter
//
- HoistedVariable temp = parameter.Parameter.HoistedVariant;
+ var temp = parameter.Parameter.HoistedVariant;
parameter.Parameter.HoistedVariant = null;
- Assign a = new HoistedFieldAssign (GetFieldExpression (ec), parameter);
- if (a.Resolve (new ResolveContext (ec.MemberContext)) != null)
- a.EmitStatement (ec);
+ var a = new HoistedFieldAssign (GetFieldExpression (ec), parameter);
+ a.EmitStatement (ec);
parameter.Parameter.HoistedVariant = temp;
}
}
}
+ public ReportPrinter TypeInferenceReportPrinter {
+ get; set;
+ }
+
#endregion
//
{
using (ec.With (ResolveContext.Options.InferReturnType, false)) {
using (ec.Set (ResolveContext.Options.ProbingMode)) {
- return Compatible (ec, delegate_type) != null;
+ var prev = ec.Report.SetPrinter (TypeInferenceReportPrinter ?? new NullReportPrinter ());
+
+ var res = Compatible (ec, delegate_type) != null;
+
+ ec.Report.SetPrinter (prev);
+
+ return res;
}
}
}
return delegate_type;
ec.Report.Error (835, loc, "Cannot convert `{0}' to an expression tree of non-delegate type `{1}'",
- GetSignatureForError (), TypeManager.CSharpName (delegate_type));
+ GetSignatureForError (), delegate_type.GetSignatureForError ());
return null;
}
ec.Report.Error (1660, loc, "Cannot convert `{0}' to non-delegate type `{1}'",
- GetSignatureForError (), TypeManager.CSharpName (delegate_type));
+ GetSignatureForError (), delegate_type.GetSignatureForError ());
return null;
}
if (!ec.IsInProbingMode)
ec.Report.Error (1661, loc,
"Cannot convert `{0}' to delegate type `{1}' since there is a parameter mismatch",
- GetSignatureForError (), TypeManager.CSharpName (delegate_type));
+ GetSignatureForError (), delegate_type.GetSignatureForError ());
return false;
}
return false;
ec.Report.Error (1593, loc, "Delegate `{0}' does not take `{1}' arguments",
- TypeManager.CSharpName (delegate_type), Parameters.Count.ToString ());
+ delegate_type.GetSignatureForError (), Parameters.Count.ToString ());
return false;
}
ec.Report.Error (1678, loc, "Parameter `{0}' is declared as type `{1}' but should be `{2}'",
(i+1).ToString (),
- TypeManager.CSharpName (Parameters.Types [i]),
- TypeManager.CSharpName (invoke_pd.Types [i]));
+ Parameters.Types [i].GetSignatureForError (),
+ invoke_pd.Types [i].GetSignatureForError ());
error = true;
}
}
if (d_params.Count != Parameters.Count)
return false;
+ var ptypes = Parameters.Types;
+ var dtypes = d_params.Types;
for (int i = 0; i < Parameters.Count; ++i) {
- if (type_inference.ExactInference (Parameters.Types[i], d_params.Types[i]) == 0)
+ if (type_inference.ExactInference (ptypes[i], dtypes[i]) == 0) {
+ //
+ // Continue when 0 (quick path) does not mean inference failure. Checking for
+ // same type handles cases like int -> int
+ //
+ if (ptypes[i] == dtypes[i])
+ continue;
+
return false;
+ }
}
return true;
}
using (ec.Set (ResolveContext.Options.ProbingMode | ResolveContext.Options.InferReturnType)) {
+ ReportPrinter prev;
+ if (TypeInferenceReportPrinter != null) {
+ prev = ec.Report.SetPrinter (TypeInferenceReportPrinter);
+ } else {
+ prev = null;
+ }
+
var body = CompatibleMethodBody (ec, tic, null, delegate_type);
if (body != null) {
am = body.Compatible (ec, body);
} else {
am = null;
}
+
+ if (TypeInferenceReportPrinter != null) {
+ ec.Report.SetPrinter (prev);
+ }
}
if (am == null)
}
} else {
am = body.Compatible (ec);
+
+ if (body.DirectMethodGroupConversion != null) {
+ var errors_printer = new SessionReportPrinter ();
+ var old = ec.Report.SetPrinter (errors_printer);
+ var expr = new ImplicitDelegateCreation (delegate_type, body.DirectMethodGroupConversion, loc) {
+ AllowSpecialMethodsInvocation = true
+ }.Resolve (ec);
+ ec.Report.SetPrinter (old);
+ if (expr != null && errors_printer.ErrorsCount == 0)
+ am = expr;
+ }
}
} catch (CompletionResult) {
throw;
return null;
}
- b = b.ConvertToAsyncTask (ec, ec.CurrentMemberDefinition.Parent.PartialContainer, p, return_type, loc);
+ b = b.ConvertToAsyncTask (ec, ec.CurrentMemberDefinition.Parent.PartialContainer, p, return_type, delegate_type, loc);
}
- return CompatibleMethodFactory (return_type ?? InternalType.Arglist, delegate_type, p, b);
+ return CompatibleMethodFactory (return_type ?? InternalType.ErrorType, delegate_type, p, b);
}
protected virtual AnonymousMethodBody CompatibleMethodFactory (TypeSpec return_type, TypeSpec delegate_type, ParametersCompiled p, ParametersBlock b)
}
}
- protected ParametersBlock block;
+ protected readonly ParametersBlock block;
public TypeSpec ReturnType;
BlockContext aec = new BlockContext (ec, block, ReturnType);
aec.CurrentAnonymousMethod = ae;
- ResolveContext.Options flags = 0;
-
var am = this as AnonymousMethodBody;
if (ec.HasSet (ResolveContext.Options.InferReturnType) && am != null) {
am.ReturnTypeInference = new TypeInferenceContext ();
}
- if (ec.IsInProbingMode)
- flags |= ResolveContext.Options.ProbingMode;
-
- if (ec.HasSet (ResolveContext.Options.FieldInitializerScope))
- flags |= ResolveContext.Options.FieldInitializerScope;
-
- if (ec.HasSet (ResolveContext.Options.ExpressionTreeConversion))
- flags |= ResolveContext.Options.ExpressionTreeConversion;
-
- aec.Set (flags);
+ var bc = ec as BlockContext;
+ if (bc != null)
+ aec.FlowOffset = bc.FlowOffset;
var errors = ec.Report.Errors;
get { return "anonymous method"; }
}
+ //
+ // Method-group instance for lambdas which can be replaced with
+ // simple method group call
+ //
+ public MethodGroupExpr DirectMethodGroupConversion {
+ get; set;
+ }
+
public override bool IsIterator {
get {
return false;
}
public override AnonymousMethodStorey Storey {
- get { return storey; }
+ get {
+ return storey;
+ }
}
#endregion
//
Modifiers modifiers;
+ TypeDefinition parent = null;
+
var src_block = Block.Original.Explicit;
if (src_block.HasCapturedVariable || src_block.HasCapturedThis) {
- storey = FindBestMethodStorey ();
+ parent = storey = FindBestMethodStorey ();
- //
- // Remove hoisted this demand when simple instance method is enough
- //
- if (storey == null && src_block.HasCapturedThis)
- src_block.ParametersBlock.TopBlock.RemoveThisReferenceFromChildrenBlock (src_block);
+ if (storey == null) {
+ var top_block = src_block.ParametersBlock.TopBlock;
+ var sm = top_block.StateMachine;
- //
- // For iterators we can host everything in one class
- //
- if (storey == null && Block.TopBlock.StateMachine is IteratorStorey)
- storey = block.TopBlock.StateMachine;
+ if (src_block.HasCapturedThis) {
+ //
+ // Remove hoisted 'this' request when simple instance method is
+ // enough (no hoisted variables only 'this')
+ //
+ if (src_block.ParametersBlock.StateMachine == null)
+ top_block.RemoveThisReferenceFromChildrenBlock (src_block);
+
+ //
+ // Special case where parent class is used to emit instance method
+ // because currect storey is of value type (async host). We cannot
+ // use ldftn on non-boxed instances either to share mutated state
+ //
+ if (sm != null && sm.Kind == MemberKind.Struct) {
+ parent = sm.Parent.PartialContainer;
+ }
+ }
+
+ //
+ // For iterators we can host everything in one class
+ //
+ if (sm is IteratorStorey)
+ parent = storey = sm;
+ }
modifiers = storey != null ? Modifiers.INTERNAL : Modifiers.PRIVATE;
} else {
if (ec.CurrentAnonymousMethod != null)
- storey = ec.CurrentAnonymousMethod.Storey;
+ parent = storey = ec.CurrentAnonymousMethod.Storey;
modifiers = Modifiers.STATIC | Modifiers.PRIVATE;
}
- var parent = storey != null ? storey : ec.CurrentTypeDefinition.Parent.PartialContainer;
+ if (parent == null)
+ parent = ec.CurrentTypeDefinition.Parent.PartialContainer;
string name = CompilerGeneratedContainer.MakeName (parent != storey ? block_name : null,
"m", null, ec.Module.CounterAnonymousMethods++);
//
method = DoCreateMethodHost (ec);
method.Define ();
+ method.PrepareEmit ();
}
bool is_static = (method.ModFlags & Modifiers.STATIC) != 0;
}
} else {
ec.EmitThis ();
+
+ //
+ // Special case for value type storey where this is not lifted but
+ // droped off to parent class
+ //
+ for (var b = Block.Parent; b != null; b = b.Parent) {
+ if (b.ParametersBlock.StateMachine != null) {
+ ec.Emit (OpCodes.Ldfld, b.ParametersBlock.StateMachine.HoistedThis.Field.Spec);
+ break;
+ }
+ }
}
var delegate_method = method.Spec;
public override string GetSignatureForError ()
{
- return TypeManager.CSharpName (type);
+ return type.GetSignatureForError ();
}
}
IntConstant FNV_prime = new IntConstant (Compiler.BuiltinTypes, 16777619, loc);
rs_hashcode = new Binary (Binary.Operator.Multiply,
- new Binary (Binary.Operator.ExclusiveOr, rs_hashcode, field_hashcode, loc),
- FNV_prime, loc);
+ new Binary (Binary.Operator.ExclusiveOr, rs_hashcode, field_hashcode),
+ FNV_prime);
Expression field_to_string = new Conditional (new BooleanExpression (new Binary (Binary.Operator.Inequality,
- new MemberAccess (new This (f.Location), f.Name), new NullLiteral (loc), loc)),
+ new MemberAccess (new This (f.Location), f.Name), new NullLiteral (loc))),
new Invocation (new MemberAccess (
new MemberAccess (new This (f.Location), f.Name), "ToString"), null),
new StringConstant (Compiler.BuiltinTypes, string.Empty, loc), loc);
string_concat,
new Binary (Binary.Operator.Addition,
new StringConstant (Compiler.BuiltinTypes, " " + p.Name + " = ", loc),
- field_to_string,
- loc),
- loc);
+ field_to_string));
continue;
}
string_concat = new Binary (Binary.Operator.Addition,
new Binary (Binary.Operator.Addition,
string_concat,
- new StringConstant (Compiler.BuiltinTypes, ", " + p.Name + " = ", loc),
- loc),
- field_to_string,
- loc);
+ new StringConstant (Compiler.BuiltinTypes, ", " + p.Name + " = ", loc)),
+ field_to_string);
- rs_equals = new Binary (Binary.Operator.LogicalAnd, rs_equals, field_equal, loc);
+ rs_equals = new Binary (Binary.Operator.LogicalAnd, rs_equals, field_equal);
}
string_concat = new Binary (Binary.Operator.Addition,
string_concat,
- new StringConstant (Compiler.BuiltinTypes, " }", loc),
- loc);
+ new StringConstant (Compiler.BuiltinTypes, " }", loc));
//
// Equals (object obj) override
new As (equals_block.GetParameterReference (0, loc),
current_type, loc), loc)));
- Expression equals_test = new Binary (Binary.Operator.Inequality, other_variable, new NullLiteral (loc), loc);
+ Expression equals_test = new Binary (Binary.Operator.Inequality, other_variable, new NullLiteral (loc));
if (rs_equals != null)
- equals_test = new Binary (Binary.Operator.LogicalAnd, equals_test, rs_equals, loc);
+ equals_test = new Binary (Binary.Operator.LogicalAnd, equals_test, rs_equals);
equals_block.AddStatement (new Return (equals_test, loc));
equals.Block = equals_block;
equals.Define ();
+ equals.PrepareEmit ();
Members.Add (equals);
//
var hash_variable = new LocalVariableReference (li_hash, loc);
hashcode_block.AddStatement (new StatementExpression (
new CompoundAssign (Binary.Operator.Addition, hash_variable,
- new Binary (Binary.Operator.LeftShift, hash_variable, new IntConstant (Compiler.BuiltinTypes, 13, loc), loc), loc)));
+ new Binary (Binary.Operator.LeftShift, hash_variable, new IntConstant (Compiler.BuiltinTypes, 13, loc)))));
hashcode_block.AddStatement (new StatementExpression (
new CompoundAssign (Binary.Operator.ExclusiveOr, hash_variable,
- new Binary (Binary.Operator.RightShift, hash_variable, new IntConstant (Compiler.BuiltinTypes, 7, loc), loc), loc)));
+ new Binary (Binary.Operator.RightShift, hash_variable, new IntConstant (Compiler.BuiltinTypes, 7, loc)))));
hashcode_block.AddStatement (new StatementExpression (
new CompoundAssign (Binary.Operator.Addition, hash_variable,
- new Binary (Binary.Operator.LeftShift, hash_variable, new IntConstant (Compiler.BuiltinTypes, 3, loc), loc), loc)));
+ new Binary (Binary.Operator.LeftShift, hash_variable, new IntConstant (Compiler.BuiltinTypes, 3, loc)))));
hashcode_block.AddStatement (new StatementExpression (
new CompoundAssign (Binary.Operator.ExclusiveOr, hash_variable,
- new Binary (Binary.Operator.RightShift, hash_variable, new IntConstant (Compiler.BuiltinTypes, 17, loc), loc), loc)));
+ new Binary (Binary.Operator.RightShift, hash_variable, new IntConstant (Compiler.BuiltinTypes, 17, loc)))));
hashcode_block.AddStatement (new StatementExpression (
new CompoundAssign (Binary.Operator.Addition, hash_variable,
- new Binary (Binary.Operator.LeftShift, hash_variable, new IntConstant (Compiler.BuiltinTypes, 5, loc), loc), loc)));
+ new Binary (Binary.Operator.LeftShift, hash_variable, new IntConstant (Compiler.BuiltinTypes, 5, loc)))));
hashcode_block.AddStatement (new Return (hash_variable, loc));
hashcode.Block = hashcode_top;
hashcode.Define ();
+ hashcode.PrepareEmit ();
Members.Add (hashcode);
//
tostring_block.AddStatement (new Return (string_concat, loc));
tostring.Block = tostring_block;
tostring.Define ();
+ tostring.PrepareEmit ();
Members.Add (tostring);
return true;
projects / mono.git / blobdiff