compacting the LabelInfo

dadhi · dadhi · commit 18b84b7898f8 · 2021-05-03T13:57:23.000+03:00
diff --git a/src/FastExpressionCompiler/FastExpressionCompiler.cs b/src/FastExpressionCompiler/FastExpressionCompiler.cs
@@ -566,15 +566,12 @@ internal enum ClosureStatus : byte
             ShouldBeStaticMethod = 1 << 3
         }
 
-        [Flags] internal enum LabelFlags : byte { Undefined = 0, Defined = 1 }
-
         internal struct LabelInfo 
         {
             public object Target; // label target is the link between the goto and the label.
             public Label Label;
-            public int ReturnVariableIndexPlusOne;
+            public int ReturnVariableIndexPlusOneAndIsDefined;
             public Label ReturnLabel;
-            public LabelFlags Flags; // todo: @perf combine flags and ReturnVariableIndexPlusOne into one to save space
             public int InlinedLambdaInvokeIndex;
         }
 
@@ -731,9 +728,9 @@ public int AddInlinedLambdaInvoke(InvocationExpression e)
             public Label GetDefinedLabel(int index, ILGenerator il)
             {
                 ref var label = ref Labels.Items[index];
-                if ((label.Flags & LabelFlags.Defined) == 0)
+                if ((label.ReturnVariableIndexPlusOneAndIsDefined & 1) == 0)
                 {
-                    label.Flags |= LabelFlags.Defined;
+                    label.ReturnVariableIndexPlusOneAndIsDefined |= 1;
                     label.Label = il.DefineLabel();
                 }
                 return label.Label;
@@ -742,11 +739,11 @@ public Label GetDefinedLabel(int index, ILGenerator il)
             public void TryMarkDefinedLabel(int index, ILGenerator il)
             {
                 ref var label = ref Labels.Items[index];
-                if ((label.Flags & LabelFlags.Defined) != 0)
+                if ((label.ReturnVariableIndexPlusOneAndIsDefined & 1) == 1)
                     il.MarkLabel(label.Label);
                 else
                 {
-                    label.Flags |= LabelFlags.Defined;
+                    label.ReturnVariableIndexPlusOneAndIsDefined |= 1;
                     il.MarkLabel(label.Label = il.DefineLabel());
                 }
             }
@@ -1968,11 +1965,11 @@ public static bool TryEmit(Expression expr, IReadOnlyList<PE> paramExprs,
                                                 if (invokeIndex == -1)
                                                     return false;
                                                 ref var invokeInfo = ref closure.Labels.Items[invokeIndex];
-                                                var varIndex = invokeInfo.ReturnVariableIndexPlusOne - 1; 
+                                                var varIndex = (invokeInfo.ReturnVariableIndexPlusOneAndIsDefined >> 1) - 1; 
                                                 if (varIndex == -1)
                                                 {
                                                     varIndex = il.GetNextLocalVarIndex(gtOrLabelValue.Type);
-                                                    invokeInfo.ReturnVariableIndexPlusOne = varIndex + 1;
+                                                    invokeInfo.ReturnVariableIndexPlusOneAndIsDefined = (varIndex + 1) << 1;
                                                     invokeInfo.ReturnLabel = il.DefineLabel();
                                                 }
                                                 EmitStoreLocalVariable(il, varIndex);
@@ -2174,11 +2171,11 @@ private static bool TryEmitLabel(LabelExpression expr, IReadOnlyList<PE>  paramE
                     return false; // should be found in first collecting constants round
 
                 ref var label = ref closure.Labels.Items[index];
-                if ((label.Flags & LabelFlags.Defined) != 0)
+                if ((label.ReturnVariableIndexPlusOneAndIsDefined & 1) == 1)
                     il.MarkLabel(label.Label);
                 else
                 {
-                    label.Flags |= LabelFlags.Defined;
+                    label.ReturnVariableIndexPlusOneAndIsDefined |= 1;
                     il.MarkLabel(label.Label = il.DefineLabel());
                 }
 
@@ -2189,7 +2186,7 @@ private static bool TryEmitLabel(LabelExpression expr, IReadOnlyList<PE>  paramE
                 // get the TryCatch variable from the LabelInfo - if it is not 0:
                 // first if label has the default value then store into this return variable the defaultValue which is currently on stack
                 // mark the associated TryCatch return label here and load the variable if parent does not ignore the result, otherwise don't load
-                var returnVariableIndexPlusOne = label.ReturnVariableIndexPlusOne; 
+                var returnVariableIndexPlusOne = label.ReturnVariableIndexPlusOneAndIsDefined >> 1;
                 if (returnVariableIndexPlusOne != 0)
                 {
                     if (defaultValue != null)
@@ -2249,11 +2246,11 @@ private static bool TryEmitGoto(GotoExpression expr, IReadOnlyList<PE>  paramExp
                                 // store the return expression result into the that variable
                                 // emit OpCodes.Leave to the special label with the result which should be marked after the label to jump over its default value
                                 ref var label = ref closure.Labels.Items[index];
-                                var varIndex = label.ReturnVariableIndexPlusOne - 1; 
+                                var varIndex = (label.ReturnVariableIndexPlusOneAndIsDefined >> 1) - 1; 
                                 if (varIndex == -1)
                                 {
                                     varIndex = il.GetNextLocalVarIndex(gotoValue.Type);
-                                    label.ReturnVariableIndexPlusOne = varIndex + 1;
+                                    label.ReturnVariableIndexPlusOneAndIsDefined = (varIndex + 1) << 1;
                                     label.ReturnLabel = il.DefineLabel();
                                 }
                                 EmitStoreLocalVariable(il, varIndex);
@@ -2270,11 +2267,11 @@ private static bool TryEmitGoto(GotoExpression expr, IReadOnlyList<PE>  paramExp
                                 if (invokeIndex == -1)
                                     return false;
                                 ref var invokeInfo = ref closure.Labels.Items[invokeIndex];
-                                var varIndex = invokeInfo.ReturnVariableIndexPlusOne - 1; 
+                                var varIndex = (invokeInfo.ReturnVariableIndexPlusOneAndIsDefined >> 1) - 1; 
                                 if (varIndex == -1)
                                 {
                                     varIndex = il.GetNextLocalVarIndex(gotoValue.Type);
-                                    invokeInfo.ReturnVariableIndexPlusOne = varIndex + 1;
+                                    invokeInfo.ReturnVariableIndexPlusOneAndIsDefined = (varIndex + 1) << 1;
                                     invokeInfo.ReturnLabel = il.DefineLabel();
                                 }
                                 EmitStoreLocalVariable(il, varIndex);
@@ -4252,10 +4249,11 @@ private static bool TryEmitInvoke(InvocationExpression expr, IReadOnlyList<PE> p
                         if (li != -1)
                         {
                             ref var labelInfo = ref closure.Labels.Items[li];
-                            if (labelInfo.ReturnVariableIndexPlusOne != 0)
+                            var returnVariableIndexPlusOne = labelInfo.ReturnVariableIndexPlusOneAndIsDefined >> 1;
+                            if (returnVariableIndexPlusOne != 0)
                             {
                                 il.MarkLabel(labelInfo.ReturnLabel);
-                                EmitLoadLocalVariable(il, labelInfo.ReturnVariableIndexPlusOne - 1);
+                                EmitLoadLocalVariable(il, returnVariableIndexPlusOne - 1);
                             }
                         }
                     }

Original file line number	Diff line number	Diff line change
`@@ -566,15 +566,12 @@ internal enum ClosureStatus : byte`
`566`	`566`	`ShouldBeStaticMethod = 1 << 3`
`567`	`567`	`}`
`568`	`568`
`569`		`- [Flags] internal enum LabelFlags : byte { Undefined = 0, Defined = 1 }`
`570`		`-`
`571`	`569`	`internal struct LabelInfo`
`572`	`570`	`{`
`573`	`571`	`public object Target; // label target is the link between the goto and the label.`
`574`	`572`	`public Label Label;`
`575`		`- public int ReturnVariableIndexPlusOne;`
	`573`	`+ public int ReturnVariableIndexPlusOneAndIsDefined;`
`576`	`574`	`public Label ReturnLabel;`
`577`		`- public LabelFlags Flags; // todo: @perf combine flags and ReturnVariableIndexPlusOne into one to save space`
`578`	`575`	`public int InlinedLambdaInvokeIndex;`
`579`	`576`	`}`
`580`	`577`
`@@ -731,9 +728,9 @@ public int AddInlinedLambdaInvoke(InvocationExpression e)`
`731`	`728`	`public Label GetDefinedLabel(int index, ILGenerator il)`
`732`	`729`	`{`
`733`	`730`	`ref var label = ref Labels.Items[index];`
`734`		`- if ((label.Flags & LabelFlags.Defined) == 0)`
	`731`	`+ if ((label.ReturnVariableIndexPlusOneAndIsDefined & 1) == 0)`
`735`	`732`	`{`
`736`		`- label.Flags \|= LabelFlags.Defined;`
	`733`	`+ label.ReturnVariableIndexPlusOneAndIsDefined \|= 1;`
`737`	`734`	`label.Label = il.DefineLabel();`
`738`	`735`	`}`
`739`	`736`	`return label.Label;`
`@@ -742,11 +739,11 @@ public Label GetDefinedLabel(int index, ILGenerator il)`
`742`	`739`	`public void TryMarkDefinedLabel(int index, ILGenerator il)`
`743`	`740`	`{`
`744`	`741`	`ref var label = ref Labels.Items[index];`
`745`		`- if ((label.Flags & LabelFlags.Defined) != 0)`
	`742`	`+ if ((label.ReturnVariableIndexPlusOneAndIsDefined & 1) == 1)`
`746`	`743`	`il.MarkLabel(label.Label);`
`747`	`744`	`else`
`748`	`745`	`{`
`749`		`- label.Flags \|= LabelFlags.Defined;`
	`746`	`+ label.ReturnVariableIndexPlusOneAndIsDefined \|= 1;`
`750`	`747`	`il.MarkLabel(label.Label = il.DefineLabel());`
`751`	`748`	`}`
`752`	`749`	`}`
`@@ -1968,11 +1965,11 @@ public static bool TryEmit(Expression expr, IReadOnlyList<PE> paramExprs,`
`1968`	`1965`	`if (invokeIndex == -1)`
`1969`	`1966`	`return false;`
`1970`	`1967`	`ref var invokeInfo = ref closure.Labels.Items[invokeIndex];`
`1971`		`- var varIndex = invokeInfo.ReturnVariableIndexPlusOne - 1;`
	`1968`	`+ var varIndex = (invokeInfo.ReturnVariableIndexPlusOneAndIsDefined >> 1) - 1;`
`1972`	`1969`	`if (varIndex == -1)`
`1973`	`1970`	`{`
`1974`	`1971`	`varIndex = il.GetNextLocalVarIndex(gtOrLabelValue.Type);`
`1975`		`- invokeInfo.ReturnVariableIndexPlusOne = varIndex + 1;`
	`1972`	`+ invokeInfo.ReturnVariableIndexPlusOneAndIsDefined = (varIndex + 1) << 1;`
`1976`	`1973`	`invokeInfo.ReturnLabel = il.DefineLabel();`
`1977`	`1974`	`}`
`1978`	`1975`	`EmitStoreLocalVariable(il, varIndex);`
`@@ -2174,11 +2171,11 @@ private static bool TryEmitLabel(LabelExpression expr, IReadOnlyList<PE> paramE`
`2174`	`2171`	`return false; // should be found in first collecting constants round`
`2175`	`2172`
`2176`	`2173`	`ref var label = ref closure.Labels.Items[index];`
`2177`		`- if ((label.Flags & LabelFlags.Defined) != 0)`
	`2174`	`+ if ((label.ReturnVariableIndexPlusOneAndIsDefined & 1) == 1)`
`2178`	`2175`	`il.MarkLabel(label.Label);`
`2179`	`2176`	`else`
`2180`	`2177`	`{`
`2181`		`- label.Flags \|= LabelFlags.Defined;`
	`2178`	`+ label.ReturnVariableIndexPlusOneAndIsDefined \|= 1;`
`2182`	`2179`	`il.MarkLabel(label.Label = il.DefineLabel());`
`2183`	`2180`	`}`
`2184`	`2181`
`@@ -2189,7 +2186,7 @@ private static bool TryEmitLabel(LabelExpression expr, IReadOnlyList<PE> paramE`
`2189`	`2186`	`// get the TryCatch variable from the LabelInfo - if it is not 0:`
`2190`	`2187`	`// first if label has the default value then store into this return variable the defaultValue which is currently on stack`
`2191`	`2188`	`// mark the associated TryCatch return label here and load the variable if parent does not ignore the result, otherwise don't load`
`2192`		`- var returnVariableIndexPlusOne = label.ReturnVariableIndexPlusOne;`
	`2189`	`+ var returnVariableIndexPlusOne = label.ReturnVariableIndexPlusOneAndIsDefined >> 1;`
`2193`	`2190`	`if (returnVariableIndexPlusOne != 0)`
`2194`	`2191`	`{`
`2195`	`2192`	`if (defaultValue != null)`
`@@ -2249,11 +2246,11 @@ private static bool TryEmitGoto(GotoExpression expr, IReadOnlyList<PE> paramExp`
`2249`	`2246`	`// store the return expression result into the that variable`
`2250`	`2247`	`// emit OpCodes.Leave to the special label with the result which should be marked after the label to jump over its default value`
`2251`	`2248`	`ref var label = ref closure.Labels.Items[index];`
`2252`		`- var varIndex = label.ReturnVariableIndexPlusOne - 1;`
	`2249`	`+ var varIndex = (label.ReturnVariableIndexPlusOneAndIsDefined >> 1) - 1;`
`2253`	`2250`	`if (varIndex == -1)`
`2254`	`2251`	`{`
`2255`	`2252`	`varIndex = il.GetNextLocalVarIndex(gotoValue.Type);`
`2256`		`- label.ReturnVariableIndexPlusOne = varIndex + 1;`
	`2253`	`+ label.ReturnVariableIndexPlusOneAndIsDefined = (varIndex + 1) << 1;`
`2257`	`2254`	`label.ReturnLabel = il.DefineLabel();`
`2258`	`2255`	`}`
`2259`	`2256`	`EmitStoreLocalVariable(il, varIndex);`
`@@ -2270,11 +2267,11 @@ private static bool TryEmitGoto(GotoExpression expr, IReadOnlyList<PE> paramExp`
`2270`	`2267`	`if (invokeIndex == -1)`
`2271`	`2268`	`return false;`
`2272`	`2269`	`ref var invokeInfo = ref closure.Labels.Items[invokeIndex];`
`2273`		`- var varIndex = invokeInfo.ReturnVariableIndexPlusOne - 1;`
	`2270`	`+ var varIndex = (invokeInfo.ReturnVariableIndexPlusOneAndIsDefined >> 1) - 1;`
`2274`	`2271`	`if (varIndex == -1)`
`2275`	`2272`	`{`
`2276`	`2273`	`varIndex = il.GetNextLocalVarIndex(gotoValue.Type);`
`2277`		`- invokeInfo.ReturnVariableIndexPlusOne = varIndex + 1;`
	`2274`	`+ invokeInfo.ReturnVariableIndexPlusOneAndIsDefined = (varIndex + 1) << 1;`
`2278`	`2275`	`invokeInfo.ReturnLabel = il.DefineLabel();`
`2279`	`2276`	`}`
`2280`	`2277`	`EmitStoreLocalVariable(il, varIndex);`
`@@ -4252,10 +4249,11 @@ private static bool TryEmitInvoke(InvocationExpression expr, IReadOnlyList<PE> p`
`4252`	`4249`	`if (li != -1)`
`4253`	`4250`	`{`
`4254`	`4251`	`ref var labelInfo = ref closure.Labels.Items[li];`
`4255`		`- if (labelInfo.ReturnVariableIndexPlusOne != 0)`
	`4252`	`+ var returnVariableIndexPlusOne = labelInfo.ReturnVariableIndexPlusOneAndIsDefined >> 1;`
	`4253`	`+ if (returnVariableIndexPlusOne != 0)`
`4256`	`4254`	`{`
`4257`	`4255`	`il.MarkLabel(labelInfo.ReturnLabel);`
`4258`		`- EmitLoadLocalVariable(il, labelInfo.ReturnVariableIndexPlusOne - 1);`
	`4256`	`+ EmitLoadLocalVariable(il, returnVariableIndexPlusOne - 1);`
`4259`	`4257`	`}`
`4260`	`4258`	`}`
`4261`	`4259`	`}`