NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit0db3c55

committed

Improve unreachability recognition in elog() macro.

Some experimentation with an older version of gcc showed that it is ableto determine whether "if (elevel_ >= ERROR)" is compile-time constantif elevel_ is declared "const", but otherwise not so much. We hadaccounted for that in ereport() but were too miserly with braces tomake it so in elog(). I don't know how many currently-interestingcompilers have the same quirk, but in case it will save some codespace, let's make sure that elog() is on the same footing as ereport()for this purpose.Back-patch to 9.3 where we introduced pg_unreachable() calls intoelog/ereport.

1 parentdfe7121 commit0db3c55Copy full SHA for 0db3c55

File tree

1 file changed

-5

lines changed

src/include/utils
- elog.h

1 file changed

-5

lines changed

`‎src/include/utils/elog.h`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -250,12 +250,13 @@ extern intgetinternalerrposition(void);`
`250`	`250`	`#else/* !HAVE__BUILTIN_CONSTANT_P */`
`251`	`251`	`#defineelog(elevel, ...) \`
`252`	`252`	`do { \`
`253`		`-intelevel_; \`
`254`	`253`	`elog_start(__FILE__, __LINE__, PG_FUNCNAME_MACRO); \`
`255`		`-elevel_ = (elevel); \`
`256`		`-elog_finish(elevel_, __VA_ARGS__); \`
`257`		`-if (elevel_ >= ERROR) \`
`258`		`-pg_unreachable(); \`
	`254`	`+{ \`
	`255`	`+const int elevel_ = (elevel); \`
	`256`	`+elog_finish(elevel_, __VA_ARGS__); \`
	`257`	`+if (elevel_ >= ERROR) \`
	`258`	`+pg_unreachable(); \`
	`259`	`+} \`
`259`	`260`	`} while(0)`
`260`	`261`	`#endif/* HAVE__BUILTIN_CONSTANT_P */`
`261`	`262`	`#else/* !HAVE__VA_ARGS */`

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!

Commit0db3c55

File tree

1 file changed

1 file changed

`‎src/include/utils/elog.h`

0 commit comments