NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit9f3d3fb

committed

Fix optimization hazard in gram.y's makeOrderedSetArgs(), redux.

It appears that commitcf63c64, which intended to preventmisoptimization of the result-building step in makeOrderedSetArgs,didn't go far enough: buildfarm member hornet's version of xlcis now optimizing back to the old, broken behavior in whichlist_length(directargs) is fetched only after list_concat() haschanged that value. I'm not entirely convinced whether that'san undeniable compiler bug or whether it can be justified by asufficiently aggressive interpretation of C sequence points.So let's just change the code to make it harder to misinterpret.Back-patch to all supported versions, just in case.Discussion:https://postgr.es/m/1830491.1601944935@sss.pgh.pa.us

1 parent0c79dcb commit9f3d3fbCopy full SHA for 9f3d3fb

File tree

1 file changed

-3

lines changed

src/backend/parser
- gram.y

1 file changed

-3

lines changed

`‎src/backend/parser/gram.y`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -15409,7 +15409,7 @@ makeOrderedSetArgs(List directargs, List orderedargs,`
`15409`	`15409`	`core_yyscan_t yyscanner)`
`15410`	`15410`	`{`
`15411`	`15411`	`FunctionParameter lastd = (FunctionParameter ) llast(directargs);`
`15412`		`-intndirectargs;`
	`15412`	`+Value *ndirectargs;`
`15413`	`15413`
`15414`	`15414`	`/* No restriction unless last direct arg is VARIADIC*/`
`15415`	`15415`	`if (lastd->mode == FUNC_PARAM_VARIADIC)`
`@@ -15433,10 +15433,10 @@ makeOrderedSetArgs(List directargs, List orderedargs,`
`15433`	`15433`	`}`
`15434`	`15434`
`15435`	`15435`	`/* don't merge into the next line, as list_concat changes directargs*/`
`15436`		`-ndirectargs = list_length(directargs);`
	`15436`	`+ndirectargs =makeInteger(list_length(directargs));`
`15437`	`15437`
`15438`	`15438`	`return list_make2(list_concat(directargs, orderedargs),`
`15439`		`-makeInteger(ndirectargs));`
	`15439`	`+ ndirectargs);`
`15440`	`15440`	`}`
`15441`	`15441`
`15442`	`15442`	`/* insertSelectOptions()`

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!

Commit9f3d3fb

File tree

1 file changed

1 file changed

`‎src/backend/parser/gram.y`

0 commit comments