Commitddd87fb

j-naylor

authored and

pull[bot]

committed

Bring some MSVC asserts in line with other platforms

MSVC's _BitScan* functions return a boolean indicating whether anybits were set in the input, and we were previously asserting thatthey returned true, per our API. This is correct. However, otherplatforms simply assert that the input is non-zero, so do that to bemore consistent.Noted while investigating a hypothesis from Ranier Vilela aboutundefined behavior, but this is not his proposed patch.Discussion:https://www.postgresql.org/message-id/CAEudQAoDhUZyKGJ1vbMGcgVUOcsixe-%3DjcVaDWarqkUg163D2w%40mail.gmail.com

1 parent854e1d4 commitddd87fbCopy full SHA for ddd87fb

File tree

1 file changed

-4

lines changed

src/include/port
- pg_bitutils.h

1 file changed

-4

lines changed

`‎src/include/port/pg_bitutils.h`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,9 @@ pg_leftmost_one_pos32(uint32 word)`
`48`	`48`	`unsigned longresult;`
`49`	`49`	`boolnon_zero;`
`50`	`50`
	`51`	`+Assert(word!=0);`
	`52`	`+`
`51`	`53`	`non_zero=_BitScanReverse(&result,word);`
`52`		`-Assert(non_zero);`
`53`	`54`	`return (int)result;`
`54`	`55`	`#else`
`55`	`56`	`intshift=32-8;`
`@@ -85,8 +86,9 @@ pg_leftmost_one_pos64(uint64 word)`
`85`	`86`	`unsigned longresult;`
`86`	`87`	`boolnon_zero;`
`87`	`88`
	`89`	`+Assert(word!=0);`
	`90`	`+`
`88`	`91`	`non_zero=_BitScanReverse64(&result,word);`
`89`		`-Assert(non_zero);`
`90`	`92`	`return (int)result;`
`91`	`93`	`#else`
`92`	`94`	`intshift=64-8;`
`@@ -116,8 +118,9 @@ pg_rightmost_one_pos32(uint32 word)`
`116`	`118`	`unsigned longresult;`
`117`	`119`	`boolnon_zero;`
`118`	`120`
	`121`	`+Assert(word!=0);`
	`122`	`+`
`119`	`123`	`non_zero=_BitScanForward(&result,word);`
`120`		`-Assert(non_zero);`
`121`	`124`	`return (int)result;`
`122`	`125`	`#else`
`123`	`126`	`intresult=0;`
`@@ -156,8 +159,9 @@ pg_rightmost_one_pos64(uint64 word)`
`156`	`159`	`unsigned longresult;`
`157`	`160`	`boolnon_zero;`
`158`	`161`
	`162`	`+Assert(word!=0);`
	`163`	`+`
`159`	`164`	`non_zero=_BitScanForward64(&result,word);`
`160`		`-Assert(non_zero);`
`161`	`165`	`return (int)result;`
`162`	`166`	`#else`
`163`	`167`	`intresult=0;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitddd87fb

File tree

1 file changed

1 file changed

`‎src/include/port/pg_bitutils.h`

0 commit comments