compacting the LabelInfo struct

dadhi · dadhi · commit 42bcc39411c2 · 2021-05-03T14:23:18.000+03:00
diff --git a/src/FastExpressionCompiler/FastExpressionCompiler.cs b/src/FastExpressionCompiler/FastExpressionCompiler.cs
@@ -570,9 +570,9 @@ internal struct LabelInfo
         {
             public object Target; // label target is the link between the goto and the label.
             public Label Label;
-            public int ReturnVariableIndexPlusOneAndIsDefined;
             public Label ReturnLabel;
-            public int InlinedLambdaInvokeIndex;
+            public short ReturnVariableIndexPlusOneAndIsDefined;
+            public short InlinedLambdaInvokeIndex;
         }
 
         /// Track the info required to build a closure object + some context information not directly related to closure.
@@ -585,7 +585,7 @@ internal struct ClosureInfo
 
             /// Map of the links between Labels and Goto's
             internal LiveCountArray<LabelInfo> Labels;
-            internal int CurrentInlinedLambdaInvokeIndex;
+            internal short CurrentInlinedLambdaInvokeIndex;
 
             public ClosureStatus Status;
 
@@ -693,17 +693,17 @@ public void AddNestedLambda(NestedLambdaInfo nestedLambdaInfo)
                 }
             }
 
-            public int GetLabelOrInvokeIndex(object labelTarget)
+            public short GetLabelOrInvokeIndex(object labelTarget)
             {
                 var count = Labels.Count;
                 var items = Labels.Items;
-                for (var i = 0; i < count; ++i)
+                for (short i = 0; i < count; ++i)
                     if (items[i].Target == labelTarget)
                         return i;
                 return -1;
             }
 
-            public void AddLabel(LabelTarget labelTarget, int inlinedLambdaInvokeIndex = -1)
+            public void AddLabel(LabelTarget labelTarget, short inlinedLambdaInvokeIndex = -1)
             {
                 if (GetLabelOrInvokeIndex(labelTarget) == -1)
                 {
@@ -713,14 +713,14 @@ public void AddLabel(LabelTarget labelTarget, int inlinedLambdaInvokeIndex = -1)
                 }
             }
 
-            public int AddInlinedLambdaInvoke(InvocationExpression e)
+            public short AddInlinedLambdaInvoke(InvocationExpression e)
             {
                 var index = GetLabelOrInvokeIndex(e);
                 if (index == -1)
                 {
                     ref var label = ref Labels.PushSlot();
                     label.Target = e;
-                    index = Labels.Count - 1;
+                    index = (short)(Labels.Count - 1);
                 }
                 return index;
             }
@@ -1965,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.ReturnVariableIndexPlusOneAndIsDefined >> 1) - 1; 
+                                                var varIndex = (short)((invokeInfo.ReturnVariableIndexPlusOneAndIsDefined >> 1) - 1);
                                                 if (varIndex == -1)
                                                 {
-                                                    varIndex = il.GetNextLocalVarIndex(gtOrLabelValue.Type);
-                                                    invokeInfo.ReturnVariableIndexPlusOneAndIsDefined = (varIndex + 1) << 1;
+                                                    varIndex = (short)il.GetNextLocalVarIndex(gtOrLabelValue.Type);
+                                                    invokeInfo.ReturnVariableIndexPlusOneAndIsDefined = (short)((varIndex + 1) << 1);
                                                     invokeInfo.ReturnLabel = il.DefineLabel();
                                                 }
                                                 EmitStoreLocalVariable(il, varIndex);
@@ -2246,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.ReturnVariableIndexPlusOneAndIsDefined >> 1) - 1; 
+                                var varIndex = (short)(label.ReturnVariableIndexPlusOneAndIsDefined >> 1) - 1; 
                                 if (varIndex == -1)
                                 {
                                     varIndex = il.GetNextLocalVarIndex(gotoValue.Type);
-                                    label.ReturnVariableIndexPlusOneAndIsDefined = (varIndex + 1) << 1;
+                                    label.ReturnVariableIndexPlusOneAndIsDefined = (short)((varIndex + 1) << 1);
                                     label.ReturnLabel = il.DefineLabel();
                                 }
                                 EmitStoreLocalVariable(il, varIndex);
@@ -2267,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.ReturnVariableIndexPlusOneAndIsDefined >> 1) - 1; 
+                                var varIndex = (short)(invokeInfo.ReturnVariableIndexPlusOneAndIsDefined >> 1) - 1; 
                                 if (varIndex == -1)
                                 {
                                     varIndex = il.GetNextLocalVarIndex(gotoValue.Type);
-                                    invokeInfo.ReturnVariableIndexPlusOneAndIsDefined = (varIndex + 1) << 1;
+                                    invokeInfo.ReturnVariableIndexPlusOneAndIsDefined = (short)((varIndex + 1) << 1);
                                     invokeInfo.ReturnLabel = il.DefineLabel();
                                 }
                                 EmitStoreLocalVariable(il, varIndex);

Original file line number	Diff line number	Diff line change
`@@ -570,9 +570,9 @@ internal struct LabelInfo`
`570`	`570`	`{`
`571`	`571`	`public object Target; // label target is the link between the goto and the label.`
`572`	`572`	`public Label Label;`
`573`		`- public int ReturnVariableIndexPlusOneAndIsDefined;`
`574`	`573`	`public Label ReturnLabel;`
`575`		`- public int InlinedLambdaInvokeIndex;`
	`574`	`+ public short ReturnVariableIndexPlusOneAndIsDefined;`
	`575`	`+ public short InlinedLambdaInvokeIndex;`
`576`	`576`	`}`
`577`	`577`
`578`	`578`	`/// Track the info required to build a closure object + some context information not directly related to closure.`
`@@ -585,7 +585,7 @@ internal struct ClosureInfo`
`585`	`585`
`586`	`586`	`/// Map of the links between Labels and Goto's`
`587`	`587`	`internal LiveCountArray<LabelInfo> Labels;`
`588`		`- internal int CurrentInlinedLambdaInvokeIndex;`
	`588`	`+ internal short CurrentInlinedLambdaInvokeIndex;`
`589`	`589`
`590`	`590`	`public ClosureStatus Status;`
`591`	`591`
`@@ -693,17 +693,17 @@ public void AddNestedLambda(NestedLambdaInfo nestedLambdaInfo)`
`693`	`693`	`}`
`694`	`694`	`}`
`695`	`695`
`696`		`- public int GetLabelOrInvokeIndex(object labelTarget)`
	`696`	`+ public short GetLabelOrInvokeIndex(object labelTarget)`
`697`	`697`	`{`
`698`	`698`	`var count = Labels.Count;`
`699`	`699`	`var items = Labels.Items;`
`700`		`- for (var i = 0; i < count; ++i)`
	`700`	`+ for (short i = 0; i < count; ++i)`
`701`	`701`	`if (items[i].Target == labelTarget)`
`702`	`702`	`return i;`
`703`	`703`	`return -1;`
`704`	`704`	`}`
`705`	`705`
`706`		`- public void AddLabel(LabelTarget labelTarget, int inlinedLambdaInvokeIndex = -1)`
	`706`	`+ public void AddLabel(LabelTarget labelTarget, short inlinedLambdaInvokeIndex = -1)`
`707`	`707`	`{`
`708`	`708`	`if (GetLabelOrInvokeIndex(labelTarget) == -1)`
`709`	`709`	`{`
`@@ -713,14 +713,14 @@ public void AddLabel(LabelTarget labelTarget, int inlinedLambdaInvokeIndex = -1)`
`713`	`713`	`}`
`714`	`714`	`}`
`715`	`715`
`716`		`- public int AddInlinedLambdaInvoke(InvocationExpression e)`
	`716`	`+ public short AddInlinedLambdaInvoke(InvocationExpression e)`
`717`	`717`	`{`
`718`	`718`	`var index = GetLabelOrInvokeIndex(e);`
`719`	`719`	`if (index == -1)`
`720`	`720`	`{`
`721`	`721`	`ref var label = ref Labels.PushSlot();`
`722`	`722`	`label.Target = e;`
`723`		`- index = Labels.Count - 1;`
	`723`	`+ index = (short)(Labels.Count - 1);`
`724`	`724`	`}`
`725`	`725`	`return index;`
`726`	`726`	`}`
`@@ -1965,11 +1965,11 @@ public static bool TryEmit(Expression expr, IReadOnlyList<PE> paramExprs,`
`1965`	`1965`	`if (invokeIndex == -1)`
`1966`	`1966`	`return false;`
`1967`	`1967`	`ref var invokeInfo = ref closure.Labels.Items[invokeIndex];`
`1968`		`- var varIndex = (invokeInfo.ReturnVariableIndexPlusOneAndIsDefined >> 1) - 1;`
	`1968`	`+ var varIndex = (short)((invokeInfo.ReturnVariableIndexPlusOneAndIsDefined >> 1) - 1);`
`1969`	`1969`	`if (varIndex == -1)`
`1970`	`1970`	`{`
`1971`		`- varIndex = il.GetNextLocalVarIndex(gtOrLabelValue.Type);`
`1972`		`- invokeInfo.ReturnVariableIndexPlusOneAndIsDefined = (varIndex + 1) << 1;`
	`1971`	`+ varIndex = (short)il.GetNextLocalVarIndex(gtOrLabelValue.Type);`
	`1972`	`+ invokeInfo.ReturnVariableIndexPlusOneAndIsDefined = (short)((varIndex + 1) << 1);`
`1973`	`1973`	`invokeInfo.ReturnLabel = il.DefineLabel();`
`1974`	`1974`	`}`
`1975`	`1975`	`EmitStoreLocalVariable(il, varIndex);`
`@@ -2246,11 +2246,11 @@ private static bool TryEmitGoto(GotoExpression expr, IReadOnlyList<PE> paramExp`
`2246`	`2246`	`// store the return expression result into the that variable`
`2247`	`2247`	`// emit OpCodes.Leave to the special label with the result which should be marked after the label to jump over its default value`
`2248`	`2248`	`ref var label = ref closure.Labels.Items[index];`
`2249`		`- var varIndex = (label.ReturnVariableIndexPlusOneAndIsDefined >> 1) - 1;`
	`2249`	`+ var varIndex = (short)(label.ReturnVariableIndexPlusOneAndIsDefined >> 1) - 1;`
`2250`	`2250`	`if (varIndex == -1)`
`2251`	`2251`	`{`
`2252`	`2252`	`varIndex = il.GetNextLocalVarIndex(gotoValue.Type);`
`2253`		`- label.ReturnVariableIndexPlusOneAndIsDefined = (varIndex + 1) << 1;`
	`2253`	`+ label.ReturnVariableIndexPlusOneAndIsDefined = (short)((varIndex + 1) << 1);`
`2254`	`2254`	`label.ReturnLabel = il.DefineLabel();`
`2255`	`2255`	`}`
`2256`	`2256`	`EmitStoreLocalVariable(il, varIndex);`
`@@ -2267,11 +2267,11 @@ private static bool TryEmitGoto(GotoExpression expr, IReadOnlyList<PE> paramExp`
`2267`	`2267`	`if (invokeIndex == -1)`
`2268`	`2268`	`return false;`
`2269`	`2269`	`ref var invokeInfo = ref closure.Labels.Items[invokeIndex];`
`2270`		`- var varIndex = (invokeInfo.ReturnVariableIndexPlusOneAndIsDefined >> 1) - 1;`
	`2270`	`+ var varIndex = (short)(invokeInfo.ReturnVariableIndexPlusOneAndIsDefined >> 1) - 1;`
`2271`	`2271`	`if (varIndex == -1)`
`2272`	`2272`	`{`
`2273`	`2273`	`varIndex = il.GetNextLocalVarIndex(gotoValue.Type);`
`2274`		`- invokeInfo.ReturnVariableIndexPlusOneAndIsDefined = (varIndex + 1) << 1;`
	`2274`	`+ invokeInfo.ReturnVariableIndexPlusOneAndIsDefined = (short)((varIndex + 1) << 1);`
`2275`	`2275`	`invokeInfo.ReturnLabel = il.DefineLabel();`
`2276`	`2276`	`}`
`2277`	`2277`	`EmitStoreLocalVariable(il, varIndex);`