Update of /cvsroot/monetdb/pathfinder/compiler/mil
In directory 
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30856/compiler/mil

Modified Files:
      Tag: M5XQ
        mil_opt.c 
Log Message:
propagated changes of Monday Jan 04 2010
from the XQFT branch to the M5XQ branch

  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  2010/01/04 - sjoerd: compiler/mil/mil_opt.c,1.37.10.1
  propagated changes of Saturday Dec 26 2009 - Monday Jan 04 2010
  from the development trunk to the XQFT branch
  
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    2009/12/26 - stmane: compiler/mil/mil_opt.c,1.38
    propagated changes of Wednesday Dec 23 2009 - Saturday Dec 26 2009
    from the Nov2009 branch to the development trunk
  
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      2009/12/23 - sjoerd: compiler/mil/mil_opt.c,1.37.6.1
      We expect assigns_to to fit into the stmts array (size OPT_STMTS) (I 
think).
      Added assert to help Coverity.
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      2009/12/23 - sjoerd: compiler/mil/mil_opt.c,1.37.6.2
      We need assert.h now that we have an assertion.
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


Index: mil_opt.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/mil/mil_opt.c,v
retrieving revision 1.36.4.1
retrieving revision 1.36.4.2
diff -u -d -r1.36.4.1 -r1.36.4.2
--- mil_opt.c   7 May 2009 14:46:43 -0000       1.36.4.1
+++ mil_opt.c   4 Jan 2010 15:20:48 -0000       1.36.4.2
@@ -39,6 +39,7 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <assert.h>
 
 /* malloc to return result buffers with */
 #define EXTERN_MALLOC(n)        PFmalloc(n)
@@ -462,6 +463,7 @@
         if ((assigns_to < 32768) & (o->stmts[stmt].used == 0) & 
o->stmts[stmt].inactive & (o->curvar+1 < OPT_VARS)) {
                 char *p = o->stmts[stmt].mil;
 
+                assert(assigns_to < OPT_STMTS);
                 o->stmts[stmt].assigns_to |= 32768; /* this ensures we kill 
the statement only once */
 
                 /* decrease the use count of the var declaration statement */


------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev 
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

Reply via email to