aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordrh <>2023-12-19 14:53:39 +0000
committerdrh <>2023-12-19 14:53:39 +0000
commit09259aff6c4ad61b3bbad8228c0a398fa0f92d08 (patch)
tree0163ba4699f28cb75073d2e491f5764eededbb66 /src
parent3e2ec83e0bad02934b2c024d123f1a293c214a4e (diff)
downloadsqlite-09259aff6c4ad61b3bbad8228c0a398fa0f92d08.tar.gz
sqlite-09259aff6c4ad61b3bbad8228c0a398fa0f92d08.zip
Add ALWAYS() and NEVER() on branches made unreachable by recent changes.
FossilOrigin-Name: c50e6c2ace49d0928b05cbfd877c621e9a0f77dc4e056ccb1dbe5cf118a00d00
Diffstat (limited to 'src')
-rw-r--r--src/expr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/expr.c b/src/expr.c
index fd462c1c5..068360952 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -2740,7 +2740,7 @@ int sqlite3ExprCanBeNull(const Expr *p){
case TK_COLUMN:
assert( ExprUseYTab(p) );
return ExprHasProperty(p, EP_CanBeNull) ||
- p->y.pTab==0 || /* Reference to column of index on expression */
+ NEVER(p->y.pTab==0) || /* Reference to column of index on expr */
(p->iColumn>=0
&& p->y.pTab->aCol!=0 /* Possible due to prior error */
&& ALWAYS(p->iColumn>=0)
@@ -6477,7 +6477,7 @@ static int exprRefToSrcList(Walker *pWalker, Expr *pExpr){
int i;
struct RefSrcList *p = pWalker->u.pRefSrcList;
SrcList *pSrc = p->pRef;
- int nSrc = pSrc ? pSrc->nSrc : 0;
+ int nSrc = ALWAYS(pSrc) ? pSrc->nSrc : 0;
for(i=0; i<nSrc; i++){
if( pExpr->iTable==pSrc->a[i].iCursor ){
pWalker->eCode |= 1;