diff options
| author | drh <drh@noemail.net> | 2019-12-22 23:48:36 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2019-12-22 23:48:36 +0000 |
| commit | 4799488e163c02508894a7c71f256605f45d9645 (patch) | |
| tree | 30349994224067772235bf90ce7f865bd8eec1dd /src/expr.c | |
| parent | 5d762b2d1d5abc0fe8f438ee7e588bb29f830ab8 (diff) | |
| download | sqlite-4799488e163c02508894a7c71f256605f45d9645.tar.gz sqlite-4799488e163c02508894a7c71f256605f45d9645.zip | |
Change the code generator for the IN operator so that it avoids creating
OP_Eq and OP_Ne opcode with the same P1 and P3 arguments. This enables us
to back out check-in [ddb17d92df194337] and also fix ticket [188f912b51cd802].
FossilOrigin-Name: 9ab985a9c8160b905730678f40ed440a246cdec549c798bafefaed5abbc0437f
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/expr.c b/src/expr.c index 1536c5073..8f7c798cc 100644 --- a/src/expr.c +++ b/src/expr.c @@ -3187,15 +3187,21 @@ static void sqlite3ExprCodeIN( sqlite3VdbeAddOp3(v, OP_BitAnd, regCkNull, r2, regCkNull); } if( ii<pList->nExpr-1 || destIfNull!=destIfFalse ){ - sqlite3VdbeAddOp4(v, OP_Eq, rLhs, labelOk, r2, + int op = rLhs!=r2 ? OP_Eq : OP_NotNull; + sqlite3VdbeAddOp4(v, op, rLhs, labelOk, r2, (void*)pColl, P4_COLLSEQ); - VdbeCoverageIf(v, ii<pList->nExpr-1); - VdbeCoverageIf(v, ii==pList->nExpr-1); + VdbeCoverageIf(v, ii<pList->nExpr-1 && op==OP_Eq); + VdbeCoverageIf(v, ii==pList->nExpr-1 && op==OP_Eq); + VdbeCoverageIf(v, ii<pList->nExpr-1 && op==OP_NotNull); + VdbeCoverageIf(v, ii==pList->nExpr-1 && op==OP_NotNull); sqlite3VdbeChangeP5(v, zAff[0]); }else{ + int op = rLhs!=r2 ? OP_Ne : OP_IsNull; assert( destIfNull==destIfFalse ); - sqlite3VdbeAddOp4(v, OP_Ne, rLhs, destIfFalse, r2, - (void*)pColl, P4_COLLSEQ); VdbeCoverage(v); + sqlite3VdbeAddOp4(v, op, rLhs, destIfFalse, r2, + (void*)pColl, P4_COLLSEQ); + VdbeCoverageIf(v, op==OP_Ne); + VdbeCoverageIf(v, op==OP_IsNull); sqlite3VdbeChangeP5(v, zAff[0] | SQLITE_JUMPIFNULL); } sqlite3ReleaseTempReg(pParse, regToFree); |