Improve linker performance by avoiding IndexOf (#90721)

Youssef1313 · web-flow · commit 54fbd47c861c · 2023-08-18T15:57:10.000-05:00
* Improve linker performance by avoiding IndexOf

* Fix typos
diff --git a/src/tools/illink/src/linker/Linker.Steps/UnreachableBlocksOptimizer.cs b/src/tools/illink/src/linker/Linker.Steps/UnreachableBlocksOptimizer.cs
@@ -92,21 +92,39 @@ static bool IsMethodSupported (MethodDefinition method)
 			return true;
 		}
 
-		static bool HasJumpIntoTargetRange (Collection<Instruction> instructions, int firstInstr, int lastInstr, Func<Instruction, int>? mapping = null)
+		static bool HasJumpIntoTargetRange (Collection<Instruction> instructions, int firstInstr, int lastInstr, Func<Instruction, int?>? mapping = null)
 		{
 			foreach (var instr in instructions) {
 				switch (instr.OpCode.FlowControl) {
 				case FlowControl.Branch:
 				case FlowControl.Cond_Branch:
 					if (instr.Operand is Instruction target) {
-						int index = mapping == null ? instructions.IndexOf (target) : mapping (target);
-						if (index >= firstInstr && index <= lastInstr)
-							return true;
+						if (mapping != null && mapping (target) is int index) {
+							if (index >= firstInstr && index <= lastInstr) {
+								return true;
+							}
+						}
+						else {
+							for (int i = firstInstr; i <= lastInstr; i++) {
+								if (instructions[i] == target) {
+									return true;
+								}
+							}
+						}
 					} else {
 						foreach (var rtarget in (Instruction[]) instr.Operand) {
-							int index = mapping == null ? instructions.IndexOf (rtarget) : mapping (rtarget);
-							if (index >= firstInstr && index <= lastInstr)
-								return true;
+							if (mapping != null && mapping (rtarget) is int index) {
+								if (index >= firstInstr && index <= lastInstr) {
+									return true;
+								}
+							}
+							else {
+								for (int i = firstInstr; i <= lastInstr; i++) {
+									if (instructions[i] == rtarget) {
+										return true;
+									}
+								}
+							}
 						}
 					}
 
@@ -1175,6 +1193,15 @@ int GetInstructionIndex (Instruction instruction)
 				return idx;
 			}
 
+			int? TryGetInstructionIndex (Instruction instruction)
+			{
+				Debug.Assert (mapping != null);
+				if (mapping.TryGetValue (instruction, out int idx))
+					return idx;
+
+				return null;
+			}
+
 			bool GetOperandsConstantValues (int index, out object? left, out object? right)
 			{
 				Debug.Assert (FoldedInstructions != null);
@@ -1213,7 +1240,7 @@ static bool IsPairedStlocLdloc (Instruction first, Instruction second)
 			bool IsJumpTargetRange (int firstInstr, int lastInstr)
 			{
 				Debug.Assert (FoldedInstructions != null);
-				return HasJumpIntoTargetRange (FoldedInstructions, firstInstr, lastInstr, GetInstructionIndex);
+				return HasJumpIntoTargetRange (FoldedInstructions, firstInstr, lastInstr, TryGetInstructionIndex);
 			}
 		}
 
