Change some unreachable test conditions to NEVER().

FossilOrigin-Name: 7d99858bec699dface548c77649dfc50e7fb50d8
This commit is contained in:
drh
2013-12-03 02:52:11 +00:00
parent 47b927d2c3
commit d5e4547084
3 changed files with 8 additions and 17 deletions
+6 -6
View File
@@ -1,5 +1,5 @@
C Fix\sa\sharmless\scompiler\swarning\son\sMacOS.
D 2013-12-03T00:11:40.557
C Change\ssome\sunreachable\stest\sconditions\sto\sNEVER().
D 2013-12-03T02:52:11.992
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -286,7 +286,7 @@ F src/vdbeInt.h 05fbda0e061dbc4aaa2709a8cccf3515c245b263
F src/vdbeapi.c 93a22a9ba2abe292d5c2cf304d7eb2e894dde0ed
F src/vdbeaux.c 5b58b242afe50f6bae77da1c1e26330af32e51c7
F src/vdbeblob.c 8cd05a5630e6d5563ad017bf82edaf812b28acde
F src/vdbemem.c af650c2019dc197f062440cdb4650b7204e648bf
F src/vdbemem.c fed9357c0b79cd707957c28b144f5bf9d7cc6bfc
F src/vdbesort.c 9d83601f9d6243fe70dd0169a2820c5ddfd48147
F src/vdbetrace.c e7ec40e1999ff3c6414424365d5941178966dcbc
F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
@@ -1145,7 +1145,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
P bc8eacc7f71413184ef5be1412e51f8fd7174cd1
R 62604634a0764c5c22be734f75dfcb96
P 74328de1d720fb35a97b476034406ca17d35ff5f
R d881184ebe8e40a91ad03d9c9de08f57
U drh
Z 14b44bb1d46bbe3c25a7b8e87798f10b
Z e99c771249b48673bb69ac05e8b183ed
+1 -1
View File
@@ -1 +1 @@
74328de1d720fb35a97b476034406ca17d35ff5f
7d99858bec699dface548c77649dfc50e7fb50d8
+1 -10
View File
@@ -1078,16 +1078,7 @@ static int valueFromExpr(
return SQLITE_OK;
}
op = pExpr->op;
/* op can only be TK_REGISTER if we have compiled with SQLITE_ENABLE_STAT4.
** The ifdef here is to enable us to achieve 100% branch test coverage even
** when SQLITE_ENABLE_STAT4 is omitted.
*/
#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
if( op==TK_REGISTER ) op = pExpr->op2;
#else
if( NEVER(op==TK_REGISTER) ) op = pExpr->op2;
#endif
/* Handle negative integers in a single step. This is needed in the
** case when the value is -9223372036854775808.
@@ -1309,7 +1300,7 @@ int sqlite3Stat4ProbeSetValue(
*pbOk = 1;
}
}else if( pExpr->op==TK_VARIABLE
|| (pExpr->op==TK_REGISTER && pExpr->op2==TK_VARIABLE)
|| NEVER(pExpr->op==TK_REGISTER && pExpr->op2==TK_VARIABLE)
){
Vdbe *v;
int iBindVar = pExpr->iColumn;