Convert several ALWAYS() macros in vdbe.c into assert() statements.

FossilOrigin-Name: acc40ff6b47595432ebc1b3ec71ac50384bec323

manifest

@@ -1,5 +1,5 @@
-C Fix\sseveral\sharmless\scompiler\swarnings.
+C Convert\sseveral\sALWAYS()\smacros\sin\svdbe.c\sinto\sassert()\sstatements.
-D 2013-11-11T02:46:32.106
+D 2013-11-11T03:24:11.697
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in d12e4455cf7a36e42d3949876c1c3b88ff70867a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -279,7 +279,7 @@ F src/update.c 95a640c56d71ea9d58be66eab863d502701d092b
 F src/utf.c 6fc6c88d50448c469c5c196acf21617a24f90269
 F src/util.c 2fa6c821d28bbdbeec1b2a7b091a281c9ef8f918
 F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
-F src/vdbe.c cd3059de95a3a638eee919db8cfe4c318c160026
+F src/vdbe.c aeef5c115ccb0433934f88b1a3016097eb6d8ab2
 F src/vdbe.h 8d5a7351024d80374fc0acdbbe3cfe65c51ba8b6
 F src/vdbeInt.h f2fa3ceccceeb757773921fb08af7c6e9f3caa1c
 F src/vdbeapi.c 93a22a9ba2abe292d5c2cf304d7eb2e894dde0ed
@@ -1135,7 +1135,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P aaed7d1d3ba0aef9f99fb157d3704b9f279aef71
+P e6ff492f0d475c395b82e2b3b294155674d4c6d1
-R 662f5504d9799bf5dac3f43bcdc7df7a
+R 475d55de2c4ca401ff801162b73639ef
-U mistachkin
+U drh
-Z 791474e5a293869464d96bcb0c045d7f
+Z 5df113c36f23c015c44c7ae86b17359f

manifest.uuid

@@ -1 +1 @@
-e6ff492f0d475c395b82e2b3b294155674d4c6d1
+acc40ff6b47595432ebc1b3ec71ac50384bec323

src/vdbe.c

@@ -2309,7 +2309,8 @@ case OP_Column: {
       VVA_ONLY(rc =) sqlite3BtreeDataSize(pCrsr, &payloadSize);
       assert( rc==SQLITE_OK );   /* DataSize() cannot fail */
     }
-  }else if( ALWAYS(pC->pseudoTableReg>0) ){
+  }else{
+    assert( pC->pseudoTableReg>0 );
     pReg = &aMem[pC->pseudoTableReg];
     if( pC->multiPseudo ){
       sqlite3VdbeMemShallowCopy(pDest, pReg+p2, MEM_Ephem);
@@ -2322,9 +2323,6 @@ case OP_Column: {
     zRec = pReg->z;
     pC->cacheStatus = (pOp->p5&OPFLAG_CLEARCACHE) ? CACHE_STALE : p->cacheCtr;
     assert( payloadSize==0 || zRec!=0 );
-  }else{
-    /* Consider the row to be NULL */
-    payloadSize = 0;
   }
 
   /* If payloadSize is 0, then just store a NULL.  This can happen because of
@@ -2716,11 +2714,8 @@ case OP_Count: {         /* out2-prerelease */
   BtCursor *pCrsr;
 
   pCrsr = p->apCsr[pOp->p1]->pCursor;
-  if( ALWAYS(pCrsr) ){
+  assert( pCrsr );
   rc = sqlite3BtreeCount(pCrsr, &nEntry);
-  }else{
-    nEntry = 0;
-  }
   pOut->u.i = nEntry;
   break;
 }
@@ -3531,7 +3526,7 @@ case OP_SeekGt: {       /* jump, in3 */
   assert( OP_SeekGe == OP_SeekLt+2 );
   assert( OP_SeekGt == OP_SeekLt+3 );
   assert( pC->isOrdered );
-  if( ALWAYS(pC->pCursor!=0) ){
+  assert( pC->pCursor!=0 );
   oc = pOp->opcode;
   pC->nullRow = 0;
   if( pC->isTable ){
@@ -3653,13 +3648,6 @@ case OP_SeekGt: {       /* jump, in3 */
   if( res ){
     pc = pOp->p2 - 1;
   }
-  }else{
-    /* This happens when attempting to open the sqlite3_master table
-    ** for read access returns SQLITE_EMPTY. In this case always
-    ** take the jump (since there are no records in the table).
-    */
-    pc = pOp->p2 - 1;
-  }
   break;
 }
 
@@ -3679,14 +3667,13 @@ case OP_Seek: {    /* in2 */
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
   pC = p->apCsr[pOp->p1];
   assert( pC!=0 );
-  if( ALWAYS(pC->pCursor!=0) ){
+  assert( pC->pCursor!=0 );
   assert( pC->isTable );
   pC->nullRow = 0;
   pIn2 = &aMem[pOp->p2];
   pC->movetoTarget = sqlite3VdbeIntValue(pIn2);
   pC->rowidIsValid = 0;
   pC->deferredMoveto = 1;
-  }
   break;
 }
   
@@ -3760,8 +3747,7 @@ case OP_Found: {        /* jump, in3 */
   pC = p->apCsr[pOp->p1];
   assert( pC!=0 );
   pIn3 = &aMem[pOp->p3];
-  if( ALWAYS(pC->pCursor!=0) ){
+  assert( pC->pCursor!=0 );
-
   assert( pC->isTable==0 );
   if( pOp->p4.i>0 ){
     r.pKeyInfo = pC->pKeyInfo;
@@ -3811,7 +3797,6 @@ case OP_Found: {        /* jump, in3 */
   pC->nullRow = 1-alreadyExists;
   pC->deferredMoveto = 0;
   pC->cacheStatus = CACHE_STALE;
-  }
   if( pOp->opcode==OP_Found ){
     if( alreadyExists ) pc = pOp->p2 - 1;
   }else{
@@ -3848,7 +3833,7 @@ case OP_NotExists: {        /* jump, in3 */
   assert( pC->isTable );
   assert( pC->pseudoTableReg==0 );
   pCrsr = pC->pCursor;
-  if( ALWAYS(pCrsr!=0) ){
+  assert( pCrsr!=0 );
   res = 0;
   iKey = pIn3->u.i;
   rc = sqlite3BtreeMovetoUnpacked(pCrsr, 0, iKey, 0, &res);
@@ -3862,14 +3847,6 @@ case OP_NotExists: {        /* jump, in3 */
     assert( pC->rowidIsValid==0 );
   }
   pC->seekResult = res;
-  }else{
-    /* This happens when an attempt to open a read cursor on the 
-    ** sqlite_master table returns SQLITE_EMPTY.
-    */
-    pc = pOp->p2 - 1;
-    assert( pC->rowidIsValid==0 );
-    pC->seekResult = 0;
-  }
   break;
 }
 
@@ -4449,9 +4426,8 @@ case OP_Last: {        /* jump */
   assert( pC!=0 );
   pCrsr = pC->pCursor;
   res = 0;
-  if( ALWAYS(pCrsr!=0) ){
+  assert( pCrsr!=0 );
   rc = sqlite3BtreeLast(pCrsr, &res);
-  }
   pC->nullRow = (u8)res;
   pC->deferredMoveto = 0;
   pC->rowidIsValid = 0;
@@ -4618,7 +4594,7 @@ case OP_IdxInsert: {        /* in2 */
   assert( pIn2->flags & MEM_Blob );
   pCrsr = pC->pCursor;
   if( pOp->p5 & OPFLAG_NCHANGE ) p->nChange++;
-  if( ALWAYS(pCrsr!=0) ){
+  assert( pCrsr!=0 );
   assert( pC->isTable==0 );
   rc = ExpandBlob(pIn2);
   if( rc==SQLITE_OK ){
@@ -4634,7 +4610,6 @@ case OP_IdxInsert: {        /* in2 */
       pC->cacheStatus = CACHE_STALE;
     }
   }
-  }
   break;
 }
 
@@ -4657,8 +4632,8 @@ case OP_IdxDelete: {
   pC = p->apCsr[pOp->p1];
   assert( pC!=0 );
   pCrsr = pC->pCursor;
+  assert( pCrsr!=0 );
   if( pOp->p5 & OPFLAG_NCHANGE ) p->nChange++;
-  if( ALWAYS(pCrsr!=0) ){
   r.pKeyInfo = pC->pKeyInfo;
   r.nField = (u16)pOp->p3;
   r.flags = UNPACKED_PREFIX_MATCH;
@@ -4672,7 +4647,6 @@ case OP_IdxDelete: {
   }
   assert( pC->deferredMoveto==0 );
   pC->cacheStatus = CACHE_STALE;
-  }
   break;
 }
 
@@ -4694,8 +4668,8 @@ case OP_IdxRowid: {              /* out2-prerelease */
   pC = p->apCsr[pOp->p1];
   assert( pC!=0 );
   pCrsr = pC->pCursor;
+  assert( pCrsr!=0 );
   pOut->flags = MEM_Null;
-  if( ALWAYS(pCrsr!=0) ){
   rc = sqlite3VdbeCursorMoveto(pC);
   if( NEVER(rc) ) goto abort_due_to_error;
   assert( pC->deferredMoveto==0 );
@@ -4708,7 +4682,6 @@ case OP_IdxRowid: {              /* out2-prerelease */
     pOut->u.i = rowid;
     pOut->flags = MEM_Int;
   }
-  }
   break;
 }
 
@@ -4750,7 +4723,7 @@ case OP_IdxGE: {        /* jump */
   pC = p->apCsr[pOp->p1];
   assert( pC!=0 );
   assert( pC->isOrdered );
-  if( ALWAYS(pC->pCursor!=0) ){
+  assert( pC->pCursor!=0);
   assert( pC->deferredMoveto==0 );
   assert( pOp->p5==0 || pOp->p5==1 );
   assert( pOp->p4type==P4_INT32 );
@@ -4775,7 +4748,6 @@ case OP_IdxGE: {        /* jump */
   if( res>0 ){
     pc = pOp->p2 - 1 ;
   }
-  }
   break;
 }