MonetDB: Jul2017 - Different way of commenting out code that is ...

[Sjoerd Mullender]

Changeset: 8d968e2b4bc3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8d968e2b4bc3
Modified Files:
        monetdb5/optimizer/opt_jit.c
        monetdb5/optimizer/opt_jit.h
Branch: Jul2017
Log Message:

Different way of commenting out code that is compatible with -Wunreachable-code 
on clang.


diffs (64 lines):

diff --git a/monetdb5/optimizer/opt_jit.c b/monetdb5/optimizer/opt_jit.c
--- a/monetdb5/optimizer/opt_jit.c
+++ b/monetdb5/optimizer/opt_jit.c
@@ -22,6 +22,12 @@
 #include "mal_builder.h"
 #include "opt_jit.h"
 
+#if 0
+#define OPTDEBUGjit(CODE) { CODE }
+#else
+#define OPTDEBUGjit(CODE)
+#endif
+
 str
 OPTjitImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {
@@ -35,10 +41,10 @@ OPTjitImplementation(Client cntxt, MalBl
        (void) cntxt;
        (void) pci;
 
-       OPTDEBUGjit{
+       OPTDEBUGjit(
                fprintf(stderr, "#Optimize JIT\n");
                fprintFunction(stderr, mb, 0, LIST_MAL_DEBUG);
-       }
+       )
 
        setVariableScope(mb);
        if ( newMalBlkStmt(mb, mb->ssize) < 0)
@@ -65,20 +71,20 @@ OPTjitImplementation(Client cntxt, MalBl
                        if( q && getArg(q,0) == getArg(p,2) && getModuleId(q) 
== algebraRef && getFunctionId(q) == projectionRef ){
                                getArg(p,2)=  getArg(q,2);
                                p= pushArgument(mb,p, getArg(q,1));
-                               OPTDEBUGjit{
+                               OPTDEBUGjit(
                                        fprintf(stderr, "#Optimize JIT case 
1\n");
                                        fprintInstruction(stderr, 
mb,0,p,LIST_MAL_DEBUG);
-                               }
+                               )
                        }
                }
                pushInstruction(mb,p);
        }
 
-       OPTDEBUGjit{
+       OPTDEBUGjit(
                chkTypes(cntxt->fdout, cntxt->nspace,mb,TRUE);
                fprintf(stderr, "#Optimize JIT done\n");
                fprintFunction(stderr, mb, 0, LIST_MAL_DEBUG);
-       }
+       )
 
        GDKfree(old);
     /* Defense line against incorrect plans */
diff --git a/monetdb5/optimizer/opt_jit.h b/monetdb5/optimizer/opt_jit.h
--- a/monetdb5/optimizer/opt_jit.h
+++ b/monetdb5/optimizer/opt_jit.h
@@ -13,6 +13,4 @@
 
 mal_export str OPTjitImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr p);
 
-#define OPTDEBUGjit  if (/* DISABLES CODE */ (0))
-
 #endif
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list