Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -825,28 +825,16 @@ namespace System.Runtime.CompilerServices
// so that they won't "leak" out of the first await.
Thread currentThread = Thread.CurrentThread;
#if MONO
ExecutionContext.Switcher ecs = default (ExecutionContext.Switcher);
#else
ExecutionContextSwitcher ecs = default(ExecutionContextSwitcher);
#endif
RuntimeHelpers.PrepareConstrainedRegions();
try
{
#if MONO
currentThread.BranchExecutionContext (out ecs);
#else
ExecutionContext.EstablishCopyOnWriteScope(currentThread, false, ref ecs);
#endif
stateMachine.MoveNext();
}
finally
{
#if MONO
currentThread.RestoreExecutionContext (ref ecs);
#else
ecs.Undo(currentThread);
#endif
}
}