fixed spurious internal compiler errors in XE6 and XE7

Author: sglienke

Source/Base/Collections/Spring.Collections.Base.pas

@@ -2700,26 +2700,28 @@ function TIterator<T>.MoveNext: Boolean;
 label
   _STATE_RUNNING;
 begin
-  case fState of
-    STATE_RUNNING:
-    _STATE_RUNNING:
-    begin
-      Result := fTryMoveNext(Self, fCurrent);
-      if Result then
-        Exit;
+  repeat
+    case fState of
+      STATE_RUNNING:
+      _STATE_RUNNING:
+      begin
+        Result := fTryMoveNext(Self, fCurrent);
+        if Result then
+          Exit;
 
-      Dispose;
-      fCurrent := Default(T);
-      fState := STATE_FINISHED;
-    end;
-    STATE_ENUMERATOR:
-    begin
-      Start;
-      fState := STATE_RUNNING;
-      goto _STATE_RUNNING;
+        Dispose;
+        fCurrent := Default(T);
+        fState := STATE_FINISHED;
+      end;
+      STATE_ENUMERATOR:
+      begin
+        Start;
+        fState := STATE_RUNNING;
+        Continue;
+      end;
     end;
-  end;
-  Result := False;
+    Exit(False);
+  until False;
 end;
 
 procedure TIterator<T>.Start;

Source/Base/Collections/Spring.Collections.pas

@@ -11083,31 +11083,30 @@ function TOfTypeIterator.TEnumerator.GetCurrent: TObject;
   Result := fCurrent;
 end;
 
-function TOfTypeIterator.TEnumerator.MoveNext: Boolean; //FI:W521
-label
-  HasEnumerator;
+function TOfTypeIterator.TEnumerator.MoveNext: Boolean;
 var
   current: TObject;
 begin
-  if Assigned(fEnumerator) then
-  begin
-  HasEnumerator:
-    repeat
-      Result := fEnumerator.MoveNext;
-      if not Result then
-        Break;
-      current := fEnumerator.Current;
-      fCurrent := current;
-      Result := current.InheritsFrom(fResultClass);
-    until Result;
-    Exit;
-  end;
-{$IFDEF MSWINDOWS}
-  IEnumerableInternal(Parent.fSource).GetEnumerator(IEnumerator(fEnumerator));
-{$ELSE}
-  fEnumerator := Parent.fSource.GetEnumerator;
-{$ENDIF}
-  goto HasEnumerator;
+  repeat
+    if Assigned(fEnumerator) then
+    begin
+      repeat
+        Result := fEnumerator.MoveNext;
+        if not Result then
+          Break;
+        current := fEnumerator.Current;
+        fCurrent := current;
+        Result := current.InheritsFrom(fResultClass);
+      until Result;
+      Exit;
+    end;
+  {$IFDEF MSWINDOWS}
+    IEnumerableInternal(Parent.fSource).GetEnumerator(IEnumerator(fEnumerator));
+  {$ELSE}
+    fEnumerator := Parent.fSource.GetEnumerator;
+  {$ENDIF}
+  until True;
+  Result := False;
 end;
 
 {$ENDREGION}

Source/Base/Spring.HashTable.pas

@@ -186,6 +186,12 @@ implementation
   Spring.Hash,
   Spring.ResourceStrings;
 
+{$IF defined(DELPHIXE6) or defined(DELPHIXE7)}
+  // there seems to be some compiler glitch in XE6 and XE7 that causes
+  // internal compiler error in some rare cases when using goto - here is one
+  {$DEFINE GOTO_OFF}
+{$IFEND}
+
 // copied here from Spring.pas to enable inlining
 function DynArrayLength(const A: Pointer): NativeInt; inline;
 begin
@@ -342,10 +348,12 @@ function THashTable.FindItem(const key): Pointer;
 end;
 
 function THashTable.FindEntry(const key; var entry: THashTableEntry): Boolean;
+{$IFNDEF GOTO_OFF}
 label
   first;
+{$ENDIF}
 var
-  mask, perturb: Integer;
+  perturb, mask: Integer;
   hashTable: PHashTable;
   item: PByte;
 begin
@@ -357,6 +365,7 @@ function THashTable.FindEntry(const key; var entry: THashTableEntry): Boolean;
     mask := PInteger(@PByte(hashTable.Buckets)[-SizeOf(NativeInt)])^ - 1;
     entry.BucketIndex := entry.HashCode and mask;
 
+    {$IFNDEF GOTO_OFF}
     goto first;
     repeat
     {$IFDEF DEBUG}
@@ -374,10 +383,33 @@ function THashTable.FindEntry(const key; var entry: THashTableEntry): Boolean;
       begin
         entry.ItemIndex := entry.ItemIndex and mask;
         item := @hashTable.Items[NativeInt(hashTable.ItemSize) * entry.ItemIndex];
-        if hashTable.fEquals(Pointer(hashTable.fComparer), item[KeyOffset], key) then
-          Exit(True);
+        Result := hashTable.fEquals(Pointer(hashTable.fComparer), item[KeyOffset], key);
+        if Result then Exit;
+      end;
+    until False;
+    {$ELSE}
+    repeat
+      entry.ItemIndex := hashTable.Buckets[entry.BucketIndex];
+      if entry.ItemIndex <> UsedBucket then
+      begin
+        if entry.ItemIndex = EmptyBucket then Break;
+        if (entry.ItemIndex xor entry.HashCode) and not mask = 0 then
+        begin
+          entry.ItemIndex := entry.ItemIndex and mask;
+          item := @hashTable.Items[NativeInt(hashTable.ItemSize) * entry.ItemIndex];
+          Result := hashTable.fEquals(Pointer(hashTable.fComparer), item[KeyOffset], key);
+          if Result then Exit;
+        end;
       end;
+
+    {$IFDEF DEBUG}
+      Inc(CollisionCount);
+    {$ENDIF}
+
+      perturb := perturb shr PerturbShift;
+      entry.BucketIndex := (5 * entry.BucketIndex + 1 + perturb) and mask;
     until False;
+    {$ENDIF}
   end;
   entry.ItemIndex := hashTable.ItemCount;
   Result := False;