diff options
| author | drh <> | 2022-11-24 15:04:23 +0000 |
|---|---|---|
| committer | drh <> | 2022-11-24 15:04:23 +0000 |
| commit | c25f5ea6e838dabbd0721947a432c4d9717bda74 (patch) | |
| tree | b22c97994d6cfdfb7b67486becf400af719f30ab /src | |
| parent | b669bb5e2bd130b2a8d8a87304449cfb3b27f9d9 (diff) | |
| download | sqlite-c25f5ea6e838dabbd0721947a432c4d9717bda74.tar.gz sqlite-c25f5ea6e838dabbd0721947a432c4d9717bda74.zip | |
Add NEVER() and ALWAYS() macros on branches that are believed to be
unreachable.
FossilOrigin-Name: 3a901e88c87fc76c7fe42e47a976a5706830f0dbd6027605663e4d55f4f33590
Diffstat (limited to 'src')
| -rw-r--r-- | src/expr.c | 4 | ||||
| -rw-r--r-- | src/select.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/expr.c b/src/expr.c index 2e909dd8c..dc918e0bd 100644 --- a/src/expr.c +++ b/src/expr.c @@ -6335,14 +6335,14 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){ for(pIEpr=pParse->pIdxEpr; pIEpr; pIEpr=pIEpr->pIENext){ int iDataCur = pIEpr->iDataCur; if( iDataCur<0 ) continue; - if( pParse->iSelfTab ){ + if( NEVER(pParse->iSelfTab) ){ if( pIEpr->iDataCur!=pParse->iSelfTab-1 ) continue; iDataCur = -1; } if( sqlite3ExprCompare(0, pExpr, pIEpr->pExpr, iDataCur)==0 ) break; } if( pIEpr==0 ) break; - if( !ExprUseYTab(pExpr) ) break; + if( NEVER(!ExprUseYTab(pExpr)) ) break; /* If we reach this point, it means that expression pExpr can be ** translated into a reference to an index column as described by diff --git a/src/select.c b/src/select.c index dcf899e4b..e9b629671 100644 --- a/src/select.c +++ b/src/select.c @@ -6282,7 +6282,7 @@ static void optimizeAggregateUseOfIndexedExpr( NameContext *pNC /* Name context used to resolve agg-func args */ ){ pAggInfo->nColumn = pAggInfo->nAccumulator; - if( pAggInfo->nSortingColumn>0 ){ + if( ALWAYS(pAggInfo->nSortingColumn>0) ){ if( pAggInfo->nColumn==0 ){ pAggInfo->nSortingColumn = 0; }else{ |