Changeset: 4005d5d4d18c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4005d5d4d18c
Modified Files:
monetdb5/optimizer/opt_dataflow.c
Branch: default
Log Message:
Only call MANIFOLDtypecheck for mal.multiplex (not for optimizer.multiplex).
diffs (13 lines):
diff --git a/monetdb5/optimizer/opt_dataflow.c
b/monetdb5/optimizer/opt_dataflow.c
--- a/monetdb5/optimizer/opt_dataflow.c
+++ b/monetdb5/optimizer/opt_dataflow.c
@@ -169,7 +169,8 @@ static int
dataflowConflict(Client cntxt, MalBlkPtr mb,InstrPtr p)
{
if (p->token == ENDsymbol ||
- (getFunctionId(p) == multiplexRef &&
+ (getFunctionId(p) == multiplexRef &&
+ getModuleId(p) == malRef &&
MANIFOLDtypecheck(cntxt,mb,p) == NULL) ||
blockCntrl(p) || blockStart(p) || blockExit(p))
return TRUE;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
