Do not allow an #ifdef inside of an assert(), as gcc tells us that is

not portable.

FossilOrigin-Name: b193156c2a2407146e7cf77e237e0de0766d4ce8c673547d9f2bda4a1814959b

diff --git a/manifest b/manifest
index 2bde895a7d8bc1b39949f21ba36c3ce5cbcfc355..4ed5223fb4682a7b1e5a2955304f46606dcc8e25 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Bump\sthe\sversion\snumber\sto\s3.38.2.
-D 2022-03-25T01:37:26.444
+C Do\snot\sallow\san\s#ifdef\sinside\sof\san\sassert(),\sas\sgcc\stells\sus\sthat\sis\nnot\sportable.
+D 2022-03-25T17:43:32.946
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -639,7 +639,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c 468d64f65ffc4ebb2ad2791091bf1dda84885eb65caea8999b5db60d096e5d88
+F src/where.c 48d9836b7bdf301783719156fd50d45685a601605334035c559ed2d655df9fb6
 F src/whereInt.h 15d2975c3b4c193c78c26674400a840da8647fe1777ae3b026e2d15937b38a03
 F src/wherecode.c 84be340684393248b9f3ecbce9b87c8a6f818149b52302702ea0b8d2a9d51faf
 F src/whereexpr.c 2a71f5491798460c9590317329234d332d9eb1717cba4f3403122189a75c465e
@@ -1944,8 +1944,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 8246bfbc1643497fbbebe950b5e297fdc2a90359603e5c01a79ba67168bd7d02
-R 11f42a18c659397ee69384b0c40de34b
+P bb3ef206ab4a92bef16cd53bf23f574e720ed4709baba58700e04dbf48c1347e
+Q +c7a2047e93df36c172be0be773f9a04150dafe7ba1773269d74016418d262fc4
+R 192850fb0b4f947198aee1b8bf57b5b2
 U drh
-Z 336a114c252c6c2b17d8aa5a6ab40156
+Z 3e9047ea7101e9a513ce800960969a04
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 436fbc4ffe9cb404ee268b73aaad1e2703bcf0b2..b9d4b974906aae1839a8d8a6fc763cf31397a7f0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bb3ef206ab4a92bef16cd53bf23f574e720ed4709baba58700e04dbf48c1347e
\ No newline at end of file
+b193156c2a2407146e7cf77e237e0de0766d4ce8c673547d9f2bda4a1814959b
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 6e645964b9fee6334e05511b4b9b3ff15c5a8975..1e5ac5b75dee6352b6ff818f1098250ad7218b17 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -6198,12 +6198,16 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
             ** reference.  Verify that this is harmless - that the
             ** table being referenced really is open.
             */
+#ifdef SQLITE_ENABLE_OFFSET_SQL_FUNC
             assert( (pLoop->wsFlags & WHERE_IDX_ONLY)==0
                  || cursorIsOpen(v,pOp->p1,k)
-#ifdef SQLITE_ENABLE_OFFSET_SQL_FUNC
                  || pOp->opcode==OP_Offset
-#endif
             );
+#else
+            assert( (pLoop->wsFlags & WHERE_IDX_ONLY)==0
+                 || cursorIsOpen(v,pOp->p1,k)
+            );
+#endif
           }
         }else if( pOp->opcode==OP_Rowid ){
           pOp->p1 = pLevel->iIdxCur;