//
// TODO:
// Flow analysis for Yield.
-// Emit calls to parent object constructor.
+// Emit calls to base object constructor.
//
// Generics note:
// Current should be defined to return T, and IEnumerator.Current returns object
public class Yield : Statement {
public Expression expr;
- bool in_exc;
+ ArrayList finally_blocks;
public Yield (Expression expr, Location l)
{
public static bool CheckContext (EmitContext ec, Location loc)
{
- if (ec.CurrentBranching.InFinally (true)){
+ if (ec.InFinally) {
Report.Error (1625, loc, "Cannot yield in the body of a " +
"finally clause");
return false;
+ }
+
+ if (ec.InUnsafe) {
+ Report.Error (1629, loc, "Unsafe code may not appear in iterators");
+ return false;
}
- if (ec.CurrentBranching.InCatch ()){
+ if (ec.InCatch){
Report.Error (1631, loc, "Cannot yield in the body of a " +
"catch clause");
return false;
}
- if (ec.InAnonymousMethod){
- Report.Error (1621, loc, "yield statement can not appear " +
- "inside an anonymoud method");
+ if (ec.CurrentAnonymousMethod != null){
+ Report.Error (1621, loc, "The yield statement cannot be used inside anonymous method blocks");
return false;
}
- //
- // FIXME: Missing check for Yield inside try block that contains catch clauses
- //
+ if (ec.CurrentBranching.InTryWithCatch ()) {
+ Report.Error (1626, loc, "Cannot yield a value in the body of a " +
+ "try block with a catch clause");
+ return false;
+ }
return true;
}
if (!CheckContext (ec, loc))
return false;
- in_exc = ec.CurrentBranching.InTryOrCatch (false);
- Type iterator_type = ec.CurrentIterator.IteratorType;
- if (expr.Type != iterator_type){
- expr = Convert.ImplicitConversionRequired (ec, expr, iterator_type, loc);
+ Iterator iterator = ec.CurrentIterator;
+ if (expr.Type != iterator.IteratorType){
+ expr = Convert.ImplicitConversionRequired (
+ ec, expr, iterator.IteratorType, loc);
if (expr == null)
return false;
}
+
+ ec.CurrentBranching.StealFinallyClauses (ref finally_blocks);
return true;
}
protected override void DoEmit (EmitContext ec)
{
- ec.CurrentIterator.MarkYield (ec, expr, in_exc);
+ ec.CurrentIterator.MarkYield (ec, expr, finally_blocks);
}
}
protected override void DoEmit (EmitContext ec)
{
- ec.CurrentIterator.EmitYieldBreak (ec.ig, true);
+ ec.CurrentIterator.EmitYieldBreak (ec.ig);
}
}
public class Iterator : Class {
+ ToplevelBlock original_block;
+ ToplevelBlock block;
string original_name;
- Block original_block;
- Block block;
Type iterator_type;
TypeExpr iterator_type_expr;
//
// The state as we generate the iterator
//
- ArrayList resume_labels = new ArrayList ();
+ Label move_next_ok, move_next_error;
+ ArrayList resume_points = new ArrayList ();
int pc;
//
//
TypeContainer container;
Type return_type;
- Type [] param_types;
InternalParameters parameters;
+ protected enum State {
+ Uninitialized = -2,
+ After,
+ Running
+ }
+
static int proxy_count;
- public void EmitYieldBreak (ILGenerator ig, bool add_return)
+ public void EmitYieldBreak (ILGenerator ig)
{
ig.Emit (OpCodes.Ldarg_0);
- IntConstant.EmitInt (ig, -1);
+ IntConstant.EmitInt (ig, (int) State.After);
ig.Emit (OpCodes.Stfld, pc_field.FieldBuilder);
- if (add_return){
- ig.Emit (OpCodes.Ldc_I4_0);
- ig.Emit (OpCodes.Ret);
- }
+ ig.Emit (OpCodes.Br, move_next_error);
}
public void EmitMoveNext (EmitContext ec)
{
ILGenerator ig = ec.ig;
+ move_next_ok = ig.DefineLabel ();
+ move_next_error = ig.DefineLabel ();
+
+ LocalBuilder retval = ec.GetTemporaryLocal (TypeManager.int32_type);
+
+ ig.BeginExceptionBlock ();
+
Label dispatcher = ig.DefineLabel ();
ig.Emit (OpCodes.Br, dispatcher);
- Label entry_point = ig.DefineLabel ();
- ig.MarkLabel (entry_point);
- resume_labels.Add (entry_point);
- ec.EmitTopBlock (original_block, parameters, Location);
+ ResumePoint entry_point = new ResumePoint (null);
+ resume_points.Add (entry_point);
+ entry_point.Define (ig);
- EmitYieldBreak (ig, true);
+ ec.EmitTopBlock (original_block, parameters, Location);
+ EmitYieldBreak (ig);
- //
- // FIXME: Split the switch in blocks that can be consumed
- // by switch.
- //
ig.MarkLabel (dispatcher);
- Label [] labels = new Label [resume_labels.Count];
- resume_labels.CopyTo (labels);
+ Label [] labels = new Label [resume_points.Count];
+ for (int i = 0; i < labels.Length; i++)
+ labels [i] = ((ResumePoint) resume_points [i]).Label;
+
ig.Emit (OpCodes.Ldarg_0);
ig.Emit (OpCodes.Ldfld, pc_field.FieldBuilder);
ig.Emit (OpCodes.Switch, labels);
+
+ Label end = ig.DefineLabel ();
+
+ ig.MarkLabel (move_next_error);
ig.Emit (OpCodes.Ldc_I4_0);
+ ig.Emit (OpCodes.Stloc, retval);
+ ig.Emit (OpCodes.Leave, end);
+
+ ig.MarkLabel (move_next_ok);
+ ig.Emit (OpCodes.Ldc_I4_1);
+ ig.Emit (OpCodes.Stloc, retval);
+ ig.Emit (OpCodes.Leave, end);
+
+ ig.BeginFaultBlock ();
+
+ ig.Emit (OpCodes.Ldarg_0);
+ ig.Emit (OpCodes.Callvirt, dispose.MethodBuilder);
+
+ ig.EndExceptionBlock ();
+
+ ig.MarkLabel (end);
+ ig.Emit (OpCodes.Ldloc, retval);
ig.Emit (OpCodes.Ret);
}
+ public void EmitDispose (EmitContext ec)
+ {
+ ILGenerator ig = ec.ig;
+
+ Label end = ig.DefineLabel ();
+ Label dispatcher = ig.DefineLabel ();
+ ig.Emit (OpCodes.Br, dispatcher);
+
+ ec.RemapToProxy = true;
+ Label [] labels = new Label [resume_points.Count];
+ for (int i = 0; i < labels.Length; i++) {
+ ResumePoint point = (ResumePoint) resume_points [i];
+
+ if (point.FinallyBlocks == null) {
+ labels [i] = end;
+ continue;
+ }
+
+ labels [i] = ig.DefineLabel ();
+ ig.MarkLabel (labels [i]);
+
+ ig.BeginExceptionBlock ();
+ ig.BeginFinallyBlock ();
+
+ foreach (ExceptionStatement stmt in point.FinallyBlocks) {
+ if (stmt != null)
+ stmt.EmitFinally (ec);
+ }
+
+ ig.EndExceptionBlock ();
+ ig.Emit (OpCodes.Br, end);
+ }
+ ec.RemapToProxy = false;
+
+ ig.MarkLabel (dispatcher);
+ ig.Emit (OpCodes.Ldarg_0);
+ ig.Emit (OpCodes.Ldfld, pc_field.FieldBuilder);
+ ig.Emit (OpCodes.Switch, labels);
+
+ ig.Emit (OpCodes.Ldarg_0);
+ IntConstant.EmitInt (ig, (int) State.After);
+ ig.Emit (OpCodes.Stfld, pc_field.FieldBuilder);
+
+ ig.MarkLabel (end);
+ }
+
+ protected class ResumePoint
+ {
+ public Label Label;
+ public readonly ExceptionStatement[] FinallyBlocks;
+
+ public ResumePoint (ArrayList list)
+ {
+ if (list != null) {
+ FinallyBlocks = new ExceptionStatement [list.Count];
+ list.CopyTo (FinallyBlocks, 0);
+ }
+ }
+
+ public void Define (ILGenerator ig)
+ {
+ Label = ig.DefineLabel ();
+ ig.MarkLabel (Label);
+ }
+ }
+
//
// Invoked when a local variable declaration needs to be mapped to
// a field in our proxy class
if (fb != null)
return fb;
- fb = TypeBuilder.DefineField (full_name, t, FieldAttributes.Public);
+ fb = TypeBuilder.DefineField (full_name, t, FieldAttributes.Private);
fields.Add (full_name, fb);
return fb;
}
-
+
//
// Called back from Yield
//
- public void MarkYield (EmitContext ec, Expression expr, bool in_exc)
+ public void MarkYield (EmitContext ec, Expression expr,
+ ArrayList finally_blocks)
{
ILGenerator ig = ec.ig;
ig.Emit (OpCodes.Stfld, pc_field.FieldBuilder);
// Return ok
- ig.Emit (OpCodes.Ldc_I4_1);
+ ig.Emit (OpCodes.Br, move_next_ok);
- // Find out how to "leave"
- if (in_exc || !ec.IsLastStatement)
- ig.Emit (OpCodes.Stloc, ec.TemporaryReturn ());
+ ResumePoint point = new ResumePoint (finally_blocks);
+ resume_points.Add (point);
+ point.Define (ig);
+ }
- if (in_exc){
- ec.NeedReturnLabel ();
- ig.Emit (OpCodes.Leave, ec.ReturnLabel);
- } else if (ec.IsLastStatement){
- ig.Emit (OpCodes.Ret);
- } else {
- ec.NeedReturnLabel ();
- ig.Emit (OpCodes.Br, ec.ReturnLabel);
- }
-
- Label resume_point = ig.DefineLabel ();
- ig.MarkLabel (resume_point);
- resume_labels.Add (resume_point);
+ public void MarkFinally (EmitContext ec, ArrayList finally_blocks)
+ {
+ ILGenerator ig = ec.ig;
+
+ // increment pc
+ pc++;
+ ig.Emit (OpCodes.Ldarg_0);
+ IntConstant.EmitInt (ig, pc);
+ ig.Emit (OpCodes.Stfld, pc_field.FieldBuilder);
+
+ ResumePoint point = new ResumePoint (finally_blocks);
+ resume_points.Add (point);
+ point.Define (ig);
}
- private static string MakeProxyName (string name)
+ private static MemberName MakeProxyName (string name)
{
int pos = name.LastIndexOf ('.');
if (pos > 0)
name = name.Substring (pos + 1);
- return "<" + name + ">__" + (proxy_count++);
+ return new MemberName ("<" + name + ">__" + (proxy_count++));
}
//
// Our constructor
//
public Iterator (TypeContainer container, string name, Type return_type,
- Type [] param_types, InternalParameters parameters,
- int modifiers, Block block, Location loc)
+ InternalParameters parameters,
+ int modifiers, ToplevelBlock block, Location loc)
: base (container.NamespaceEntry, container, MakeProxyName (name),
- Modifiers.PRIVATE, null, loc)
+ (modifiers & Modifiers.UNSAFE) | Modifiers.PRIVATE, null, loc)
{
this.container = container;
this.return_type = return_type;
- this.param_types = param_types;
this.parameters = parameters;
this.original_name = name;
this.original_block = block;
- this.block = new Block (null);
+ this.block = new ToplevelBlock (loc);
fields = new Hashtable ();
is_static = (modifiers & Modifiers.STATIC) != 0;
}
- public bool Define ()
+ public bool DefineIterator ()
{
+ ec = new EmitContext (this, Mono.CSharp.Location.Null, null, null, ModFlags);
+
if (!CheckType (return_type)) {
Report.Error (
1624, Location,
"Iterators cannot have ref or out parameters");
return false;
}
+
+ if ((mod & Parameter.Modifier.ARGLIST) != 0) {
+ Report.Error (1636, Location, "__arglist is not allowed in parameter list of iterators");
+ return false;
+ }
+
+ if (parameters.ParameterType (i).IsPointer) {
+ Report.Error (1637, Location, "Iterators cannot have unsafe parameters or yield types");
+ return false;
+ }
}
ArrayList list = new ArrayList ();
//
// Returns the new block for the method, or null on failure
//
- protected override bool DoDefineType ()
+ protected override bool DefineNestedTypes ()
{
Define_Fields ();
Define_Constructor ();
Create_Block ();
- return true;
+ return base.DefineNestedTypes ();
}
Field pc_field;
Field current_field;
+ Method dispose;
+
public Field this_field;
public Field[] parameter_fields;
if (!is_static) {
Type t = container.TypeBuilder;
args.Add (new Argument (
- new SimpleParameterReference (t, 0, Location),
- Argument.AType.Expression));
+ new ThisParameterReference (t, 0, Location)));
}
+ args.Add (new Argument (new BoolLiteral (false)));
+
for (int i = 0; i < parameters.Count; i++) {
Type t = parameters.ParameterType (i);
args.Add (new Argument (
- new SimpleParameterReference (t, first + i, Location),
- Argument.AType.Expression));
+ new SimpleParameterReference (t, first + i, Location)));
}
Expression new_expr = new New (
Location loc = Location.Null;
pc_field = new Field (
- TypeManager.system_int32_expr, Modifiers.PRIVATE, "PC",
+ this, TypeManager.system_int32_expr, Modifiers.PRIVATE, "PC",
null, null, loc);
AddField (pc_field);
current_field = new Field (
- iterator_type_expr, Modifiers.PRIVATE, "current",
+ this, iterator_type_expr, Modifiers.PRIVATE, "current",
null, null, loc);
AddField (current_field);
if (!is_static) {
this_field = new Field (
+ this,
new TypeExpression (container.TypeBuilder, Location),
Modifiers.PRIVATE, "this", null, null, loc);
AddField (this_field);
"field{0}_{1}", i, parameters.ParameterName (i));
parameter_fields [i] = new Field (
+ this,
new TypeExpression (parameters.ParameterType (i), loc),
Modifiers.PRIVATE, fname, null, null, loc);
AddField (parameter_fields [i]);
{
Parameters ctor_params;
- if (!is_static) {
- Parameter this_param = new Parameter (
+ ArrayList list = new ArrayList ();
+
+ if (!is_static)
+ list.Add (new Parameter (
new TypeExpression (container.TypeBuilder, Location),
- "this", Parameter.Modifier.NONE, null);
-
- Parameter[] old_fixed = parameters.Parameters.FixedParameters;
- Parameter[] fixed_params;
- if (old_fixed != null) {
- fixed_params = new Parameter [old_fixed.Length + 1];
- old_fixed.CopyTo (fixed_params, 1);
- } else {
- fixed_params = new Parameter [1];
- }
- fixed_params [0] = this_param;
+ "this", Parameter.Modifier.NONE,
+ null, Location));
+ list.Add (new Parameter (
+ TypeManager.system_boolean_expr, "initialized",
+ Parameter.Modifier.NONE, null, Location));
- ctor_params = new Parameters (
- fixed_params, parameters.Parameters.ArrayParameter,
- Location);
- } else
- ctor_params = parameters.Parameters;
+ Parameter[] old_fixed = parameters.Parameters.FixedParameters;
+ if (old_fixed != null)
+ list.AddRange (old_fixed);
+
+ Parameter[] fixed_params = new Parameter [list.Count];
+ list.CopyTo (fixed_params);
+
+ ctor_params = new Parameters (
+ fixed_params, parameters.Parameters.ArrayParameter);
Constructor ctor = new Constructor (
this, Name, Modifiers.PUBLIC, ctor_params,
Location);
AddConstructor (ctor);
- Block block = ctor.Block = new Block (null);
+ ToplevelBlock block = ctor.Block = new ToplevelBlock (Location);
if (!is_static) {
Type t = container.TypeBuilder;
block.AddStatement (new StatementExpression (assign, Location));
}
- int first = is_static ? 1 : 2;
+ int first = is_static ? 2 : 3;
for (int i = 0; i < parameters.Count; i++) {
Type t = parameters.ParameterType (i);
block.AddStatement (new StatementExpression (assign, Location));
}
+
+ State initial = is_enumerable ? State.Uninitialized : State.Running;
+ block.AddStatement (new SetState (this, initial, Location));
+
+ block.AddStatement (new If (
+ new SimpleParameterReference (
+ TypeManager.bool_type, first - 1, Location),
+ new SetState (this, State.Running, Location),
+ Location));
}
Statement Create_ThrowInvalidOperation ()
void Define_Current ()
{
- Block get_block = new Block (null);
+ ToplevelBlock get_block = new ToplevelBlock (Location);
+ MemberName left = new MemberName ("System.Collections.IEnumerator");
+ MemberName name = new MemberName (left, "Current");
get_block.AddStatement (new If (
new Binary (
Binary.Operator.LessThanOrEqual,
new FieldExpression (pc_field),
- new IntLiteral (0), Location),
+ new IntLiteral ((int) State.Running), Location),
Create_ThrowInvalidOperation (),
new Return (
new FieldExpression (current_field), Location),
Location));
- Accessor getter = new Accessor (get_block, null);
+ Accessor getter = new Accessor (get_block, 0, null, Location);
Property current = new Property (
- this, iterator_type_expr, Modifiers.PUBLIC,
- false, "Current", null, getter, null, Location);
+ this, iterator_type_expr, 0,
+ false, name, null, getter, null, Location);
AddProperty (current);
}
{
Method move_next = new Method (
this, TypeManager.system_boolean_expr,
- Modifiers.PUBLIC, false, "MoveNext",
+ Modifiers.PUBLIC, false, new MemberName ("MoveNext"),
Parameters.EmptyReadOnlyParameters, null,
Location.Null);
AddMethod (move_next);
- Block block = move_next.Block = new Block (null);
+ ToplevelBlock block = move_next.Block = new ToplevelBlock (Location);
MoveNextMethod inline = new MoveNextMethod (this, Location);
block.AddStatement (inline);
void Define_GetEnumerator ()
{
+ MemberName left = new MemberName ("System.Collections.IEnumerable");
+ MemberName name = new MemberName (left, "GetEnumerator");
+
Method get_enumerator = new Method (
this,
new TypeExpression (TypeManager.ienumerator_type, Location),
- Modifiers.PUBLIC, false, "GetEnumerator",
+ 0, false, name,
Parameters.EmptyReadOnlyParameters, null,
Location.Null);
AddMethod (get_enumerator);
- get_enumerator.Block = new Block (null);
+ get_enumerator.Block = new ToplevelBlock (Location);
+
+ Expression ce = new MemberAccess (
+ new SimpleName ("System.Threading.Interlocked", Location),
+ "CompareExchange", Location);
+
+ Expression pc = new FieldExpression (pc_field);
+ Expression before = new IntLiteral ((int) State.Running);
+ Expression uninitialized = new IntLiteral ((int) State.Uninitialized);
+
+ ArrayList args = new ArrayList ();
+ args.Add (new Argument (pc, Argument.AType.Ref));
+ args.Add (new Argument (before, Argument.AType.Expression));
+ args.Add (new Argument (uninitialized, Argument.AType.Expression));
+
+ get_enumerator.Block.AddStatement (new If (
+ new Binary (
+ Binary.Operator.Equality,
+ new Invocation (ce, args, Location),
+ uninitialized, Location),
+ new Return (new This (block, Location), Location),
+ Location));
+
+ args = new ArrayList ();
+ if (!is_static)
+ args.Add (new Argument (new FieldExpression (this_field)));
+
+ args.Add (new Argument (new BoolLiteral (true)));
+
+ for (int i = 0; i < parameters.Count; i++)
+ args.Add (new Argument (
+ new FieldExpression (parameter_fields [i])));
- This the_this = new This (block, Location);
- get_enumerator.Block.AddStatement (new Return (the_this, Location));
+ Expression new_expr = new New (
+ new TypeExpression (TypeBuilder, Location), args, Location);
+ get_enumerator.Block.AddStatement (new Return (new_expr, Location));
}
protected class SimpleParameterReference : Expression
}
public override void Emit (EmitContext ec)
+ {
+ DoEmit (ec);
+ }
+
+ protected virtual void DoEmit (EmitContext ec)
{
ParameterReference.EmitLdArg (ec.ig, idx);
}
}
+ protected class ThisParameterReference : SimpleParameterReference
+ {
+ public ThisParameterReference (Type type, int idx, Location loc)
+ : base (type, idx, loc)
+ { }
+
+ protected override void DoEmit (EmitContext ec)
+ {
+ base.DoEmit (ec);
+ if (ec.TypeContainer is Struct)
+ ec.ig.Emit (OpCodes.Ldobj, type);
+ }
+ }
+
protected class FieldExpression : Expression
{
Field field;
this.field = field;
}
+ public override Expression DoResolveLValue (EmitContext ec, Expression right_side)
+ {
+ return DoResolve (ec);
+ }
+
public override Expression DoResolve (EmitContext ec)
{
FieldExpr fexpr = new FieldExpr (field.FieldBuilder, loc);
}
}
- public class MoveNextMethod : Statement {
+ protected class MoveNextMethod : Statement {
Iterator iterator;
public MoveNextMethod (Iterator iterator, Location loc)
if (iterator.is_static)
code_flags |= Modifiers.STATIC;
+ code_flags |= iterator.ModFlags & Modifiers.UNSAFE;
+
EmitContext new_ec = new EmitContext (
iterator.container, loc, ec.ig,
TypeManager.int32_type, code_flags);
}
}
- protected class DoYieldBreak : Statement
+ protected class DisposeMethod : Statement {
+ Iterator iterator;
+
+ public DisposeMethod (Iterator iterator, Location loc)
+ {
+ this.loc = loc;
+ this.iterator = iterator;
+ }
+
+ public override bool Resolve (EmitContext ec)
+ {
+ return true;
+ }
+
+ protected override void DoEmit (EmitContext ec)
+ {
+ iterator.EmitDispose (ec);
+ }
+ }
+
+ protected class StatementList : Statement {
+ ArrayList statements;
+
+ public StatementList (Location loc)
+ {
+ this.loc = loc;
+ statements = new ArrayList ();
+ }
+
+ public void Add (Statement statement)
+ {
+ statements.Add (statement);
+ }
+
+ public override bool Resolve (EmitContext ec)
+ {
+ foreach (Statement stmt in statements) {
+ if (!stmt.Resolve (ec))
+ return false;
+ }
+
+ return true;
+ }
+
+ protected override void DoEmit (EmitContext ec)
+ {
+ foreach (Statement stmt in statements)
+ stmt.Emit (ec);
+ }
+ }
+
+ protected class SetState : Statement
{
Iterator iterator;
- bool add_return;
+ State state;
- public DoYieldBreak (Iterator iterator, bool add_return,
- Location loc)
+ public SetState (Iterator iterator, State state, Location loc)
{
this.iterator = iterator;
- this.add_return = add_return;
+ this.state = state;
this.loc = loc;
}
public override bool Resolve (EmitContext ec)
{
- if (add_return)
- ec.CurrentBranching.CurrentUsageVector.Return ();
return true;
}
protected override void DoEmit (EmitContext ec)
{
- iterator.EmitYieldBreak (ec.ig, add_return);
+ ec.ig.Emit (OpCodes.Ldarg_0);
+ IntConstant.EmitInt (ec.ig, (int) state);
+ ec.ig.Emit (OpCodes.Stfld, iterator.pc_field.FieldBuilder);
}
}
{
Method reset = new Method (
this, TypeManager.system_void_expr, Modifiers.PUBLIC,
- false, "Reset", Parameters.EmptyReadOnlyParameters,
- null, Location);
+ false, new MemberName ("Reset"),
+ Parameters.EmptyReadOnlyParameters, null, Location);
AddMethod (reset);
- reset.Block = new Block (null);
+ reset.Block = new ToplevelBlock (Location);
reset.Block.AddStatement (Create_ThrowNotSupported ());
}
void Define_Dispose ()
{
- Method dispose = new Method (
+ dispose = new Method (
this, TypeManager.system_void_expr, Modifiers.PUBLIC,
- false, "Dispose", Parameters.EmptyReadOnlyParameters,
- null, Location);
+ false, new MemberName ("Dispose"),
+ Parameters.EmptyReadOnlyParameters, null, Location);
AddMethod (dispose);
- dispose.Block = new Block (null);
- dispose.Block.AddStatement (new DoYieldBreak (this, false, Location));
- dispose.Block.AddStatement (new Return (null, Location));
+ dispose.Block = new ToplevelBlock (Location);
+ dispose.Block.AddStatement (new DisposeMethod (this, Location));
}
- public Block Block {
+ public ToplevelBlock Block {
get { return block; }
}
projects / mono.git / blobdiff