Attempt to work around a false-positive warning in the CGo compiler.

FossilOrigin-Name: d4bf60f464789935dc193ea99bf730c8fade448c7dca13eb3ce297965980f36e

diff --git a/manifest b/manifest
index 4b5b59e03a785fb223a9615f29459068ccb0c81b..52af8c9c077051007ba3ffbb79d6b55d657df8c6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\snumber\sto\s3.32.1.
-D 2020-05-24T12:36:20.131
+C Attempt\sto\swork\saround\sa\sfalse-positive\swarning\sin\sthe\sCGo\scompiler.
+D 2020-05-25T01:31:09.337
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -533,7 +533,7 @@ F src/printf.c c558075d06f0c83b0471499cebd30ef979e600709cde1e2b744abadcf52c7ba2
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c c2008519a0654f1e7490e9281ed0397d0f14bb840d81f0b96946248afcbdb25d
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c e2a59548681bf1c407132863ae87bf2444aca5543867c21d9d09aa07f44aef5d
+F src/select.c 39a00a8bc89596dfb37c16afcbb1d33de5085b9963564b58aafe1566d08c0881
 F src/shell.c.in cf2d24f54412c06e5fb34af7fabc748651125e1dceac29b740e91f06d23447b6
 F src/sqlite.h.in 74342b41e9d68ff9e56b192009046f8dd0aa2bd76ce1a588f330de614ba61de7
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1866,7 +1866,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P ad7bb70af9bb68d192137188bb2528f1e9e43ad164c925174ca1dafc9e1f5339
-R 9b4861350c19f604797570d532809e1e
+P 56e5063c326ffbfd3e3cb6f2b05718412aca2cb183274bfe11f5666effdd04b9
+R 8b82e85659228458f67d774145dc6d1d
+T *branch * cgo-warning-workaround
+T *sym-cgo-warning-workaround *
+T -sym-trunk *
 U drh
-Z bbda9cc25034e5e4447ce8684480d98d
+Z 9456cb6ba774169f54e2af5894cea4a0

diff --git a/manifest.uuid b/manifest.uuid
index 4d5c18c3a94c2d037d2af27060af438aedd6e82a..e9a6b2741421eb62f8f2f3d0eb6f36fdce842b03 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-56e5063c326ffbfd3e3cb6f2b05718412aca2cb183274bfe11f5666effdd04b9
\ No newline at end of file
+d4bf60f464789935dc193ea99bf730c8fade448c7dca13eb3ce297965980f36e
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 534dfbc01b96428f670fae4e2afd7f4baa39f5f2..7ff2b5d347483f5344b603f11eacd8efee641d09 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -138,9 +138,9 @@ Select *sqlite3SelectNew(
   u32 selFlags,         /* Flag parameters, such as SF_Distinct */
   Expr *pLimit          /* LIMIT value.  NULL means not used */
 ){
-  Select *pNew;
+  Select *pNew, *pAllocated;
   Select standin;
-  pNew = sqlite3DbMallocRawNN(pParse->db, sizeof(*pNew) );
+  pAllocated = pNew = sqlite3DbMallocRawNN(pParse->db, sizeof(*pNew) );
   if( pNew==0 ){
     assert( pParse->db->mallocFailed );
     pNew = &standin;
@@ -174,12 +174,11 @@ Select *sqlite3SelectNew(
 #endif
   if( pParse->db->mallocFailed ) {
     clearSelect(pParse->db, pNew, pNew!=&standin);
-    pNew = 0;
+    pAllocated = 0;
   }else{
     assert( pNew->pSrc!=0 || pParse->nErr>0 );
   }
-  assert( pNew!=&standin );
-  return pNew;
+  return pAllocated;
 }