compiler: set to nil after free

compiler/blockutl.pas

@@ -373,6 +373,7 @@ implementation
         end;
 
       procvarnode.free;
+      procvarnode := nil;
 
       { restore scanner }
       restore_scanner(sstate);

compiler/cclasses.pas

@@ -1059,7 +1059,7 @@ begin
     exit;
   Lp := Lst.FList;
   for I := 0 to Lst.Count-1 do
-    TObject(Lp[I]).Free;
+    TObject(Lp[I]).Free; // no nil needed
   Lst.Free;
   Lst := nil;
 end;
@@ -1112,7 +1112,7 @@ var
 begin
   if FFreeObjects then
     for i := 0 to FList.Count - 1 do
-      TObject(FList[i]).Free;
+      TObject(FList[i]).Free; // no nil needed
   FList.Clear;
 end;
 
@@ -1152,7 +1152,7 @@ end;
 procedure TFPObjectList.SetItem(Index: Integer; AObject: TObject);
 begin
   if OwnsObjects then
-    TObject(FList[Index]).Free;
+    TObject(FList[Index]).Free; // no nil needed
   FList[index] := AObject;
 end;
 
@@ -1174,7 +1174,7 @@ end;
 procedure TFPObjectList.Delete(Index: Integer);
 begin
   if OwnsObjects then
-    TObject(FList[Index]).Free;
+    TObject(FList[Index]).Free; // no nil needed
   FList.Delete(Index);
 end;
 
@@ -1200,7 +1200,7 @@ begin
   if (Result <> -1) then
   begin
     if OwnsObjects then
-      TObject(FList[Result]).Free;
+      TObject(FList[Result]).Free; // no nil needed
     FList.Delete(Result);
   end;
 end;
@@ -1893,7 +1893,7 @@ var
 begin
   if FFreeObjects then
     for i := 0 to FHashList.Count - 1 do
-      TObject(FHashList[i]).Free;
+      TObject(FHashList[i]).Free; // no nil needed
   FHashList.Clear;
 end;
 
@@ -1921,7 +1921,7 @@ end;
 procedure TFPHashObjectList.SetItem(Index: Integer; AObject: TObject);
 begin
   if OwnsObjects then
-    TObject(FHashList[Index]).Free;
+    TObject(FHashList[Index]).Free; // no nil needed
   FHashList[index] := AObject;
 end;
 
@@ -1958,7 +1958,7 @@ end;
 procedure TFPHashObjectList.Delete(Index: Integer);
 begin
   if OwnsObjects then
-    TObject(FHashList[Index]).Free;
+    TObject(FHashList[Index]).Free; // no nil needed
   FHashList.Delete(Index);
 end;
 
@@ -1979,7 +1979,7 @@ begin
   if (Result <> -1) then
     begin
       if OwnsObjects then
-        TObject(FHashList[Result]).Free;
+        TObject(FHashList[Result]).Free; // no nil needed
       FHashList.Delete(Result);
     end;
 end;
@@ -2541,6 +2541,7 @@ end;
          begin
            inherited Remove(p);
            p.Free;
+           p := nil;
          end;
       end;
 
@@ -2556,6 +2557,7 @@ end;
           begin
             GetFirst:=p.FPStr;
             p.free;
+            p := nil;
           end;
       end;
 
@@ -2571,6 +2573,7 @@ end;
           begin
             Getlast:=p.FPStr;
             p.free;
+            p := nil;
           end;
       end;
 
@@ -2985,7 +2988,7 @@ end;
           begin
             next := item^.Next;
             if FOwnsObjects then
-              item^.Data.Free;
+              FreeAndNil(item^.Data);
             FreeItem(item);
             item := next;
           end;
@@ -3136,7 +3139,7 @@ end;
               begin
                 chain^ := Entry^.Next;
                 if FOwnsObjects then
-                  Entry^.Data.Free;
+                  FreeAndNil(Entry^.Data);
                 FreeItem(Entry);
                 Dec(FCount);
                 Result := True;

compiler/cfidwarf.pas

@@ -271,6 +271,7 @@ implementation
     destructor TDwarfAsmCFILowLevel.destroy;
       begin
         FDwarfList.Free;
+        FDwarfList := nil;
       end;
 
 

compiler/cfileutl.pas

@@ -219,6 +219,7 @@ end;
       begin
         FreeDirectoryEntries;
         FDirectoryEntries.Free;
+        FDirectoryEntries := nil;
         inherited destroy;
       end;
 
@@ -390,6 +391,7 @@ end;
     destructor TDirectoryCache.destroy;
       begin
         FDirectories.Free;
+        FDirectories := nil;
         inherited destroy;
       end;
 
@@ -1116,6 +1118,7 @@ end;
              Insert(s);
            end;
           hl.Free;
+          hl := nil;
         end
        else
         begin
@@ -1556,6 +1559,7 @@ end;
     procedure DoneFileUtils;
       begin
         DirCache.Free;
+        DirCache := nil;
       end;
 
 end.

compiler/cg64f32.pas

@@ -1008,6 +1008,7 @@ unit cg64f32;
 
              hlcg.g_rangecheck(list,temploc,hdef,todef);
              hdef.free;
+             hdef := nil;
 
              if from_signed and to_signed then
                begin
@@ -1041,6 +1042,7 @@ unit cg64f32;
                  temploc.size:=OS_32;
                  hlcg.g_rangecheck(list,temploc,hdef,todef);
                  hdef.free;
+                 hdef := nil;
                  cg.a_label(list,endlabel);
                end;
            end

compiler/comprsrc.pas

@@ -244,6 +244,7 @@ destructor TWinLikeResourceFile.Destroy;
 begin
   if fResScript<>nil then
     fResScript.Free;
+    fResScript := nil;
   inherited;
 end;
 
@@ -450,7 +451,9 @@ begin
     end;
   dst.CopyFrom(src,src.Size);
   dst.Free;
+  dst := nil;
   src.Free;
+  src := nil;
   Result:=true;
 end;
  
@@ -486,6 +489,7 @@ begin
       if resourcefile.IsCompiled(s) then
         begin
           resourcefile.free;
+          resourcefile := nil;
           if AnsiCompareFileName(IncludeTrailingPathDelimiter(ExpandFileName(current_module.outputpath)), p) <> 0 then
             begin
               { Copy .res file to units output dir. Otherwise .res file will not be found
@@ -510,6 +514,7 @@ begin
             end;
           resourcefile.compile(outfmt, current_module.outputpath+res.FPStr);
           resourcefile.free;
+          resourcefile := nil;
         end;
       res:=TCmdStrListItem(res.Next);
     end;
@@ -564,6 +569,7 @@ begin
   { Finish collection }
   resourcefile.EndCollect;
   resourcefile.free;
+  resourcefile := nil;
 end;
 
 procedure initglobals;

compiler/cprofile.pas

@@ -106,7 +106,7 @@ finalization
   for t:=low(timers) to high(timers) do
     writeln(StdErr,'  ',t,' ',timers[t].Elapsed:0:9,' s');
   for t:=low(timers) to high(timers) do
-    timers[t].Free;
+    FreeAndNil(timers[t]);
 {$endif COMPILER_TIMINGS}
 end.
 

compiler/cresstr.pas

@@ -161,6 +161,7 @@ uses
     Destructor Tresourcestrings.Destroy;
       begin
         List.Free;
+        List := nil;
       end;
 
 
@@ -235,6 +236,7 @@ uses
             );
             R:=TResourceStringItem(R.Next);
             tcb.free;
+            tcb := nil;
           end;
         tcb:=ctai_typedconstbuilder.create([tcalo_vectorized_dead_strip_end,tcalo_data_force_indirect,tcalo_is_public_asm]);
         tcb.begin_anonymous_record(internaltypeprefixName[itp_emptyrec],
@@ -246,6 +248,7 @@ uses
           )
         );
         tcb.free;
+        tcb := nil;
       end;
 
     procedure Tresourcestrings.WriteRSJFile;
@@ -368,6 +371,7 @@ uses
             resstrs.WriteRSJFile;
           end;
         resstrs.Free;
+        resstrs := nil;
         symtablestack.pop(current_module.localsymtable);
         if assigned(current_module.globalsymtable) then
           symtablestack.pop(current_module.globalsymtable);

compiler/cscript.pas

@@ -156,6 +156,7 @@ end;
 destructor TScript.Destroy;
 begin
   data.Free;
+  data := nil;
 end;
 
 

compiler/cstreams.pas

@@ -623,6 +623,7 @@ begin
     SaveToStream(S);
   finally
     S.free;
+    S := nil;
   end;
 end;
 
@@ -711,6 +712,7 @@ begin
     LoadFromStream(S);
   finally
     S.free;
+    S := nil;
   end;
 end;
 

compiler/ctask.pas

@@ -164,6 +164,7 @@ end;
 destructor ttask_handler.destroy;
 begin
   hash.free;
+  hash := nil;
   List.Clear;
   FreeAndNil(list);
   inherited destroy;