Changeset: 5adb5d6f8652 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5adb5d6f8652
Modified Files:
monetdb5/optimizer/opt_commonTerms.mx
Branch: default
Log Message:
Common terms require also module id test
diffs (12 lines):
diff --git a/monetdb5/optimizer/opt_commonTerms.mx
b/monetdb5/optimizer/opt_commonTerms.mx
--- a/monetdb5/optimizer/opt_commonTerms.mx
+++ b/monetdb5/optimizer/opt_commonTerms.mx
@@ -205,7 +205,7 @@ OPTcommonTermsImplementation(Client cntx
cnt = mb->stop / 128 < 32? 32 : mb->stop/128; /* limit search
depth */
if ( !prop)
for (; cnt > 0 && j ; cnt--, j = list[j])
- if ( (q=getInstrPtr(mb,j))->fcn == p->fcn ){
+ if ( getFunctionId(q=getInstrPtr(mb,j)) ==
getFunctionId(p) && getModuleId(q) == getModuleId(p) ){
#ifdef DEBUG_OPT_COMMONTERMS_MORE
mnstr_printf(cntxt->fdout,"#CANDIDATE %d, %d %d %d ",
i, j,
hasSameSignature(mb, p, q, p->retc),
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
