aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordrh <>2022-10-13 14:35:20 +0000
committerdrh <>2022-10-13 14:35:20 +0000
commitbd1c634546dea473ed734a33b77ea1f54a202299 (patch)
tree2c26555b13a6a4dfa65a3c1b176ca3e2946efce8 /src
parente995d2c226e2b65c5e40cd238415bdfeb0936e8c (diff)
downloadsqlite-bd1c634546dea473ed734a33b77ea1f54a202299.tar.gz
sqlite-bd1c634546dea473ed734a33b77ea1f54a202299.zip
Adjust the implementation of sqlite3VdbeTypeofColumn() to make it easier
to test (and slightly smaller). FossilOrigin-Name: 79fdd021df256c6a2b9973fd6bf8e52ffaaf4d369d40489b8395ac97880b1325
Diffstat (limited to 'src')
-rw-r--r--src/vdbeaux.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 275ba6f77..45e573535 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -1161,13 +1161,9 @@ void sqlite3VdbeChangeP5(Vdbe *p, u16 p5){
** opcode.
*/
void sqlite3VdbeTypeofColumn(Vdbe *p, int iDest){
- if( p->nOp>0 ){
- VdbeOp *pOp = &p->aOp[p->nOp-1];
- if( pOp->opcode==OP_Column && pOp->p3==iDest ){
- pOp->p5 |= OPFLAG_TYPEOFARG;
- }
- }else{
- assert( p->db->mallocFailed );
+ VdbeOp *pOp = sqlite3VdbeGetLastOp(p);
+ if( pOp->p3==iDest && pOp->opcode==OP_Column ){
+ pOp->p5 |= OPFLAG_TYPEOFARG;
}
}