| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| From: Victor Costan <pwnall@chromium.org> |
| Date: Fri, 11 Jan 2019 02:26:10 -0800 |
| Subject: [PATCH 09/17] Remove an ALWAYS() from a branch that is not always |
| taken. |
| |
| This backports https://www.sqlite.org/src/info/5c7dab |
| |
| Bug: 918035 |
| --- |
| third_party/sqlite/src/src/expr.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/third_party/sqlite/src/src/expr.c b/third_party/sqlite/src/src/expr.c |
| index 4aff7f67c9b6..6b2c5a540a82 100644 |
| --- a/third_party/sqlite/src/src/expr.c |
| +++ b/third_party/sqlite/src/src/expr.c |
| @@ -4755,7 +4755,7 @@ int sqlite3ExprCompare(Parse *pParse, Expr *pA, Expr *pB, int iTab){ |
| } |
| } |
| if( (pA->flags & EP_Distinct)!=(pB->flags & EP_Distinct) ) return 2; |
| - if( ALWAYS((combinedFlags & EP_TokenOnly)==0) ){ |
| + if( (combinedFlags & EP_TokenOnly)==0 ){ |
| if( combinedFlags & EP_xIsSelect ) return 2; |
| if( (combinedFlags & EP_FixedCol)==0 |
| && sqlite3ExprCompare(pParse, pA->pLeft, pB->pLeft, iTab) ) return 2; |
| -- |
| 2.18.0 |
| |
