Changeset: a7c0e82fc7bc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a7c0e82fc7bc
Modified Files:
        monetdb5/optimizer/opt_deadcode.c
Branch: default
Log Message:

Revert removal of histo argument
First check the actual use in group.c without histo.


diffs (38 lines):

diff --git a/monetdb5/optimizer/opt_deadcode.c 
b/monetdb5/optimizer/opt_deadcode.c
--- a/monetdb5/optimizer/opt_deadcode.c
+++ b/monetdb5/optimizer/opt_deadcode.c
@@ -46,6 +46,9 @@ OPTdeadcodeImplementation(Client cntxt, 
                p = old[i];
                for( k=p->retc; k<p->argc; k++)
                        varused[getArg(p,k)]++;
+               if ( blockCntrl(p) )
+                       for( k= 0; k < p->retc; k++)
+                               varused[getArg(p,k)]++;
        }
 
        // Consolidate the actual need for variables
@@ -103,6 +106,7 @@ OPTdeadcodeImplementation(Client cntxt, 
                                freeInstruction(p);
                                actions ++;
                        }
+                       /* Enable when bugTracker-2012/Tests/mal_errors 
survives it
                        if ( getModuleId(p) == groupRef && p->retc == 3 && 
varused[getArg(p,2)] == 0 &&
                                (getFunctionId(p) == groupRef || 
                                 getFunctionId(p) == subgroupRef || 
@@ -112,6 +116,7 @@ OPTdeadcodeImplementation(Client cntxt, 
                                delArgument(p,2);
                                actions++;
                        }
+                       */
                }
        }
        for(; i<slimit; i++)
@@ -122,7 +127,7 @@ OPTdeadcodeImplementation(Client cntxt, 
     //if( actions > 0){
         chkTypes(cntxt->usermodule, mb, FALSE);
         chkFlow(mb);
-        //chkDeclarations(mb);
+        chkDeclarations(mb);
     //}
     /* keep all actions taken as a post block comment */
        usec = GDKusec()- usec;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to