From 471b4b92bdb2a203d048f2c87fb53d8d83381c0b Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 12 Aug 2016 11:25:49 +0000 Subject: [PATCH] Add VdbeCoverage() macros on newly added VDBE branch operations. FossilOrigin-Name: 381aa73141db8ec59adbcb09e71af660ee4ae5ce --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/expr.c | 6 ++++++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index 47aec35253..ca1fac3357 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\spost-OOM\smemory\sleak. -D 2016-08-12T11:01:20.692 +C Add\sVdbeCoverage()\smacros\son\snewly\sadded\sVDBE\sbranch\soperations. +D 2016-08-12T11:25:49.567 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a @@ -338,7 +338,7 @@ F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7 F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b F src/dbstat.c 4f6f7f52b49beb9636ffbd517cfe44a402ba4ad0 F src/delete.c 4aba4214a377ce8ddde2d2e609777bcc8235200f -F src/expr.c 04b320c93f61ddc24ee032dd83317179c5f78a8b +F src/expr.c d05cc249f8615bd4655f839ee57c24d11d005dde F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fkey.c bc4145347595b7770f9a598cff1c848302cf5413 F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771 @@ -1516,7 +1516,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 959677b97ba15f786936c762e2e68df1151d7ed0 -R a5cbb9bafc9fbcda9f99cc259b487bcb +P 14009b32b955b42cfd5f0c2ce7d4b3ce19ce201e +R 57be00fa8f04c7e5888f286343bb13cf U drh -Z b67a6933488c39df334f580c3bf48fca +Z c05ca00f4c6d3d32267dd4171ca3bdf0 diff --git a/manifest.uuid b/manifest.uuid index 847f607ac3..e0b19abe4c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -14009b32b955b42cfd5f0c2ce7d4b3ce19ce201e \ No newline at end of file +381aa73141db8ec59adbcb09e71af660ee4ae5ce \ No newline at end of file diff --git a/src/expr.c b/src/expr.c index 5ef692a440..3faeae79d2 100644 --- a/src/expr.c +++ b/src/expr.c @@ -2606,6 +2606,7 @@ static void sqlite3ExprCodeIN( Expr *p = sqlite3ExprVectorField(pExpr->pLeft, i); if( sqlite3ExprCanBeNull(p) ){ sqlite3VdbeAddOp2(v, OP_IsNull, r1+aiMap[i], destIfNull); + VdbeCoverage(v); } } }else if( nVector==1 && sqlite3ExprCanBeNull(pExpr->pLeft) ){ @@ -2632,11 +2633,13 @@ static void sqlite3ExprCodeIN( /* Search the index for the key. */ addr = sqlite3VdbeAddOp4Int(v, OP_Found, iIdx, 0, r1, nVector); + VdbeCoverage(v); /* At this point the specified key is not present in the index, ** so the result of the IN(..) operator must be either NULL or ** 0. The vdbe code generated below figures out which. */ addrNext = 1+sqlite3VdbeAddOp2(v, OP_Rewind, iIdx, destIfFalse); + VdbeCoverage(v); for(i=0; ipLeft, i); if( sqlite3ExprCanBeNull(p) ){ sqlite3VdbeAddOp2(v, OP_IsNull, r1+aiMap[i], destIfNull); + VdbeCoverage(v); } } -- 2.47.2