瀏覽代碼

* the successor of the last node is the resultnode if one exists
* create def/use info for temp. nodes

git-svn-id: trunk@25967 -

florian 11 年之前
父節點
當前提交
1fb3c2e0c2
共有 1 個文件被更改,包括 11 次插入4 次删除
  1. 11 4
      compiler/optdfa.pas

+ 11 - 4
compiler/optdfa.pas

@@ -113,6 +113,7 @@ unit optdfa;
     function AddDefUse(var n: tnode; arg: pointer): foreachnoderesult;
     function AddDefUse(var n: tnode; arg: pointer): foreachnoderesult;
       begin
       begin
         case n.nodetype of
         case n.nodetype of
+          temprefn,
           loadn:
           loadn:
             begin
             begin
               pdfainfo(arg)^.map.Add(n);
               pdfainfo(arg)^.map.Add(n);
@@ -256,6 +257,10 @@ unit optdfa;
             exit;
             exit;
           include(node.flags,nf_processing);
           include(node.flags,nf_processing);
 
 
+
+          if not(assigned(node.successor)) and (node<>resultnode) then
+            node.successor:=resultnode;
+
           if assigned(node.successor) then
           if assigned(node.successor) then
             CreateInfo(node.successor);
             CreateInfo(node.successor);
 
 
@@ -405,6 +410,7 @@ unit optdfa;
                     dfainfo.map:=map;
                     dfainfo.map:=map;
                     foreachnodestatic(pm_postprocess,tifnode(node).left,@AddDefUse,@dfainfo);
                     foreachnodestatic(pm_postprocess,tifnode(node).left,@AddDefUse,@dfainfo);
                   end;
                   end;
+
                 { create life info for then and else node }
                 { create life info for then and else node }
                 CreateInfo(tifnode(node).right);
                 CreateInfo(tifnode(node).right);
                 CreateInfo(tifnode(node).t1);
                 CreateInfo(tifnode(node).t1);
@@ -528,10 +534,11 @@ unit optdfa;
                 calclife(node);
                 calclife(node);
               end;
               end;
             else
             else
-              begin
-                writeln(nodetype2str[node.nodetype]);
-                internalerror(2007050502);
-              end;
+              if node<>resultnode then
+                begin
+                  writeln(nodetype2str[node.nodetype]);
+                  internalerror(2007050502);
+                end;
           end;
           end;
 
 
           // exclude(node.flags,nf_processing);
           // exclude(node.flags,nf_processing);