Reducing indirect addressing to out parameters

packages/rtl-generics/src/inc/generics.dictionaries.inc

@@ -620,9 +620,12 @@ begin
 end;
 
 function TOpenAddressing<OPEN_ADDRESSING_CONSTRAINTS>.TryGetMutableValue(const AKey: TKey; out APValue: PValue): Boolean;
+var
+  LPValue: PValue;
 begin
-  APValue := GetMutableValue(AKey);
-  Result := APValue <>Nil;
+  LPValue := GetMutableValue(AKey);
+  APValue := LPValue;
+  Result := LPValue <> Nil;
 end;
 
 function TOpenAddressing<OPEN_ADDRESSING_CONSTRAINTS>.TryGetValue(const AKey: TKey; out AValue: TValue): Boolean;
@@ -805,12 +808,13 @@ begin
   LHash := FEqualityComparer.GetHashCode(AKey);
 
   i := 0;
-  AHash := LHash or UInt32.GetSignMask;
+  LHash := LHash or UInt32.GetSignMask;
+  AHash := LHash;
 
   if m = 0 then
     Exit(-1);
 
-  Result := AHash and LLengthMask;
+  Result := LHash and LLengthMask;
 
   repeat
     LItem := _TItem(AItems[Result]);
@@ -820,13 +824,13 @@ begin
       Exit(not Result); // insert!
 
     // Same position?
-    if LItem.Hash = AHash then
+    if LItem.Hash = LHash then
       if FEqualityComparer.Equals(AKey, LItem.Pair.Key) then
         Exit;
 
     Inc(i);
 
-    Result := TProbeSequence.Probe(i, AHash) and LLengthMask;
+    Result := TProbeSequence.Probe(i, LHash) and LLengthMask;
 
   until false;
 end;
@@ -899,12 +903,13 @@ begin
   LHash := FEqualityComparer.GetHashCode(AKey);
 
   i := 0;
-  AHash := LHash or UInt32.GetSignMask;
+  LHash := LHash or UInt32.GetSignMask;
+  AHash := LHash;
 
   if m = 0 then
     Exit(-1);
 
-  Result := AHash and LLengthMask;
+  Result := LHash and LLengthMask;
 
   repeat
     LItem := _TItem(AItems[Result]);
@@ -913,13 +918,13 @@ begin
       Exit(not Result); // insert!
 
     // Same position?
-    if LItem.Hash = AHash then
+    if LItem.Hash = LHash then
       if FEqualityComparer.Equals(AKey, LItem.Pair.Key) then
         Exit;
 
     Inc(i);
 
-    Result := TProbeSequence.Probe(i, AHash) and LLengthMask;
+    Result := TProbeSequence.Probe(i, LHash) and LLengthMask;
 
   until false;
 end;
@@ -938,12 +943,13 @@ begin
   LHash := FEqualityComparer.GetHashCode(AKey);
 
   i := 0;
-  AHash := LHash or UInt32.GetSignMask;
+  LHash := LHash or UInt32.GetSignMask;
+  AHash := LHash;
 
   if m = 0 then
     Exit(-1);
 
-  Result := AHash and LLengthMask;
+  Result := LHash and LLengthMask;
 
   repeat
     LItem := _TItem(AItems[Result]);
@@ -953,13 +959,13 @@ begin
       Exit(not Result); // insert!
 
     // Same position?
-    if LItem.Hash = AHash then
+    if LItem.Hash = LHash then
       if FEqualityComparer.Equals(AKey, LItem.Pair.Key) then
         Exit;
 
     Inc(i);
 
-    Result := TProbeSequence.Probe(i, AHash) and LLengthMask;
+    Result := TProbeSequence.Probe(i, LHash) and LLengthMask;
 
   until false;
 end;
@@ -989,14 +995,15 @@ begin
   LHash := FEqualityComparer.GetHashCode(AKey);
 
   i := 0;
-  AHash := LHash or UInt32.GetSignMask;
+  LHash := LHash or UInt32.GetSignMask;
+  AHash := LHash;
 
   if Length(AItems) = 0 then
     Exit(-1);
 
   for i := 0 to FPrimaryNumberAsSizeApproximation - 1 do
   begin
-    Result := TProbeSequence.Probe(i, AHash) mod FPrimaryNumberAsSizeApproximation;
+    Result := TProbeSequence.Probe(i, LHash) mod FPrimaryNumberAsSizeApproximation;
     LItem := _TItem(AItems[Result]);
 
     // Empty position
@@ -1004,7 +1011,7 @@ begin
       Exit(not Result); // insert!
 
     // Same position?
-    if LItem.Hash = AHash then
+    if LItem.Hash = LHash then
       if FEqualityComparer.Equals(AKey, LItem.Pair.Key) then
         Exit;
   end;
@@ -1023,14 +1030,15 @@ begin
   LHash := FEqualityComparer.GetHashCode(AKey);
 
   i := 0;
-  AHash := LHash or UInt32.GetSignMask;
+  LHash := LHash or UInt32.GetSignMask;
+  AHash := LHash;
 
   if Length(AItems) = 0 then
     Exit(-1);
 
   for i := 0 to FPrimaryNumberAsSizeApproximation - 1 do
   begin
-    Result := TProbeSequence.Probe(i, AHash) mod FPrimaryNumberAsSizeApproximation;
+    Result := TProbeSequence.Probe(i, LHash) mod FPrimaryNumberAsSizeApproximation;
     LItem := _TItem(AItems[Result]);
 
     // Empty position or tombstone
@@ -1038,7 +1046,7 @@ begin
       Exit(not Result); // insert!
 
     // Same position?
-    if LItem.Hash = AHash then
+    if LItem.Hash = LHash then
       if FEqualityComparer.Equals(AKey, LItem.Pair.Key) then
         Exit;
   end;