diff options
| author | drh <drh@noemail.net> | 2017-10-31 03:40:15 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2017-10-31 03:40:15 +0000 |
| commit | 9d9c41e25e460130678e5883fafaa13e97024add (patch) | |
| tree | 7c82aae99eedbd580034911fe221e972136c247a /src/wherecode.c | |
| parent | 666fb6914d659cf9e997dfa5d97f3124cdad39a8 (diff) | |
| download | sqlite-9d9c41e25e460130678e5883fafaa13e97024add.tar.gz sqlite-9d9c41e25e460130678e5883fafaa13e97024add.zip | |
Remove unnecessary NEVER() and ALWAYS() conditionals.
FossilOrigin-Name: 1c80c75d4be2f3d44fb18bb4c07eccac2aba79b688215a741317dfc47dc7c2ce
Diffstat (limited to 'src/wherecode.c')
| -rw-r--r-- | src/wherecode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/wherecode.c b/src/wherecode.c index 6cdf7b566..da5c686a9 100644 --- a/src/wherecode.c +++ b/src/wherecode.c @@ -294,8 +294,8 @@ void sqlite3WhereAddScanStatus( */ static void disableTerm(WhereLevel *pLevel, WhereTerm *pTerm){ int nLoop = 0; - while( ALWAYS(pTerm!=0) - && (pTerm->wtFlags & TERM_CODED)==0 + assert( pTerm!=0 ); + while( (pTerm->wtFlags & TERM_CODED)==0 && (pLevel->iLeftJoin==0 || ExprHasProperty(pTerm->pExpr, EP_FromJoin)) && (pLevel->notReady & pTerm->prereqAll)==0 ){ @@ -306,6 +306,7 @@ static void disableTerm(WhereLevel *pLevel, WhereTerm *pTerm){ } if( pTerm->iParent<0 ) break; pTerm = &pTerm->pWC->a[pTerm->iParent]; + assert( pTerm!=0 ); pTerm->nChild--; if( pTerm->nChild!=0 ) break; nLoop++; |