Changeset: 9eaa80553ec5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9eaa80553ec5
Modified Files:
monetdb5/optimizer/opt_commonTerms.c
monetdb5/optimizer/opt_deadcode.c
Branch: default
Log Message:
Remove superfluous code isUpdateInstruction
diffs (24 lines):
diff --git a/monetdb5/optimizer/opt_commonTerms.c
b/monetdb5/optimizer/opt_commonTerms.c
--- a/monetdb5/optimizer/opt_commonTerms.c
+++ b/monetdb5/optimizer/opt_commonTerms.c
@@ -112,7 +112,7 @@ OPTcommonTermsImplementation(Client cntx
mnstr_printf(cntxt->fdout,"#TARGET CANDIDATE[%d] ",i);
printInstruction(cntxt->fdout, mb, 0, p, LIST_MAL_ALL);
#endif
- prop = mayhaveSideEffects(cntxt, mb, p,TRUE) ||
isUpdateInstruction(p);
+ prop = mayhaveSideEffects(cntxt, mb, p,TRUE);
cnt = i; /* / 128 < 32? 32 : mb->stop/128; limit search
depth */
if ( !prop)
for (j = list[i]; cnt > 0 && j ; cnt--, j = list[j])
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
@@ -55,7 +55,7 @@ OPTdeadcodeImplementation(Client cntxt,
varused[getArg(p,0)]++; // force keeping
continue;
}
- if (hasSideEffects(p, FALSE) || isUpdateInstruction(p) ||
!isLinearFlow(p) || isProcedure(mb,p) ||
+ if (hasSideEffects(p, FALSE) || !isLinearFlow(p) ||
isProcedure(mb,p) ||
(p->retc == 1 && mb->unsafeProp) || p->barrier
/* ==side-effect */){
varused[getArg(p,0)]++; // force keeping it
continue;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
