Simplifications to the preupdate_hook logic to make it easier to reason about,

and reduce static analyzer warnings.

FossilOrigin-Name: 91e3b98e06feaa5b70caf2266200d20d0ae4e432db147975c9f5959f93df7e7b

diff --git a/manifest b/manifest
index f527b6861bf655f77f85acf1a3b03abb889d4504..733e04bf87c0550ef9256f51b18bd23cb811a53d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\sstatic-analyzer\swarnings.
-D 2021-10-04T22:34:38.507
+C Simplifications\sto\sthe\spreupdate_hook\slogic\sto\smake\sit\seasier\sto\sreason\sabout,\nand\sreduce\sstatic\sanalyzer\swarnings.
+D 2021-10-05T11:11:43.379
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -621,7 +621,7 @@ F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 3f27a1eae01c8bbbb8cdef2f26bd8e6a2a7db08106ef7c3dcc990787a5da6e86
 F src/vacuum.c 454973a59fb20bb982efc2df568a098616db6328a0491b6e84e2e07f7333db45
-F src/vdbe.c e4ed1897b74a25989b17a27f7e4a9ee22d40a7ba2fddebca047ca5cc59d9676b
+F src/vdbe.c b42cf4c8518ef237586258528cd7ecff14134e1ceee741e6f95b68848b844eff
 F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
 F src/vdbeInt.h 38206c8dd6b60ff03d9fd4f626b1b4fd0eef7cdc44f2fc2c1973b0f932a3f26b
 F src/vdbeapi.c aa5aaf2c37676b83af5724c6cd8207a3064ed46a217fd180957f75ac84f7a2a5
@@ -1929,7 +1929,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 5da112c02f9e8d0bcbed8bcf6bab9c227607a802e85c8f70b1ca628d24960dee
-R ed158196d4eb2672db00add61a3b4690
+P 32f33f356931242b59c01b5df7e180941231e3d9c91577ad33aa4a01e9d59092
+R 40118fb23ffff22e883bc146535d4ef6
 U drh
-Z 3cde4d92fbbfe00106b388617e0f0f8e
+Z 98cc5429b03c6a7bf82a3053dffda967

diff --git a/manifest.uuid b/manifest.uuid
index 762d2b004fb2cac9df68d9e634f15cbb5fdacfb9..caee1bba19ac5a9e822b90104d89de0ac10adc98 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-32f33f356931242b59c01b5df7e180941231e3d9c91577ad33aa4a01e9d59092
\ No newline at end of file
+91e3b98e06feaa5b70caf2266200d20d0ae4e432db147975c9f5959f93df7e7b
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 4e39b5dc9949213a02f5fb8feea10dda3b093600..f7df923877d64c256e21cc75a7fb25a490260880 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -5256,7 +5256,7 @@ case OP_Insert: {
     assert( (pOp->p5 & OPFLAG_ISNOOP) || HasRowid(pTab) );
   }else{
     pTab = 0;
-    zDb = 0;  /* Not needed.  Silence a compiler warning. */
+    zDb = 0;
   }
 
 #ifdef SQLITE_ENABLE_PREUPDATE_HOOK
@@ -5409,13 +5409,14 @@ case OP_Delete: {
       pC->movetoTarget = sqlite3BtreeIntegerKey(pC->uc.pCursor);
     }
   }else{
-    zDb = 0;   /* Not needed.  Silence a compiler warning. */
-    pTab = 0;  /* Not needed.  Silence a compiler warning. */
+    zDb = 0;
+    pTab = 0;
   }
 
 #ifdef SQLITE_ENABLE_PREUPDATE_HOOK
   /* Invoke the pre-update-hook if required. */
-  if( db->xPreUpdateCallback && pOp->p4.pTab ){
+  assert( db->xPreUpdateCallback==0 || pTab==pOp->p4.pTab );
+  if( db->xPreUpdateCallback && pTab ){
     assert( !(opflags & OPFLAG_ISUPDATE) 
          || HasRowid(pTab)==0 
          || (aMem[pOp->p3].flags & MEM_Int)