protected T machine_initializer;
int resume_pc;
ExceptionStatement inside_try_block;
+ TryCatch inside_catch_block;
protected YieldStatement (Expression expr, Location l)
{
machine_initializer = bc.CurrentAnonymousMethod as T;
inside_try_block = bc.CurrentTryBlock;
+ inside_catch_block = bc.CurrentTryCatch;
return true;
}
if (inside_try_block == null) {
resume_pc = machine_initializer.AddResumePoint (this);
} else {
- resume_pc = inside_try_block.AddResumePoint (this, resume_pc, machine_initializer);
+ resume_pc = inside_try_block.AddResumePoint (this, resume_pc, machine_initializer, inside_catch_block);
unwind_protect = true;
inside_try_block = null;
}
Field pc_field;
StateMachineMethod method;
- int local_name_idx;
protected StateMachine (ParametersBlock block, TypeDefinition parent, MemberBase host, TypeParameters tparams, string name, MemberKind kind)
: base (block, parent, host, tparams, name, kind)
return base.DoDefineMembers ();
}
- protected override string GetVariableMangledName (LocalVariable local_info)
+ protected override string GetVariableMangledName (ResolveContext rc, LocalVariable local_info)
{
if (local_info.IsCompilerGenerated)
- return base.GetVariableMangledName (local_info);
+ return base.GetVariableMangledName (rc, local_info);
- return "<" + local_info.Name + ">__" + local_name_idx++.ToString ("X");
+ //
+ // Special format which encodes original variable name and
+ // it's scope to support lifted variables debugging. This
+ // is same what csc does and allows to correctly set fields
+ // scope information (like ambiguity, our of scope, etc).
+ //
+ var id = rc.CurrentBlock.Explicit.GetDebugSymbolScopeIndex ();
+ return "<" + local_info.Name + ">__" + id;
}
}