+ TDFABuilder.redodfainfo

compiler/optdfa.pas

@@ -45,6 +45,7 @@ unit optdfa;
         procedure resetdfainfo(node : tnode);
 
         procedure createdfainfo(node : tnode);
+        procedure redodfainfo(node : tnode);
         destructor destroy;override;
       end;
 
@@ -659,6 +660,14 @@ unit optdfa;
       end;
 
 
+    procedure TDFABuilder.redodfainfo(node: tnode);
+      begin
+        resetdfainfo(node);
+        createdfainfo(node);
+        include(current_procinfo.flags,pi_dfaavailable);
+      end;
+
+
     destructor TDFABuilder.Destroy;
       begin
         Resultnode.free;

compiler/psub.pas

@@ -1218,11 +1218,7 @@ implementation
              end;
 
            if RedoDFA then
-             begin
-               dfabuilder.resetdfainfo(code);
-               dfabuilder.createdfainfo(code);
-               include(flags,pi_dfaavailable);
-             end;
+             dfabuilder.redodfainfo(code);
 
            if cs_opt_forloop in current_settings.optimizerswitches then
              RedoDFA:=OptimizeForLoop(code);
@@ -1230,11 +1226,7 @@ implementation
            RedoDFA:=ConvertForLoops(code) or RedoDFA;
 
            if RedoDFA then
-             begin
-               dfabuilder.resetdfainfo(code);
-               dfabuilder.createdfainfo(code);
-               include(flags,pi_dfaavailable);
-             end;
+             dfabuilder.redodfainfo(code);
 
            { when life info is available, we can give more sophisticated warning about uninitialized
              variables ...