From: drh <> Date: Sun, 17 Mar 2024 00:13:12 +0000 (+0000) Subject: Add an ALWAYS on an unreachable branch. X-Git-Tag: version-3.46.0~123^2~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e4a1b4da4f8e76293209071b7bc3588d6c05f736;p=thirdparty%2Fsqlite.git Add an ALWAYS on an unreachable branch. FossilOrigin-Name: 0dce6211690210e802545cbca9b3375e07075e117fad3f8c921879da7671d981 --- diff --git a/manifest b/manifest index ee5a613c1a..d667045fa5 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Recognize\swhen\san\sSQL\sfunction\sis\sconstant\sand\scan\soccur\sinside\san\noptimized\sVALUES\sclause. -D 2024-03-16T21:12:51.251 +C Add\san\sALWAYS\son\san\sunreachable\sbranch. +D 2024-03-17T00:13:12.278 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -709,7 +709,7 @@ F src/hash.c 9ee4269fb1d6632a6fecfb9479c93a1f29271bddbbaf215dd60420bcb80c7220 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51 F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 -F src/insert.c e28426630ebbac5763d5802099164ad24fbf46fea79d48a8313117a64b950871 +F src/insert.c f0755de645ee8e632445b731951c75b7484ccadb890ade4cbc8db269327ff4b8 F src/json.c e2e40760d6689134c3e2ece38c6a496b34ff5e2661a8f238444a119af666fdce F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36 @@ -2179,9 +2179,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 823e579362c05bb8accf6c3b158c5162a16eb23cf81d6021c9e3246e32583d1c 9ba3cff9d48fe8fc8a0a51291169599209d464465e44bdfd60058fd1e314a2b1 -R 8cf165d7d4e6171fbfcc63e324d78f15 -T +closed 9ba3cff9d48fe8fc8a0a51291169599209d464465e44bdfd60058fd1e314a2b1 +P c0e5ceb87d3cf28f22d381f863b8f91043804fd7901f23f3afb02fe698e6a12a +R c0fd5d4c2ab2c847266cf4b9416ae243 U drh -Z 1c2f2833c22bf92aec87aab6cf84bca7 +Z 061bbac91348ec107ed9e1ccfd2e024e # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index ca62261369..9a374d564f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c0e5ceb87d3cf28f22d381f863b8f91043804fd7901f23f3afb02fe698e6a12a \ No newline at end of file +0dce6211690210e802545cbca9b3375e07075e117fad3f8c921879da7671d981 \ No newline at end of file diff --git a/src/insert.c b/src/insert.c index 915f368fbd..2c6a76b78d 100644 --- a/src/insert.c +++ b/src/insert.c @@ -583,7 +583,7 @@ void sqlite3AutoincrementEnd(Parse *pParse){ ** co-routine. */ void sqlite3MultiValuesEnd(Parse *pParse, Select *pVal){ - if( pVal && pVal->pSrc->nSrc>0 ){ + if( ALWAYS(pVal) && pVal->pSrc->nSrc>0 ){ SrcItem *pItem = &pVal->pSrc->a[0]; sqlite3VdbeEndCoroutine(pParse->pVdbe, pItem->regReturn); sqlite3VdbeJumpHere(pParse->pVdbe, pItem->addrFillSub - 1);