From: drh <drh@noemail.net>
Date: Tue, 3 Oct 2017 17:29:40 +0000 (+0000)
Subject: Add some OK_IF_ALWAYS_TRUE() marks on optimization branches in select.c.
X-Git-Tag: version-3.21.0~40
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=8906a4b80258cd0713e100150b94991888b0db96;p=thirdparty%2Fsqlite.git

Add some OK_IF_ALWAYS_TRUE() marks on optimization branches in select.c.

FossilOrigin-Name: 1dd828088d6981dfebf9f4d650dad8431bece4405650c61f90eb8d8f43289b52
---

diff --git a/manifest b/manifest
index 64e4df70a2..a1be774e26 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sunused\svariable\sfrom\ssqlite3Insert()\sand\sfix\sharmless\ncompiler\swarnings\sassociated\swith\s-DSQLITE_MUTATION_TEST.
-D 2017-10-03T17:17:34.912
+C Add\ssome\sOK_IF_ALWAYS_TRUE()\smarks\son\soptimization\sbranches\sin\sselect.c.
+D 2017-10-03T17:29:40.582
 F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6033b51b6aea702ea059f6ab2d47b1d3cef648695f787247dd4fb395fe60673f
@@ -458,7 +458,7 @@ F src/printf.c 40aee47ae9be4bd3dbdc8968bd07fddc027be8edec8daddf24d3391d36698a1c
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 4324a94573b1e29286f8121e4881db59eaedc014afeb274c8d3e07ed282e0e20
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
-F src/select.c 52f5ef16847ace5f44cb05474b18aa168ce4191ab216f1faaeb27100c588933a
+F src/select.c 764d5ac2bc4d96a9183d8ee3067f19ef4133aa84788d89875e9626f906703171
 F src/shell.c c1206a23d9239f8f51751d3be9b8c3b02fa4103546bea1add7f864d84a8276ab
 F src/shell.c.in bb9720a8c5c98d3984b16ab7540e7142bcae959666ecf248bfc523a1d44220ee
 F src/sqlite.h.in ab4f8a29d1580dfaeb6891fa1b83cff8229ba0daa56994707ceaca71495d9ab7
@@ -1655,7 +1655,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 966438bd259ade3a2d4a6ec9587ce79c81a21b942248bffb389995b9132b53e3
-R ffa559a096a20092f6ad3c894c3f67a3
+P 7be760e907274131bcd4acfaff9e72c9c59a05e7d411db3d9afe690fe0d64b4b
+R ce19fff627af42bc467b7af644b3b595
 U drh
-Z 7ef5ddb828d35332c3570a426acb47a9
+Z ecfbf86cbb40553da9b0819689d116ec
diff --git a/manifest.uuid b/manifest.uuid
index 1780765a08..d144e21c94 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7be760e907274131bcd4acfaff9e72c9c59a05e7d411db3d9afe690fe0d64b4b
\ No newline at end of file
+1dd828088d6981dfebf9f4d650dad8431bece4405650c61f90eb8d8f43289b52
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index c279472f33..f628e56f64 100644
--- a/src/select.c
+++ b/src/select.c
@@ -75,7 +75,7 @@ static void clearSelect(sqlite3 *db, Select *p, int bFree){
     sqlite3ExprListDelete(db, p->pOrderBy);
     sqlite3ExprDelete(db, p->pLimit);
     sqlite3ExprDelete(db, p->pOffset);
-    if( p->pWith ) sqlite3WithDelete(db, p->pWith);
+    if( OK_IF_ALWAYS_TRUE(p->pWith) ) sqlite3WithDelete(db, p->pWith);
     if( bFree ) sqlite3DbFreeNN(db, p);
     p = pPrior;
     bFree = 1;
@@ -171,7 +171,7 @@ void sqlite3SelectSetName(Select *p, const char *zName){
 ** Delete the given Select structure and all of its substructures.
 */
 void sqlite3SelectDelete(sqlite3 *db, Select *p){
-  if( p ) clearSelect(db, p, 1);
+  if( OK_IF_ALWAYS_TRUE(p) ) clearSelect(db, p, 1);
 }
 
 /*