From: drh <drh@noemail.net>
Date: Tue, 17 Apr 2018 19:29:58 +0000 (+0000)
Subject: During PRAGMA vdbe_addoptrace=ON, show calls to sqlite3VdbeResolveLabel()
X-Git-Tag: version-3.24.0~146^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2928546d0409c8394bb229ea6a2ba8868df10c95;p=thirdparty%2Fsqlite.git

During PRAGMA vdbe_addoptrace=ON, show calls to sqlite3VdbeResolveLabel()
in the debugging output.

FossilOrigin-Name: 9ff07a06cef6e04777d2d5b81f96e8626e835382e62320ecf17b3ff73573e23e
---

diff --git a/manifest b/manifest
index 251aa5cbab..9fbc972730 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C TK_REGISTER\sexpressions\snodes\sare\sprobably\snot\sconstant.\s\sMake\ssure\nsqlite3ExprIsConstant()\sknows\sthis.
-D 2018-04-17T18:50:40.806
+C During\sPRAGMA\svdbe_addoptrace=ON,\sshow\scalls\sto\ssqlite3VdbeResolveLabel()\nin\sthe\sdebugging\soutput.
+D 2018-04-17T19:29:58.545
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439
@@ -565,7 +565,7 @@ F src/vdbe.c 066a4e1de2ed83e253adfd2e97a684cf562eaa41d31ee7f3d3e4c8aea4485a55
 F src/vdbe.h 134beb7a12a6213c00eba58febaede33447cc4441bc568a0d9c144b33fc3720a
 F src/vdbeInt.h 95f7adfdc5c8f1353321f55a6c5ec00a90877e3b85af5159e393afb41ff54110
 F src/vdbeapi.c 29d2baf9c1233131ec467d7bed1b7c8a03c27579048d768c4b04acf427838858
-F src/vdbeaux.c 2756ac68ac259c416554100598fc291870063288cd7e1af22847f57b3e130e56
+F src/vdbeaux.c 38517c96784f9fb19c3bfcfb4737e6c56496f23bf3dcd6a659e0fcee47a0365d
 F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
 F src/vdbemem.c 414e28d3a7e2a8bee2bb247de115dcbc68e3cbac284d5862d077002f7a93bce1
 F src/vdbesort.c 731a09e5cb9e96b70c394c1b7cf3860fbe84acca7682e178615eb941a3a0ef2f
@@ -1722,7 +1722,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 f36d07a5b24cc48e3daa8b18dd34c50d9025c6c0ba019926610538b54f7b66ec
-R 2592653ac9a36d5b1dfe12eeeda8279d
+P f3d91cad929cfbee8f621425f55b5f12e79567362cf8769a786adb3e1bbef214
+R 60d71468a24d9ed1562da4014c73e7db
 U drh
-Z a21db6874b54aa7e41558b500442b67a
+Z bc5630c7bf75a2d7aeeb288bf5244551
diff --git a/manifest.uuid b/manifest.uuid
index ef738e3aa4..ff249d336c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f3d91cad929cfbee8f621425f55b5f12e79567362cf8769a786adb3e1bbef214
\ No newline at end of file
+9ff07a06cef6e04777d2d5b81f96e8626e835382e62320ecf17b3ff73573e23e
\ No newline at end of file
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 78777bd5a6..d197e01aa3 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -392,6 +392,11 @@ void sqlite3VdbeResolveLabel(Vdbe *v, int x){
   assert( j<p->nLabel );
   assert( j>=0 );
   if( p->aLabel ){
+#ifdef SQLITE_DEBUG
+    if( p->db->flags & SQLITE_VdbeAddopTrace ){
+      printf("RESOLVE LABEL %d to %d\n", x, v->nOp);
+    }
+#endif
     p->aLabel[j] = v->nOp;
   }
 }