* Properly reset state when (re)compiling, by Artem Izmaylov. Fixes issue #40825

compiler/fmodule.pas

@@ -716,6 +716,7 @@ implementation
               end;
             { release procinfo tree }
             tprocinfo(procinfo).destroy_tree;
+            procinfo := nil;
           end;
         DoneDebugInfo(self,current_debuginfo_reset);
         used_units.free;
@@ -855,6 +856,7 @@ implementation
         llvmmetadatastrings.free;
         llvmmetadatastrings:=TFPHashList.Create;
 {$endif llvm}
+        ansistrdef:=nil;
         wpoinfo.free;
         wpoinfo:=nil;
         checkforwarddefs.free;
@@ -903,6 +905,10 @@ implementation
         linkorderedsymbols:=TCmdStrList.Create;
         pendingspecializations.free;
         pendingspecializations:=tfphashobjectlist.create(false);
+        genericdummysyms.Free;
+        genericdummysyms := tfphashobjectlist.create(true);
+        extendeddefs.Free;
+        extendeddefs:=TFPHashObjectList.Create(true);
         if assigned(waitingforunit) and
           (waitingforunit.count<>0) then
            begin

compiler/fppu.pas

@@ -2340,6 +2340,8 @@ var
         else if (state in [ms_compile, ms_compiling_waitintf]) then
           begin
           { no use continuing if we must be compiled }
+          // but we still need to restore current_module!
+          set_current_module(from_module);
           exit(false)
           end
         else

compiler/pgenutil.pas

@@ -271,6 +271,9 @@ uses
         if hmodule=current_module then
           exit;
 
+        if (hmodule.state = ms_load) and hmodule.interface_compiled then
+           Exit;
+
         if not (hmodule.state in [ms_compiled,ms_processed]) then
           begin
 {$ifdef DEBUG_UNITWAITING}