From 5d624eb52a8afc5f47a241bc0106f9c04b1771a1 Mon Sep 17 00:00:00 2001
From: Marek Safar <marek.safar@gmail.com>
Date: Fri, 16 Mar 2012 14:08:18 +0000
Subject: [PATCH] Emit better code for binary await expression with constants

---
 mcs/mcs/async.cs             |   8 +-
 mcs/mcs/ecore.cs             |  11 +
 mcs/mcs/expression.cs        |  21 ++
 mcs/tests/test-async-13.cs   |  13 +
 mcs/tests/ver-il-net_4_5.xml | 638 +++++++++++++++++++------------------------
 5 files changed, 333 insertions(+), 358 deletions(-)

diff --git a/mcs/mcs/async.cs b/mcs/mcs/async.cs
index c539ce8da11..5fcc12827c8 100644
--- a/mcs/mcs/async.cs
+++ b/mcs/mcs/async.cs
@@ -40,6 +40,12 @@ namespace Mono.CSharp
 			}
 		}
 
+		public AwaitStatement Statement {
+			get {
+				return stmt;
+			}
+		}
+
 		protected override void CloneTo (CloneContext clonectx, Expression target)
 		{
 			var t = (Await) target;
@@ -113,7 +119,7 @@ namespace Mono.CSharp
 		}
 	}
 
-	class AwaitStatement : YieldStatement<AsyncInitializer>
+	public class AwaitStatement : YieldStatement<AsyncInitializer>
 	{
 		sealed class AwaitableMemberAccess : MemberAccess
 		{
diff --git a/mcs/mcs/ecore.cs b/mcs/mcs/ecore.cs
index db3c4b7d456..0e3ebbe0fbd 100644
--- a/mcs/mcs/ecore.cs
+++ b/mcs/mcs/ecore.cs
@@ -1933,6 +1933,12 @@ namespace Mono.CSharp {
 
 		#region Properties
 
+		public override bool IsSideEffectFree {
+			get {
+				return expr.IsSideEffectFree;
+			}
+		}
+
 		public Expression OriginalExpression {
 			get {
 				return orig_expr;
@@ -2005,6 +2011,11 @@ namespace Mono.CSharp {
 			expr.Emit (ec);
 		}
 
+		public override Expression EmitToField (EmitContext ec)
+		{
+ 			return expr.EmitToField(ec);
+		}
+
 		public override void EmitBranchable (EmitContext ec, Label target, bool on_true)
 		{
 			expr.EmitBranchable (ec, target, on_true);
diff --git a/mcs/mcs/expression.cs b/mcs/mcs/expression.cs
index 6637e5f2b4a..c6d13c9a990 100644
--- a/mcs/mcs/expression.cs
+++ b/mcs/mcs/expression.cs
@@ -3929,6 +3929,27 @@ namespace Mono.CSharp
 			}
 		}
 
+		public override Expression EmitToField (EmitContext ec)
+		{
+			if ((oper & Operator.LogicalMask) == 0) {
+				var await_expr = left as Await;
+				if (await_expr != null && right.IsSideEffectFree) {
+					await_expr.Statement.EmitPrologue (ec);
+					left = await_expr.Statement.GetResultExpression (ec);
+					return this;
+				}
+
+				await_expr = right as Await;
+				if (await_expr != null && left.IsSideEffectFree) {
+					await_expr.Statement.EmitPrologue (ec);
+					right = await_expr.Statement.GetResultExpression (ec);
+					return this;
+				}
+			}
+
+			return base.EmitToField (ec);
+		}
+
 		protected override void CloneTo (CloneContext clonectx, Expression t)
 		{
 			Binary target = (Binary) t;
diff --git a/mcs/tests/test-async-13.cs b/mcs/tests/test-async-13.cs
index ec48eb753b2..54aabc3f37b 100644
--- a/mcs/tests/test-async-13.cs
+++ b/mcs/tests/test-async-13.cs
@@ -340,6 +340,19 @@ class Tester : Base
 		return 0;
 	}
 	
+	async Task<int> BinaryTest_5 ()
+	{
+		var r1 = await Task.FromResult (1) == 9;
+		if (r1)
+			return 1;
+		
+		var r2 = 1 == await Task.FromResult (1);
+		if (!r2)
+			return 2;
+		
+		return 0;
+	}
+
 	async Task<int> CallTest_1 ()
 	{
 		return Call (
diff --git a/mcs/tests/ver-il-net_4_5.xml b/mcs/tests/ver-il-net_4_5.xml
index 1bd6d7c6de6..2a20ef84381 100644
--- a/mcs/tests/ver-il-net_4_5.xml
+++ b/mcs/tests/ver-il-net_4_5.xml
@@ -54129,10 +54129,109 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;CallTest_1&gt;c__async10">
+    <type name="Tester+&lt;ArrayAccessTest_1&gt;c__async0">
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;ArrayAccessTest_2&gt;c__async1">
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;ArrayAccessTest_3&gt;c__async2">
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;ArrayAccessTest_4&gt;c__async3">
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;ArrayAccessTest_5&gt;c__async4">
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;ArrayAccessTest_6&gt;c__async5">
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;ArrayAccessTest_7&gt;c__async6">
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;ArrayAccessTest_8&gt;c__async7">
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;ArrayAccessTest_9&gt;c__async8">
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;AssignTest_1&gt;c__async9">
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;AssignTest_2&gt;c__asyncA">
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;AssignTest_3&gt;c__asyncB">
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;BinaryTest_1&gt;c__asyncC">
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;BinaryTest_2&gt;c__asyncD">
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;BinaryTest_3&gt;c__asyncE">
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;BinaryTest_4&gt;c__asyncF">
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester">
+      <method name="System.Threading.Tasks.Task`1[System.Int32] BinaryTest_5()" attrs="129">
+        <size>37</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;BinaryTest_5&gt;c__async10">
+      <method name="Void MoveNext()" attrs="486">
+        <size>304</size>
+      </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;CallTest_1&gt;c__async11">
       <method name="Void MoveNext()" attrs="486">
         <size>439</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__32()" attrs="145">
         <size>17</size>
       </method>
@@ -54146,10 +54245,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;CallTest_2&gt;c__async11">
+    <type name="Tester+&lt;CallTest_2&gt;c__async12">
       <method name="Void MoveNext()" attrs="486">
         <size>272</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__35()" attrs="145">
         <size>17</size>
       </method>
@@ -54157,10 +54259,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;CallTest_3&gt;c__async12">
+    <type name="Tester+&lt;CallTest_3&gt;c__async13">
       <method name="Void MoveNext()" attrs="486">
         <size>242</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__36()" attrs="145">
         <size>10</size>
       </method>
@@ -54168,10 +54273,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;CallTest_4&gt;c__async13">
+    <type name="Tester+&lt;CallTest_4&gt;c__async14">
       <method name="Void MoveNext()" attrs="486">
         <size>232</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="E &lt;&gt;m__37()" attrs="145">
         <size>9</size>
       </method>
@@ -54179,10 +54287,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;CallTest_5&gt;c__async14">
+    <type name="Tester+&lt;CallTest_5&gt;c__async15">
       <method name="Void MoveNext()" attrs="486">
         <size>210</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__38()" attrs="131">
         <size>25</size>
       </method>
@@ -54190,10 +54301,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;CastTest_1&gt;c__async15">
+    <type name="Tester+&lt;CastTest_1&gt;c__async16">
       <method name="Void MoveNext()" attrs="486">
         <size>251</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Decimal &lt;&gt;m__39()" attrs="145">
         <size>15</size>
       </method>
@@ -54201,10 +54315,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;CastTest_2&gt;c__async16">
+    <type name="Tester+&lt;CastTest_2&gt;c__async17">
       <method name="Void MoveNext()" attrs="486">
         <size>233</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Tester &lt;&gt;m__3A()" attrs="131">
         <size>14</size>
       </method>
@@ -54212,10 +54329,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;CoalescingTest_1&gt;c__async17">
+    <type name="Tester+&lt;CoalescingTest_1&gt;c__async18">
       <method name="Void MoveNext()" attrs="486">
         <size>359</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="System.String &lt;&gt;m__3B()" attrs="145">
         <size>9</size>
       </method>
@@ -54226,10 +54346,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;CoalescingTest_2&gt;c__async18">
+    <type name="Tester+&lt;CoalescingTest_2&gt;c__async19">
       <method name="Void MoveNext()" attrs="486">
         <size>372</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Nullable`1 &lt;&gt;m__3D()" attrs="145">
         <size>17</size>
       </method>
@@ -54240,10 +54363,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;ConditionalTest_1&gt;c__async19">
+    <type name="Tester+&lt;ConditionalTest_1&gt;c__async1A">
       <method name="Void MoveNext()" attrs="486">
         <size>200</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__3F()" attrs="145">
         <size>9</size>
       </method>
@@ -54251,10 +54377,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;ConditionalTest_2&gt;c__async1A">
+    <type name="Tester+&lt;ConditionalTest_2&gt;c__async1B">
       <method name="Void MoveNext()" attrs="486">
         <size>335</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__40()" attrs="145">
         <size>9</size>
       </method>
@@ -54265,10 +54394,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;ConditionalTest_3&gt;c__async1B">
+    <type name="Tester+&lt;ConditionalTest_3&gt;c__async1C">
       <method name="Void MoveNext()" attrs="486">
         <size>355</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Boolean &lt;&gt;m__42()" attrs="145">
         <size>9</size>
       </method>
@@ -54279,10 +54411,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;ConditionalTest_4&gt;c__async1C">
+    <type name="Tester+&lt;ConditionalTest_4&gt;c__async1D">
       <method name="Void MoveNext()" attrs="486">
         <size>248</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__44()" attrs="145">
         <size>9</size>
       </method>
@@ -54290,10 +54425,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;DelegateInvoke_4&gt;c__async1D">
+    <type name="Tester+&lt;DelegateInvoke_4&gt;c__async1E">
       <method name="Void MoveNext()" attrs="486">
         <size>276</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__45(Int32)" attrs="145">
         <size>11</size>
       </method>
@@ -54304,10 +54442,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;EventInvoke_1&gt;c__async1E">
+    <type name="Tester+&lt;EventInvoke_1&gt;c__async1F">
       <method name="Void MoveNext()" attrs="486">
         <size>220</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="System.Action &lt;&gt;m__47()" attrs="131">
         <size>23</size>
       </method>
@@ -54318,10 +54459,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;FieldTest_1&gt;c__async1F">
+    <type name="Tester+&lt;FieldTest_1&gt;c__async20">
       <method name="Void MoveNext()" attrs="486">
         <size>543</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__49()" attrs="145">
         <size>9</size>
       </method>
@@ -54332,10 +54476,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;IndexerTest_1&gt;c__async20">
+    <type name="Tester+&lt;IndexerTest_1&gt;c__async21">
       <method name="Void MoveNext()" attrs="486">
         <size>228</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__4B()" attrs="145">
         <size>9</size>
       </method>
@@ -54343,10 +54490,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;IndexerTest_2&gt;c__async21">
+    <type name="Tester+&lt;IndexerTest_2&gt;c__async22">
       <method name="Void MoveNext()" attrs="486">
         <size>341</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__4C()" attrs="145">
         <size>9</size>
       </method>
@@ -54357,10 +54507,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;IndexerTest_3&gt;c__async22">
+    <type name="Tester+&lt;IndexerTest_3&gt;c__async23">
       <method name="Void MoveNext()" attrs="486">
         <size>372</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__4E()" attrs="131">
         <size>25</size>
       </method>
@@ -54371,10 +54524,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;IndexerTest_4&gt;c__async23">
+    <type name="Tester+&lt;IndexerTest_4&gt;c__async24">
       <method name="Void MoveNext()" attrs="486">
         <size>400</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__50()" attrs="131">
         <size>25</size>
       </method>
@@ -54385,10 +54541,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;IndexerTest_5&gt;c__async24">
+    <type name="Tester+&lt;IndexerTest_5&gt;c__async25">
       <method name="Void MoveNext()" attrs="486">
         <size>506</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__52()" attrs="131">
         <size>25</size>
       </method>
@@ -54399,10 +54558,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;IndexerTest_6&gt;c__async25">
+    <type name="Tester+&lt;IndexerTest_6&gt;c__async26">
       <method name="Void MoveNext()" attrs="486">
         <size>555</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__54()" attrs="145">
         <size>10</size>
       </method>
@@ -54416,10 +54578,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;IndexerTest_7&gt;c__async26">
+    <type name="Tester+&lt;IndexerTest_7&gt;c__async27">
       <method name="Void MoveNext()" attrs="486">
         <size>262</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__57()" attrs="131">
         <size>25</size>
       </method>
@@ -54427,9 +54592,12 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;IsTest_1&gt;c__async27">
+    <type name="Tester+&lt;IsTest_1&gt;c__async28">
       <method name="Void MoveNext()" attrs="486">
-        <size>245</size>
+        <size>229</size>
+      </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
       </method>
       <method name="Tester &lt;&gt;m__58()" attrs="145">
         <size>13</size>
@@ -54438,10 +54606,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;IsTest_2&gt;c__async28">
+    <type name="Tester+&lt;IsTest_2&gt;c__async29">
       <method name="Void MoveNext()" attrs="486">
         <size>238</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Nullable`1 &lt;&gt;m__59()" attrs="145">
         <size>14</size>
       </method>
@@ -54449,10 +54620,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;LogicalUserOperator_1&gt;c__async29">
+    <type name="Tester+&lt;LogicalUserOperator_1&gt;c__async2A">
       <method name="Void MoveNext()" attrs="486">
         <size>392</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Base &lt;&gt;m__5A()" attrs="145">
         <size>13</size>
       </method>
@@ -54463,10 +54637,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;LogicalUserOperator_2&gt;c__async2A">
+    <type name="Tester+&lt;LogicalUserOperator_2&gt;c__async2B">
       <method name="Void MoveNext()" attrs="486">
         <size>297</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Base &lt;&gt;m__5C()" attrs="145">
         <size>13</size>
       </method>
@@ -54474,10 +54651,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;LogicalUserOperator_3&gt;c__async2B">
+    <type name="Tester+&lt;LogicalUserOperator_3&gt;c__async2C">
       <method name="Void MoveNext()" attrs="486">
         <size>391</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Base &lt;&gt;m__5D()" attrs="145">
         <size>13</size>
       </method>
@@ -54488,10 +54668,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;NewTest_1&gt;c__async2C">
+    <type name="Tester+&lt;NewTest_1&gt;c__async2D">
       <method name="Void MoveNext()" attrs="486">
         <size>258</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__5F()" attrs="145">
         <size>10</size>
       </method>
@@ -54499,10 +54682,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;NewTest_2&gt;c__async2D">
+    <type name="Tester+&lt;NewTest_2&gt;c__async2E">
       <method name="Void MoveNext()" attrs="486">
         <size>356</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__60()" attrs="145">
         <size>10</size>
       </method>
@@ -54513,10 +54699,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;NewInitTest_1&gt;c__async2E">
+    <type name="Tester+&lt;NewInitTest_1&gt;c__async2F">
       <method name="Void MoveNext()" attrs="486">
         <size>1025</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__62()" attrs="145">
         <size>10</size>
       </method>
@@ -54539,10 +54728,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;NewInitTest_2&gt;c__async2F">
+    <type name="Tester+&lt;NewInitTest_2&gt;c__async30">
       <method name="Void MoveNext()" attrs="486">
         <size>753</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="System.String &lt;&gt;m__68()" attrs="145">
         <size>13</size>
       </method>
@@ -54559,10 +54751,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;NewArrayInitTest_1&gt;c__async30">
+    <type name="Tester+&lt;NewArrayInitTest_1&gt;c__async31">
       <method name="Void MoveNext()" attrs="486">
         <size>238</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__6C()" attrs="145">
         <size>9</size>
       </method>
@@ -54570,10 +54765,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;NewArrayInitTest_2&gt;c__async31">
+    <type name="Tester+&lt;NewArrayInitTest_2&gt;c__async32">
       <method name="Void MoveNext()" attrs="486">
         <size>356</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__6D()" attrs="145">
         <size>9</size>
       </method>
@@ -54584,10 +54782,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;NewArrayInitTest_3&gt;c__async32">
+    <type name="Tester+&lt;NewArrayInitTest_3&gt;c__async33">
       <method name="Void MoveNext()" attrs="486">
         <size>242</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Byte &lt;&gt;m__6F()" attrs="145">
         <size>9</size>
       </method>
@@ -54595,10 +54796,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;NewArrayInitTest_4&gt;c__async33">
+    <type name="Tester+&lt;NewArrayInitTest_4&gt;c__async34">
       <method name="Void MoveNext()" attrs="486">
         <size>426</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="UInt16 &lt;&gt;m__70()" attrs="145">
         <size>9</size>
       </method>
@@ -54609,10 +54813,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;NewArrayInitTest_5&gt;c__async34">
+    <type name="Tester+&lt;NewArrayInitTest_5&gt;c__async35">
       <method name="Void MoveNext()" attrs="486">
         <size>260</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="S &lt;&gt;m__72()" attrs="145">
         <size>25</size>
       </method>
@@ -54620,10 +54827,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;NewArrayInitTest_6&gt;c__async35">
+    <type name="Tester+&lt;NewArrayInitTest_6&gt;c__async36">
       <method name="Void MoveNext()" attrs="486">
         <size>262</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__73()" attrs="145">
         <size>9</size>
       </method>
@@ -54631,10 +54841,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;PropertyTest_1&gt;c__async36">
+    <type name="Tester+&lt;PropertyTest_1&gt;c__async37">
       <method name="Void MoveNext()" attrs="486">
         <size>225</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__74()" attrs="145">
         <size>9</size>
       </method>
@@ -54642,10 +54855,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;PropertyTest_2&gt;c__async37">
+    <type name="Tester+&lt;PropertyTest_2&gt;c__async38">
       <method name="Void MoveNext()" attrs="486">
         <size>293</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__75()" attrs="145">
         <size>9</size>
       </method>
@@ -54653,10 +54869,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;PropertyTest_3&gt;c__async38">
+    <type name="Tester+&lt;PropertyTest_3&gt;c__async39">
       <method name="Void MoveNext()" attrs="486">
         <size>649</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__76()" attrs="145">
         <size>10</size>
       </method>
@@ -54670,10 +54889,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;StringConcatTest_1&gt;c__async39">
+    <type name="Tester+&lt;StringConcatTest_1&gt;c__async3A">
       <method name="Void MoveNext()" attrs="486">
         <size>459</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="System.String &lt;&gt;m__79()" attrs="145">
         <size>13</size>
       </method>
@@ -54687,10 +54909,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;UnaryTest_1&gt;c__async3A">
+    <type name="Tester+&lt;UnaryTest_1&gt;c__async3B">
       <method name="Void MoveNext()" attrs="486">
         <size>238</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__7C()" attrs="145">
         <size>9</size>
       </method>
@@ -54698,10 +54923,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;UnaryTest_2&gt;c__async3B">
+    <type name="Tester+&lt;UnaryTest_2&gt;c__async3C">
       <method name="Void MoveNext()" attrs="486">
         <size>338</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Nullable`1 &lt;&gt;m__7D()" attrs="131">
         <size>14</size>
       </method>
@@ -54709,10 +54937,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;UnaryTest_3&gt;c__async3C">
+    <type name="Tester+&lt;UnaryTest_3&gt;c__async3D">
       <method name="Void MoveNext()" attrs="486">
         <size>378</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__7E()" attrs="145">
         <size>9</size>
       </method>
@@ -54720,10 +54951,13 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;VariableInitializer_1&gt;c__async3D">
+    <type name="Tester+&lt;VariableInitializer_1&gt;c__async3E">
       <method name="Void MoveNext()" attrs="486">
         <size>354</size>
       </method>
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
       <method name="Int32 &lt;&gt;m__7F()" attrs="145">
         <size>9</size>
       </method>
@@ -54734,316 +54968,6 @@
         <size>7</size>
       </method>
     </type>
-    <type name="Tester+&lt;ArrayAccessTest_1&gt;c__async0">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;ArrayAccessTest_2&gt;c__async1">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;ArrayAccessTest_3&gt;c__async2">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;ArrayAccessTest_4&gt;c__async3">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;ArrayAccessTest_5&gt;c__async4">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;ArrayAccessTest_6&gt;c__async5">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;ArrayAccessTest_7&gt;c__async6">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;ArrayAccessTest_8&gt;c__async7">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;ArrayAccessTest_9&gt;c__async8">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;AssignTest_1&gt;c__async9">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;AssignTest_2&gt;c__asyncA">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;AssignTest_3&gt;c__asyncB">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;BinaryTest_1&gt;c__asyncC">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;BinaryTest_2&gt;c__asyncD">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;BinaryTest_3&gt;c__asyncE">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;BinaryTest_4&gt;c__asyncF">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;CallTest_1&gt;c__async10">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;CallTest_2&gt;c__async11">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;CallTest_3&gt;c__async12">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;CallTest_4&gt;c__async13">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;CallTest_5&gt;c__async14">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;CastTest_1&gt;c__async15">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;CastTest_2&gt;c__async16">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;CoalescingTest_1&gt;c__async17">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;CoalescingTest_2&gt;c__async18">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;ConditionalTest_1&gt;c__async19">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;ConditionalTest_2&gt;c__async1A">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;ConditionalTest_3&gt;c__async1B">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;ConditionalTest_4&gt;c__async1C">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;DelegateInvoke_4&gt;c__async1D">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;EventInvoke_1&gt;c__async1E">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;FieldTest_1&gt;c__async1F">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;IndexerTest_1&gt;c__async20">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;IndexerTest_2&gt;c__async21">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;IndexerTest_3&gt;c__async22">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;IndexerTest_4&gt;c__async23">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;IndexerTest_5&gt;c__async24">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;IndexerTest_6&gt;c__async25">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;IndexerTest_7&gt;c__async26">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;IsTest_1&gt;c__async27">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;IsTest_2&gt;c__async28">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;LogicalUserOperator_1&gt;c__async29">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;LogicalUserOperator_2&gt;c__async2A">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;LogicalUserOperator_3&gt;c__async2B">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;NewTest_1&gt;c__async2C">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;NewTest_2&gt;c__async2D">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;NewInitTest_1&gt;c__async2E">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;NewInitTest_2&gt;c__async2F">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;NewArrayInitTest_1&gt;c__async30">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;NewArrayInitTest_2&gt;c__async31">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;NewArrayInitTest_3&gt;c__async32">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;NewArrayInitTest_4&gt;c__async33">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;NewArrayInitTest_5&gt;c__async34">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;NewArrayInitTest_6&gt;c__async35">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;PropertyTest_1&gt;c__async36">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;PropertyTest_2&gt;c__async37">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;PropertyTest_3&gt;c__async38">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;StringConcatTest_1&gt;c__async39">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;UnaryTest_1&gt;c__async3A">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;UnaryTest_2&gt;c__async3B">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;UnaryTest_3&gt;c__async3C">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;VariableInitializer_1&gt;c__async3D">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
   </test>
   <test name="test-async-14.cs">
     <type name="C">
-- 
2.11.4.GIT