database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Replace some unreachable branch instructions with assert() statements.

Browse Source 
FossilOrigin-Name: 88b84bf18a4b27626f8a0a2d313706ddd4f13749
This commit is contained in:
drh
2010-09-28 07:11:24 +00:00
parent 746fd9cc58
commit d81a142bfa
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
manifest
View File

@@ -1,8 +1,8 @@
-----BEGIN PGP SIGNED MESSAGE----- -----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1 Hash: SHA1
C Tweaks\sto\shelp\sfacilitate\sstructural\stest\scoverage. C Replace\ssome\sunreachable\sbranch\sinstructions\swith\sassert()\sstatements.
D 2010-09-28T06:00:48 D 2010-09-28T07:11:24
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -130,7 +130,7 @@ F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
F src/ctime.c 4f3aadad62c6c9f0d4e5a96718516ac4e3c598df F src/ctime.c 4f3aadad62c6c9f0d4e5a96718516ac4e3c598df
F src/date.c 5dd8448a0bfea8d31fb14cff487d0c06ff8c8b20 F src/date.c 5dd8448a0bfea8d31fb14cff487d0c06ff8c8b20
F src/delete.c 7ed8a8c8b5f748ece92df173d7e0f7810c899ebd F src/delete.c 7ed8a8c8b5f748ece92df173d7e0f7810c899ebd
F src/expr.c 0525659674b59a642a1a185490ed228cc131fd28 F src/expr.c 1caa723c3ab7a7e35952bc85a6f4a7da3632308f
F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
F src/fkey.c 17950a28f28b23e8ad3feaac5fc88c324d2f600a F src/fkey.c 17950a28f28b23e8ad3feaac5fc88c324d2f600a
F src/func.c caa6c5134106d95cced4db80ce3fdcdde4f6c8d4 F src/func.c caa6c5134106d95cced4db80ce3fdcdde4f6c8d4
@@ -228,7 +228,7 @@ F src/update.c 227e6cd512108b84f69421fc6c7aa1b83d60d6e0
F src/utf.c 1baeeac91707a4df97ccc6141ec0f808278af685 F src/utf.c 1baeeac91707a4df97ccc6141ec0f808278af685
F src/util.c 5f5f4db4e799224713582bb49124827b16aa8e54 F src/util.c 5f5f4db4e799224713582bb49124827b16aa8e54
F src/vacuum.c 924bd1bcee2dfb05376f79845bd3b4cec7b54b2f F src/vacuum.c 924bd1bcee2dfb05376f79845bd3b4cec7b54b2f
F src/vdbe.c 4b1e4b893918228fad23cb0560246de5f2150bb0 F src/vdbe.c 69812aabf486a2d6a5b0960ffd9a47d141442735
F src/vdbe.h 4de0efb4b0fdaaa900cf419b35c458933ef1c6d2 F src/vdbe.h 4de0efb4b0fdaaa900cf419b35c458933ef1c6d2
F src/vdbeInt.h 7f4cf1b2b69bef3a432b1f23dfebef57275436b4 F src/vdbeInt.h 7f4cf1b2b69bef3a432b1f23dfebef57275436b4
F src/vdbeapi.c 14040ffad59a9961468a457754d30266e71ebb2d F src/vdbeapi.c 14040ffad59a9961468a457754d30266e71ebb2d
@@ -871,14 +871,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 57789cfe674dbbd4d5e4663774d1e7c541f7bdc4 P ff49a5f00b3aa83bdacc95a32d60527c740a6c09
R 679596ccadeda6ed8832f202f65719f1 R 37b3df62f8033aa4a27c3e8908502e88
U drh U drh
Z 3ce026c9389fd73dbbccea39f7a202c7 Z 921970772630327bcfaa82d637a390d3
-----BEGIN PGP SIGNATURE----- -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux) Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFMoYSWoxKgR168RlERAky+AJ4ilSIIiHEcqFHusNFadoalL6dzUACfTnbZ iD8DBQFMoZUfoxKgR168RlERAhhvAJwKZWkCURf7vxb6OtGfwugHaP3LbwCfRURd
2+TJRjFJzBkiiYYbyCm9hxM= 2iZ0/mjfijHnmTwmuK0oL78=
=S4YP =l4DR
-----END PGP SIGNATURE----- -----END PGP SIGNATURE-----

2
manifest.uuid
View File

@@ -1 +1 @@
ff49a5f00b3aa83bdacc95a32d60527c740a6c09 88b84bf18a4b27626f8a0a2d313706ddd4f13749

3
src/expr.c
View File

@@ -3052,8 +3052,7 @@ int sqlite3ExprCodeExprList(
int i, n; int i, n;
assert( pList!=0 ); assert( pList!=0 );
assert( target>0 ); assert( target>0 );
assert( pParse->pVdbe || pParse->db->mallocFailed ); assert( pParse->pVdbe!=0 ); /* Never gets this far otherwise */
if( pParse->pVdbe==0 ) return 0;
n = pList->nExpr; n = pList->nExpr;
for(pItem=pList->a, i=0; i<n; i++, pItem++){ for(pItem=pList->a, i=0; i<n; i++, pItem++){
Expr *pExpr = pItem->pExpr; Expr *pExpr = pItem->pExpr;

2
src/vdbe.c
View File

@@ -3484,7 +3484,7 @@ case OP_Found: { /* jump, in3 */
pIdxKey = &r; pIdxKey = &r;
}else{ }else{
assert( pIn3->flags & MEM_Blob ); assert( pIn3->flags & MEM_Blob );
ExpandBlob(pIn3); assert( (pIn3->flags & MEM_Zero)==0 ); /* zeroblobs already expanded */
pIdxKey = sqlite3VdbeRecordUnpack(pC->pKeyInfo, pIn3->n, pIn3->z, pIdxKey = sqlite3VdbeRecordUnpack(pC->pKeyInfo, pIn3->n, pIn3->z,
aTempRec, sizeof(aTempRec)); aTempRec, sizeof(aTempRec));
if( pIdxKey==0 ){ if( pIdxKey==0 ){