diff options
| author | drh <drh@noemail.net> | 2013-11-15 20:06:26 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-11-15 20:06:26 +0000 |
| commit | 85f8aa790783479016861787e5c945e9ee6f0a89 (patch) | |
| tree | e30f26c17d662dc0fc7d78a1ea5214840c8202bb /src/expr.c | |
| parent | 8e2ea000b5acee48b6bfede67bdc6844cba38224 (diff) | |
| download | sqlite-85f8aa790783479016861787e5c945e9ee6f0a89.tar.gz sqlite-85f8aa790783479016861787e5c945e9ee6f0a89.zip | |
Add ALWAYS and NEVER macros to currently unreachable but important branches in
sqlite3ExprCompare().
FossilOrigin-Name: cee835fe902e46f283257fb8ec9d9744c7d6dd77
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/expr.c b/src/expr.c index cc2966cf1..048146b37 100644 --- a/src/expr.c +++ b/src/expr.c @@ -3757,15 +3757,15 @@ int sqlite3ExprCompare(Expr *pA, Expr *pB, int iTab){ } } if( (pA->flags & EP_Distinct)!=(pB->flags & EP_Distinct) ) return 2; - if( (combinedFlags & EP_TokenOnly)==0 ){ + if( ALWAYS((combinedFlags & EP_TokenOnly)==0) ){ if( combinedFlags & EP_xIsSelect ) return 2; if( sqlite3ExprCompare(pA->pLeft, pB->pLeft, iTab) ) return 2; if( sqlite3ExprCompare(pA->pRight, pB->pRight, iTab) ) return 2; if( sqlite3ExprListCompare(pA->x.pList, pB->x.pList, iTab) ) return 2; - if( (combinedFlags & EP_Reduced)==0 ){ + if( ALWAYS((combinedFlags & EP_Reduced)==0) ){ if( pA->iColumn!=pB->iColumn ) return 2; if( pA->iTable!=pB->iTable - && (pA->iTable!=iTab || pB->iTable>=0) ) return 2; + && (pA->iTable!=iTab || NEVER(pB->iTable>=0)) ) return 2; } } return 0; |