Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit dc14aa0

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/1830491.1601944935@sss.pgh.pa.us
1 parent 5ed20a6 commit dc14aa0

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
@@ -16075,7 +16075,7 @@ makeOrderedSetArgs(List *directargs, List *orderedargs,
1607516075
core_yyscan_t yyscanner)
1607616076
{
1607716077
FunctionParameter *lastd = (FunctionParameter *) llast(directargs);
16078-
int ndirectargs;
16078+
Value *ndirectargs;
1607916079

1608016080
/* No restriction unless last direct arg is VARIADIC */
1608116081
if (lastd->mode == FUNC_PARAM_VARIADIC)
@@ -16099,10 +16099,10 @@ makeOrderedSetArgs(List *directargs, List *orderedargs,
1609916099
}
1610016100

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

1610416104
return list_make2(list_concat(directargs, orderedargs),
16105-
makeInteger(ndirectargs));
16105+
ndirectargs);
1610616106
}
1610716107

1610816108
/* insertSelectOptions()

0 commit comments

Comments
 (0)