Skip to content

Commit 8d2a01a

Browse files
committed
Fix optimization hazard in gram.y's makeOrderedSetArgs(), redux.
It appears that commit cf63c64, which intended to prevent misoptimization of the result-building step in makeOrderedSetArgs, didn't go far enough: buildfarm member hornet's version of xlc is now optimizing back to the old, broken behavior in which list_length(directargs) is fetched only after list_concat() has changed that value. I'm not entirely convinced whether that's an undeniable compiler bug or whether it can be justified by a sufficiently 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/[email protected]
1 parent 3db322e commit 8d2a01a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/backend/parser/gram.y

+3-3
Original file line numberDiff line numberDiff line change
@@ -16291,7 +16291,7 @@ makeOrderedSetArgs(List *directargs, List *orderedargs,
1629116291
core_yyscan_t yyscanner)
1629216292
{
1629316293
FunctionParameter *lastd = (FunctionParameter *) llast(directargs);
16294-
int ndirectargs;
16294+
Value *ndirectargs;
1629516295

1629616296
/* No restriction unless last direct arg is VARIADIC */
1629716297
if (lastd->mode == FUNC_PARAM_VARIADIC)
@@ -16315,10 +16315,10 @@ makeOrderedSetArgs(List *directargs, List *orderedargs,
1631516315
}
1631616316

1631716317
/* don't merge into the next line, as list_concat changes directargs */
16318-
ndirectargs = list_length(directargs);
16318+
ndirectargs = makeInteger(list_length(directargs));
1631916319

1632016320
return list_make2(list_concat(directargs, orderedargs),
16321-
makeInteger(ndirectargs));
16321+
ndirectargs);
1632216322
}
1632316323

1632416324
/* insertSelectOptions()

0 commit comments

Comments
 (0)